Changeset bdfed5d


Ignore:
Timestamp:
Jun 29, 2010, 7:34:15 PM (14 years ago)
Author:
Jessica B. Hamrick <jhamrick@…>
Branches:
debian
Children:
af9ecf8
Parents:
b7ab9d0 (diff), 611bd26 (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@…> (06/29/10 19:34:15)
git-committer:
Jessica B. Hamrick <jhamrick@…> (06/29/10 19:34:15)
Message:

Merge branch 'master' into debian

Files:
29 added
3 edited

Legend:

Unmodified
Added
Removed

  • client/bin/gbr

    r30beeab r611bd26  
    3131}
    3232
    33 my @args = ("lp", "-h$host", "-d$queue", "$file");
     33my @args = ("CUPS_SERVER=$host", "lp", "-d$queue", "$file");
    3434exec (@args) or die "Couldn't execute lp command";

  • client/bin/gbrm

    r30beeab r611bd26  
    3434
    3535if ($id eq "all") {
    36     @args = ("cancel", "-a", "-h$host", "$queue");
     36    @args = ("CUPS_SERVER=$host", "cancel", "-a", "$queue");
    3737}
    3838else {
    39     @args = ("cancel", "-h$host", "$id", "$queue");
     39    @args = ("CUPS_SERVER=$host", "cancel", "$id", "$queue");
    4040}
    4141exec (@args) or die "Couldn't execute cancel command";

  • .gitignore

    r323f614 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
Note: See TracChangeset for help on using the changeset viewer.