Changeset 5aace3f


Ignore:
Timestamp:
Aug 14, 2010, 7:08:38 PM (14 years ago)
Author:
Kyle Brogle <broglek@…>
Branches:
debian
Children:
5fe95f7
Parents:
27d5cd1 (diff), 55b24d1 (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:
Kyle Brogle <broglek@…> (08/14/10 19:08:38)
git-committer:
Kyle Brogle <broglek@…> (08/14/10 19:08:38)
Message:

Merge branch 'master' into debian

Files:
31 added
3 edited

Legend:

Unmodified
Added
Removed

  • server/inst/create-filter-config

    r30beeab r55b24d1  
    2222    failed="yes"
    2323fi
     24if [ -e /usr/lib/gutenbach/remctl/config/mixer ]; then
     25    mixer=$(cat /usr/lib/gutenbach/remctl/config/mixer)
     26else
     27    mixer="PCM"
     28fi
     29if [ -e /usr/lib/gutenbach/remctl/config/channel ]; then
     30    channel=$(cat /usr/lib/gutenbach/remctl/config/channel)
     31else
     32    channel="Front Left"
     33fi
    2434
    25 mixer="PCM"
    26 channel="Front Left"
     35
     36
    2737config_file="/usr/lib/gutenbach/config/gutenbach-filter-config.pl"
    2838

  • .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.