Changeset 623516c


Ignore:
Timestamp:
Oct 10, 2010, 12:36:44 PM (14 years ago)
Author:
Jessica B. Hamrick <jhamrick@…>
Branches:
debian
Children:
1bcb4ba
Parents:
675cc03 (diff), 267d44e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Jessica B. Hamrick <jhamrick@…> (10/10/10 12:36:44)
git-committer:
Jessica B. Hamrick <jhamrick@…> (10/10/10 12:36:44)
Message:

Merge branch 'master' into debian

Files:
31 added
3 edited

Legend:

Unmodified
Added
Removed

  • client/bin/gbr

    r43ddb7a r267d44e  
    5959    # if it is a file (and not a directory)
    6060    sub append {
    61         my $name = $File::Find::name;
    62         if (-f $name) {
    63             push(@allfiles, $name);
     61        if (-f $_) {
     62            push(@allfiles, $_);
    6463        }
    6564    }
    6665   
    67     # recursively find all the files and add them to @allfiles
    68     find(\&append, @files);
     66    # recursively find all the files and add them to @allfiles     
     67    find({ wanted => \&append, no_chdir => 1}, @files);
    6968
    7069    # if we're not shuffling the list, then sort the files.  If we are

  • .gitignore

    rb58aada r1d7e681  
    11*~
     2debian/files
     3debian/*.debhelper
     4debian/*.substvars
     5debian/*.debhelper.log
     6debian/gutenbach/
     7debian/gutenbach-client/
     8debian/gutenbach-queue/
     9debian/gutenbach-remctl/
     10debian/gutenbach-server/
     11debian/stamp-makefile-build
     12debian/tmp/
    213client/bin/*.1.gz
    3 debian/

  • Makefile

    r9c0279e r2116615  
    55install:
    66        for d in $(DIRS); do (cd $$d; $(MAKE) install); done
     7clean:
     8        for d in $(DIRS); do (cd $$d; $(MAKE) clean); done
Note: See TracChangeset for help on using the changeset viewer.