[Pkg-voip-commits] r3949 - in asterisk/branches/experimental/debian: . backports

[paravoid at alioth.debian.org]

Author: paravoid
Date: 2007-08-07 01:37:34 +0000 (Tue, 07 Aug 2007)
New Revision: 3949

Added:
   asterisk/branches/experimental/debian/backports/edgy
   asterisk/branches/experimental/debian/backports/feisty
Modified:
   asterisk/branches/experimental/debian/asterisk.init
   asterisk/branches/experimental/debian/backports/dapper
   asterisk/branches/experimental/debian/changelog
Log:
Manual merge of latest trunk to experimental

Modified: asterisk/branches/experimental/debian/asterisk.init
===================================================================
--- asterisk/branches/experimental/debian/asterisk.init	2007-08-07 01:21:40 UTC (rev 3948)
+++ asterisk/branches/experimental/debian/asterisk.init	2007-08-07 01:37:34 UTC (rev 3949)
@@ -103,13 +103,13 @@
 
 test -x $DAEMON || exit 0
 
-set -e
-
 if [ ! -d "$PIDFILE_DIR" ];then
 	mkdir "$PIDFILE_DIR"
 	chown $USER:$GROUP "$PIDFILE_DIR"
 fi
 
+set -e
+
 if [ "$UMASK" != '' ]
 then
 	umask $UMASK

Modified: asterisk/branches/experimental/debian/backports/dapper
===================================================================
--- asterisk/branches/experimental/debian/backports/dapper	2007-08-07 01:21:40 UTC (rev 3948)
+++ asterisk/branches/experimental/debian/backports/dapper	2007-08-07 01:37:34 UTC (rev 3949)
@@ -7,4 +7,7 @@
 # Replace libcurl4-dev with libcurl3-dev
 sed -i -e 's#^\(Build-Depends:.*\)libcurl4-dev[^\ ]* \(.*\)$#\1libcurl3-dev \2#' debian/control
 
+# Replace libsnmp10-dev with libsnmp9-dev
+sed -i -e 's#^\(Build-Depends:.*\)libsnmp10-dev[^\ ]* \(.*\)$#\1libsnmp9-dev \2#' debian/control
+
 exit 0

Added: asterisk/branches/experimental/debian/backports/edgy
===================================================================
--- asterisk/branches/experimental/debian/backports/edgy	                        (rev 0)
+++ asterisk/branches/experimental/debian/backports/edgy	2007-08-07 01:37:34 UTC (rev 3949)
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Hook for automatic backports at buildserver.net
+#
+# Target dist: Debian Etch
+
+# Replace libcurl4-dev with libcurl3-dev
+sed -i -e 's#^\(Build-Depends:.*\)libcurl4-dev[^\ ]* \(.*\)$#\1libcurl3-dev \2#' debian/control
+
+# Replace libsnmp10-dev with libsnmp9-dev
+sed -i -e 's#^\(Build-Depends:.*\)libsnmp10-dev[^\ ]* \(.*\)$#\1libsnmp9-dev \2#' debian/control
+
+exit 0


Property changes on: asterisk/branches/experimental/debian/backports/edgy
___________________________________________________________________
Name: svn:executable
   + *

Added: asterisk/branches/experimental/debian/backports/feisty
===================================================================
--- asterisk/branches/experimental/debian/backports/feisty	                        (rev 0)
+++ asterisk/branches/experimental/debian/backports/feisty	2007-08-07 01:37:34 UTC (rev 3949)
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# Hook for automatic backports at buildserver.net
+#
+# Target dist: Debian Etch
+
+# Replace libcurl4-dev with libcurl3-dev
+sed -i -e 's#^\(Build-Depends:.*\)libcurl4-dev[^\ ]* \(.*\)$#\1libcurl3-dev \2#' debian/control
+
+# Replace libsnmp10-dev with libsnmp9-dev
+sed -i -e 's#^\(Build-Depends:.*\)libsnmp10-dev[^\ ]* \(.*\)$#\1libsnmp9-dev \2#' debian/control
+
+exit 0


Property changes on: asterisk/branches/experimental/debian/backports/feisty
___________________________________________________________________
Name: svn:executable
   + *

Modified: asterisk/branches/experimental/debian/changelog
===================================================================
--- asterisk/branches/experimental/debian/changelog	2007-08-07 01:21:40 UTC (rev 3948)
+++ asterisk/branches/experimental/debian/changelog	2007-08-07 01:37:34 UTC (rev 3949)
@@ -1,11 +1,12 @@
 asterisk (1:1.4.9~dfsg-2) UNRELEASED; urgency=low
 
-  [ Mark Purcell ]
   * NOT RELEASED YET
+
+  [ Mark Purcell ]
   * debhelper(1) states Build-Depends: debhelper (>= 5)
-    - aids etch backports
-  * backports/etch replace libcurl4-dev with libcurl3-dev
-  * backports/dapper replace libcurl4-dev with libcurl3-dev
+    - aids backports
+  * Update debian/backports for etch, edgy, dapper and feisty
+    - http://status.buildserver.net/packages/status.php?package=asterisk&subdist=pkg-voip
 
   [ Faidon Liambotis ]
   * Refer to /usr/share/common-licenses/GPL-2 instead of GPL. The code is
@@ -14,11 +15,12 @@
     /usr/share/asterisk/keys where they should be.
   * Actually ship keys, including Junction Networks' by fixing pubkey_jnctn
     patch.
-  * Correct descriptions of packages in debian/control, adapting them to the 
+  * Correct descriptions of packages in debian/control, adapting them to the
     present and correcting some spelling mistakes. (Closes: #428671)
   * Add a noload directive for cdr_sqlite.so in the default modules.conf since
     it writes unconditionally to the database file without being rotated,
-    resulting in unexpected waste of disk space. (Closes: #301883)'
+    resulting in unexpected waste of disk space. (Closes: #301883)
+  * Delete duplicated creation of /var/run/asterisk in the init script.
   * Major overhaul of the postinst scripts, completely replacing asterisk_fix.
     - Create Asterisk's directories on asterisk.dirs to track them using dpkg.
     - Add asterisk.postinst which calls adduser, chown, chmod. Improve error
@@ -38,9 +40,6 @@
     (use-libpri-bristuffed).
   * Ship xagi-test.c (from bristuff) to examples.
 
-  [ Kilian Krause ]
-  * backports/etch: replace libsnmp10-dev with libsnmp9-dev
-
  -- Faidon Liambotis <paravoid at debian.org>  Mon, 06 Aug 2007 11:19:27 +0300
 
 asterisk (1:1.4.9~dfsg-1) unstable; urgency=high