[SCM] Debian packaging for jack-audio-connection-kit branch, master.jackd2, updated. debian/1.9.4+svn3842-2-24-g6b0dbd2

[adiknoth-guest at users.alioth.debian.org]

The following commit has been merged in the master.jackd2 branch:
commit 6b0dbd236e63e309ae3975fd441f9f99738de7d8
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Mar 1 22:40:12 2010 +0100

    Provide /etc/security/limits.d/audio.conf in the package.
    
    Up until now, we generated audio.conf from the postinst script.
    Unfortunately, manual changes to this file were overwritten. Instead of
    checking a hash, we simply rely on dpkg to take care of this file.

diff --git a/debian/audio.conf b/debian/audio.conf
new file mode 100644
index 0000000..7081b4a
--- /dev/null
+++ b/debian/audio.conf
@@ -0,0 +1,11 @@
+# Provided by the jackd package.
+#
+# Changes to this file will be preserved.
+#
+# If you want to enable/disable realtime permissions, run
+#
+#    dpkg-reconfigure -p high jackd
+
+ at audio   -  rtprio     95
+ at audio   -  memlock    unlimited
+#@audio   -  nice      -19
diff --git a/debian/jackd.install b/debian/jackd.install
index 5db77be..c4b2175 100644
--- a/debian/jackd.install
+++ b/debian/jackd.install
@@ -1,3 +1,4 @@
 debian/tmp/usr/bin/jack*
 debian/tmp/usr/share/*
 debian/bash_completion.d etc
+debian/audio.conf etc/security/limits.d
diff --git a/debian/jackd.postinst b/debian/jackd.postinst
index 2b423fa..853e940 100644
--- a/debian/jackd.postinst
+++ b/debian/jackd.postinst
@@ -7,23 +7,10 @@ CONFIG_FILE=/etc/security/limits.d/audio.conf
 
 db_get jackd/tweak_rt_limits
 if [ $RET = "true" ]; then
-   mkdir -p $(dirname $CONFIG_FILE)
-   cat > $CONFIG_FILE << EOF
-# generated by jackd's postinst.
-#
-# Do not edit this file by hand, use
-#
-#    dpkg-reconfigure -p high jackd
-#
-# instead.
- at audio   -  rtprio     99
- at audio   -  memlock    unlimited
-#@audio   -  nice      -19
-EOF
-
+    mv $CONFIG_FILE{.disabled,} || true
 else
     # user doesn't want RT prio
-    rm -rf $CONFIG_FILE
+    mv $CONFIG_FILE{,.disabled} || true
 fi
 
 #DEBHELPER#

-- 
Debian packaging for jack-audio-connection-kit