Changeset 7b63831


Ignore:
Timestamp:
Jun 28, 2010, 10:08:16 PM (14 years ago)
Author:
Jessica B. Hamrick <jhamrick@…>
Branches:
debian
Children:
1817635
Parents:
8d688ee (diff), ae7cf76 (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/28/10 22:08:16)
git-committer:
Jessica B. Hamrick <jhamrick@…> (06/28/10 22:08:16)
Message:

Merge branch 'master' into debian

Files:
29 added
4 edited

Legend:

Unmodified
Added
Removed

  • client/Makefile

    r31e1c660 rae7cf76  
    99        gzip -9 < bin/gutenbach-client-config.1 > bin/gutenbach-client-config.1.gz
    1010        mkdir -p $(DESTDIR)/usr/share/man/man1/
    11         install -m 755 bin/*.1.gz $(DESTDIR)/usr/share/man/man1/
     11        install -m 644 bin/*.1.gz $(DESTDIR)/usr/share/man/man1/
    1212
    1313clean:

  • remctl/Makefile

    rfad0d1b rae7cf76  
    44        mkdir -p $(DESTDIR)/usr/lib/gutenbach/remctl/
    55        mkdir -p $(DESTDIR)/etc/remctl/conf.d/
    6         install -m 755 lib/gutenbach/* $(DESTDIR)/usr/lib/gutenbach/remctl/
    7         install -m 755 lib/remctl/* $(DESTDIR)/etc/remctl/conf.d/
     6        install -m 755 lib/gutenbach/cd-* $(DESTDIR)/usr/lib/gutenbach/remctl/
     7        install -m 755 lib/gutenbach/status-* $(DESTDIR)/usr/lib/gutenbach/remctl/
     8        install -m 755 lib/gutenbach/volume-* $(DESTDIR)/usr/lib/gutenbach/remctl/
     9        install -m 644 lib/gutenbach/voldaemon.c $(DESTDIR)/usr/lib/gutenbach/remctl/
     10        install -m 644 lib/remctl/* $(DESTDIR)/etc/remctl/conf.d/
    811
    912clean:

  • server/Makefile

    rfad0d1b rae7cf76  
    66        mkdir -p $(DESTDIR)/usr/lib/gutenbach/rm
    77        install -m 755 lib/gutenbach $(DESTDIR)/usr/lib/cups/backend
    8         install -m 755 lib/* $(DESTDIR)/usr/lib/gutenbach/
     8        install -m 755 lib/gutenbach-get-config $(DESTDIR)/usr/lib/gutenbach/
     9        install -m 644 lib/README $(DESTDIR)/usr/lib/gutenbach/
     10        install -m 644 lib/TODO $(DESTDIR)/usr/lib/gutenbach/           
    911        install -m 755 inst/* $(DESTDIR)/usr/lib/gutenbach/inst/
    1012        install -m 755 rm/* $(DESTDIR)/usr/lib/gutenbach/rm/

  • .gitignore

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