[Pkg-voip-commits] r7459 - in /asterisk/trunk/debian: asterisk.docs changelog rules

[paravoid at alioth.debian.org]

Author: paravoid
Date: Mon Jul 27 20:34:38 2009
New Revision: 7459

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7459
Log:
* Fix debian/rules so that configure isn't called twice during a build.
* Install Zaptel-to-DAHDI.txt, explains the migration procedure from Zaptel
  to DAHDI and is therefore useful when upgrading from lenny.

Modified:
    asterisk/trunk/debian/asterisk.docs
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/asterisk.docs
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk.docs?rev=7459&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk.docs (original)
+++ asterisk/trunk/debian/asterisk.docs Mon Jul 27 20:34:38 2009
@@ -3,4 +3,5 @@
 CREDITS
 UPGRADE.txt
 UPGRADE-1.6.txt
+Zaptel-to-DAHDI.txt
 CHANGES

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=7459&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon Jul 27 20:34:38 2009
@@ -29,6 +29,9 @@
     tmpfs scenarios. Thanks martin f krafft! (Closes: #524015)
   * Use the lsb-base standard way of gathering and reporting status in the
     init script. Thanks Dustin Kirkland and Ubuntu! (Closes: #506453)
+  * Fix debian/rules so that configure isn't called twice during a build.
+  * Install Zaptel-to-DAHDI.txt, explains the migration procedure from Zaptel
+    to DAHDI and is therefore useful when upgrading from lenny.
 
   [ Tzafrir Cohen ]
   * New upstream release.
@@ -40,7 +43,7 @@
   [ Lionel Elie Mamane ]
   * Install UPGRADE-1.6.txt, useful for people upgrading from lenny
 
- -- Faidon Liambotis <paravoid at debian.org>  Mon, 27 Jul 2009 22:13:15 +0300
+ -- Faidon Liambotis <paravoid at debian.org>  Mon, 27 Jul 2009 23:34:23 +0300
 
 asterisk (1:1.6.1.0~dfsg-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=7459&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Mon Jul 27 20:34:38 2009
@@ -1,7 +1,4 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# This file is public domain software, originally written by Joey Hess. 
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -30,7 +27,6 @@
 BUILDFLAGS += MENUSELECT_MOH= \
   ASTDATADIR=/usr/share/asterisk \
   ASTVARRUNDIR=/var/run/asterisk \
-
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -58,7 +54,6 @@
 # fetch script that always returns an error.
 FETCH_ENV = PATH=$$PATH:$(CURDIR)/debian/dummyprogs
 
-
 check-sounds:
 	( [ ! -f sounds/asterisk-moh-freeplay-wav.tar.gz ] && \
 	  [ ! -f sounds/fpm-calm-river.mp3 ] && \
@@ -67,7 +62,7 @@
 		(echo "WARNING: non-free fpm sounds must be removed from sources before packaging." ; false )
 	touch $@
 	
-config.status: check-sounds patch
+config.status: check-sounds debian/stamp-patched
 	dh_testdir
 
 	[ -f .version.bak ] || cp -a .version .version.bak
@@ -89,7 +84,6 @@
 		--with-pwlib=/usr/share/pwlib/include/ \
 		--with-h323=/usr/share/openh323/ 
 
-
 build: build-arch build-indep
 
 build-arch: build-arch-stamp
@@ -110,7 +104,7 @@
 	dh_testroot
 	
 	# Add here commands to clean up after the build process.
-	$(MAKE) distclean
+	GREP=grep AWK=awk $(MAKE) distclean
 	-$(RM) -rf debian/build
 
 	if [ -r configure.debian_sav ]; then mv configure.debian_sav configure; fi
@@ -152,8 +146,9 @@
 
 	# create a simple config
 	echo "; please read doc/manager.txt" > $(CURDIR)/debian/asterisk-config/etc/asterisk/manager.d/README.conf
-
-# Build architecture-independent files here.
+	touch $@
+
+binary: binary-indep binary-arch
 binary-indep: install-indep
 	dh_testdir -i
 	dh_testroot -i
@@ -175,7 +170,6 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-# Build architecture-dependent files here.
 binary-arch: install-arch
 	dh_testdir -a
 	dh_testroot -a
@@ -228,5 +222,4 @@
 	@@echo Cleaning up...
 	@@$(RM) -rf ../tarballs/asterisk-$(UPVERSION).tmp/
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install clean patch unpatch
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install clean patch unpatch