[Pkg-voip-commits] r4502 - in /zaptel/trunk/debian: backports/sarge changelog rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sat Sep 15 11:25:04 2007
New Revision: 4502

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4502
Log:
Fix asciidoc buildign in Sarge (temporary fix, until we get upstream fix
in 1.4.6).

Modified:
    zaptel/trunk/debian/backports/sarge
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/rules

Modified: zaptel/trunk/debian/backports/sarge
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/backports/sarge?rev=4502&op=diff
==============================================================================
--- zaptel/trunk/debian/backports/sarge (original)
+++ zaptel/trunk/debian/backports/sarge Sat Sep 15 11:25:04 2007
@@ -13,9 +13,4 @@
   -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/^\(.*\)README.html/\1/' -e 's/^\(.*\)xpp\/README.Astribank.html/\1/' debian/rules
-sed -i -e '/README.html/d' -e '/xpp\/README.Astribank.html/d' debian/docs
-
 exit 0

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=4502&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Sat Sep 15 11:25:04 2007
@@ -12,6 +12,8 @@
   [ Tzafrir Cohen ]
   * vzaphfc: update to 1.44, and apply our fixes.
   * vzaphfc: fix building with Sarge 2.6 kernels.
+  * Fix asciidoc buildign in Sarge (temporary fix, until we get upstream fix
+    in 1.4.6).
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 15 Sep 2007 04:43:53 +0300
 

Modified: zaptel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/rules?rev=4502&op=diff
==============================================================================
--- zaptel/trunk/debian/rules (original)
+++ zaptel/trunk/debian/rules Sat Sep 15 11:25:04 2007
@@ -90,12 +90,27 @@
 	| awk -F\" '{ print $$2"\t"$$4 }' \
 	>>$@
 
+# A workaround for version incompatibility of asciidoc to fix Sarge build. 
+# This is fixed properly upstream svn, but adding an autoconf patch is 
+# just as much work. Remove this on Zaptel 1.4.6.
+debian/fake/asciidoc:
+	mkdir -p $(@D)
+	echo '#!/bin/sh' >$@
+	echo 'exec /usr/bin/asciidoc -b xhtml "$$@"' >>$@
+	chmod a+x $@
+
+ASCIIDOC_6_TEST		= asciidoc --version 2>&1 | grep -q 'asciidoc 6'
+ASCIIDOC_SET_PATH	= if $(ASCIIDOC_6_TEST); then \
+			    PATH=$(PWD)/debian/fake:$$PATH; export PATH; \
+			  fi
+
 build: build-stamp
 build-stamp: patch-stamp tonezones.txt
 	dh_testdir
 	
 	./configure
 	$(MAKE) $(GENERATED_SOURCES)
+	$(ASCIIDOC_SET_PATH) ; \
 	$(MAKE) programs README.html xpp/README.Astribank.html
 	touch $@
 
@@ -109,6 +124,7 @@
 	rm -rf $(MOD_EXAMPLES_DIR)
 	rm -f tonezones.txt
 	rm -f $(GENERATED_SOURCES)
+	rm -rf debian/fake
 	-$(MAKE) clean
 	
 	#rm -f debian/manpage.links  debian/manpage.refs debian/*.8