[Pkg-voip-commits] r4380 - in zaptel/trunk/debian: . backports

[kilian at alioth.debian.org]

Author: kilian
Date: 2007-09-02 11:31:35 +0000 (Sun, 02 Sep 2007)
New Revision: 4380

Modified:
   zaptel/trunk/debian/backports/sarge
   zaptel/trunk/debian/changelog
Log:
fix sarge backport.


Modified: zaptel/trunk/debian/backports/sarge
===================================================================
--- zaptel/trunk/debian/backports/sarge	2007-09-02 10:07:16 UTC (rev 4379)
+++ zaptel/trunk/debian/backports/sarge	2007-09-02 11:31:35 UTC (rev 4380)
@@ -1,11 +1,11 @@
 #!/bin/bash
 #
-# Hook for automatic backports at buildserver.net
+# Hook for automatic backports at Buildserver.NET
 #
 # Target dist: Debian Sarge
 
 # Downgrade debhelper to 4.0.4 compat level as in zaptel 1:1.0.7-5 (DH_COMPAT=4 is set in rules anyway?!)
-sed -i -e  's#^\(Build-Depends:.*\)debhelper[^,$]*[\ ,$]\+\(.*\)$#\1debhelper (>= 4.0.4), \2#' debian/control
+sed -i -e 's#^\(Build-Depends:.*\)debhelper[^,$]*[\ ,$]\+\(.*\)$#\1debhelper (>= 4.0.4), \2#' debian/control
 
 # Undo binary:Version and source:Version
 sed -i -e 's#binary:Version#Source-Version#g' \
@@ -13,4 +13,9 @@
   -e 's#^\(Build-Depends:.*\),\ *dpkg-dev ([^)]*)\(.*\)$#\1\2#' \
   debian/control
 
+# remove asciidoc
+sed -i -e 's#^\(Build-Depends:.*\)asciidoc[^,$]*[\ ,$]\+\(.*\)$#\1\2#' debian/control
+sed -i -e 's/^\(.*\)asciidoc/#\1/' Makefile
+sed -i -e '/README.html/d' -e '/xpp\/README.Astribank.html/d' debian/docs
+
 exit 0

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2007-09-02 10:07:16 UTC (rev 4379)
+++ zaptel/trunk/debian/changelog	2007-09-02 11:31:35 UTC (rev 4380)
@@ -1,11 +1,10 @@
 zaptel (1:1.4.5.1~dfsg-2) UNRELEASED; urgency=low
 
-  [ Kilian Krause ]
   * NOT RELEASED YET
-  * Update oslec to r942 . Add mmx.h (disabled for now).
+
+  [ Kilian Krause ]
+  * Update oslec to r942. Add mmx.h (disabled for now).
   * Do export oslec_echo_can_identify from oslec.ko (Closes: #439814).
-  * Fix asciidoc build requirement to >= 7.0.2 for the implicit use of a
-    default backend.
 
   [ Mark Purcell ]
   * Remove Build-Depends restrictions for packages in stable