[Pkg-voip-commits] r10100 - in /asterisk/branches/experimental/debian: asterisk.manpages changelog clean control patches/astdatadir patches/series rules

tzafrir at alioth.debian.org tzafrir at alioth.debian.org
Sun Feb 17 15:09:46 UTC 2013 

Author: tzafrir
Date: Sun Feb 17 15:09:46 2013
New Revision: 10100

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10100
Log:
Convert rules to dh.

Convert rules to dh:
* Patch astdatadir: set datadir in /usr/share/asterisk instead of
  using an environment variable.
* Removed some unneeded craft (such as -XREADME.Cygwin).

Added:
    asterisk/branches/experimental/debian/asterisk.manpages
    asterisk/branches/experimental/debian/patches/astdatadir
Modified:
    asterisk/branches/experimental/debian/changelog
    asterisk/branches/experimental/debian/clean
    asterisk/branches/experimental/debian/control
    asterisk/branches/experimental/debian/patches/series
    asterisk/branches/experimental/debian/rules

Added: asterisk/branches/experimental/debian/asterisk.manpages
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/asterisk.manpages?rev=10100&op=file
==============================================================================
--- asterisk/branches/experimental/debian/asterisk.manpages (added)
+++ asterisk/branches/experimental/debian/asterisk.manpages Sun Feb 17 15:09:46 2013
@@ -1,0 +1,3 @@
+utils/*.1
+doc/*.8
+contrib/scripts/*.8

Modified: asterisk/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/changelog?rev=10100&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/changelog (original)
+++ asterisk/branches/experimental/debian/changelog Sun Feb 17 15:09:46 2013
@@ -1,4 +1,4 @@
-asterisk (1:11.2.1~dfsg-1) experimental; urgency=low
+asterisk (1:11.2.1~dfsg-1) UNRELEASED; urgency=low
 
   [ Faidon Liambotis ]
   * New major upstream release.
@@ -18,6 +18,9 @@
   * Patch undeprecate: undeprecate meetme.
   * increased compat level for debian/clean.
   * Disable hardening for now.
+  * Convert rules to dh.
+    - Patch astdatadir: set datadir in /usr/share/asterisk instead of
+      using an environment variable.
 
   [ David Sarmiento ]
   * Re-enabled pjproject

Modified: asterisk/branches/experimental/debian/clean
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/clean?rev=10100&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/clean (original)
+++ asterisk/branches/experimental/debian/clean Sun Feb 17 15:09:46 2013
@@ -13,3 +13,7 @@
 res/pjproject/pjsip/include/pjsip/sip_autoconf.h
 res/pjproject/third_party/build/os-auto.mak
 res/pjproject/third_party/build/portaudio/os-auto.mak
+doc/core-en_US.xml
+utils/poll.c
+menuselect/mxml/mxml.pc
+menuselect.makeopts

Modified: asterisk/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/control?rev=10100&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/control (original)
+++ asterisk/branches/experimental/debian/control Sun Feb 17 15:09:46 2013
@@ -3,7 +3,7 @@
 Section: comm
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Tzafrir Cohen <tzafrir at debian.org>
-Build-Depends: debhelper (>= 6.0.7),
+Build-Depends: debhelper (>= 8),
  dpkg-dev (>= 1.16.1.1),
  lsb-base (>= 3.2-14),
  libreadline-dev | libreadline5-dev,
@@ -20,6 +20,7 @@
  libvpb-dev [linux-any],
  dahdi-source,
  autotools-dev,
+ dh-autoreconf,
  autoconf,
  automake,
  libnewt-dev,

Added: asterisk/branches/experimental/debian/patches/astdatadir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/astdatadir?rev=10100&op=file
==============================================================================
--- asterisk/branches/experimental/debian/patches/astdatadir (added)
+++ asterisk/branches/experimental/debian/patches/astdatadir Sun Feb 17 15:09:46 2013
@@ -1,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,7 +51,7 @@ AC_SUBST([astlibdir],         ['${libdir
+ AC_SUBST([astmoddir],         ['${libdir}/asterisk/modules'])dnl
+ AC_SUBST([astmandir],         ['${mandir}'])dnl
+ AC_SUBST([astvarlibdir],      ['${localstatedir}/lib/asterisk'])dnl
+-AC_SUBST([astdatadir],        ['${astvarlibdir}'])dnl
++AC_SUBST([astdatadir],        ['${datadir}/asterisk'])dnl
+ AC_SUBST([astdbdir],          ['${astvarlibdir}'])dnl
+ AC_SUBST([astkeydir],         ['${astvarlibdir}'])dnl
+ AC_SUBST([astspooldir],       ['${localstatedir}/spool/asterisk'])dnl

Modified: asterisk/branches/experimental/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/series?rev=10100&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/series (original)
+++ asterisk/branches/experimental/debian/patches/series Sun Feb 17 15:09:46 2013
@@ -20,3 +20,4 @@
 no_uname
 
 ilbc_disable
+astdatadir

Modified: asterisk/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/rules?rev=10100&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/rules (original)
+++ asterisk/branches/experimental/debian/rules Sun Feb 17 15:09:46 2013
@@ -13,6 +13,8 @@
 #  please enable "PIE" and "BINDNOW" in the build.
 #  The "all" option enables "PIE" and "BINDNOW" and future hardening flags
 
+%:
+	dh "$@" --with autotools_dev,autoreconf
 
 #export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
@@ -42,8 +44,6 @@
 # show full gcc arguments instead of [CC] and [LD]
 BUILDFLAGS += NOISY_BUILD=yes
 
-BUILDFLAGS += ASTDATADIR=/usr/share/asterisk ASTVARRUNDIR=/var/run/asterisk
-
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	ENABLE_DEBUG += --enable-dev-mode
 endif
@@ -67,15 +67,12 @@
 # fetch script that always returns an error.
 FETCH_ENV = PATH=$$PATH:$(CURDIR)/debian/dummyprogs
 
-configure: configure.ac
-	if [ ! -f configure_deborig ]; then mv configure configure_deborig; fi
-	./bootstrap.sh
+override_dh_autoreconf:
+	dh_autoreconf -- ./bootstrap.sh
 
 # Make sure the configure script gets an CFLAGS parameter. Otherwise
 # it will build with -march=native
-config.status: configure
-	dh_testdir
-
+override_dh_auto_configure:
 	[ -f .version.debian_sav ] || cp -a .version .version.debian_sav
 	echo $(DEB_NOEPOCH_VERSION) > .version
 
@@ -98,47 +95,24 @@
 
 #		--with-cap \
 
-build: build-arch build-indep
-
-build-arch: build-arch-stamp
-build-arch-stamp: config.status
-	dh_testdir
+override_dh_auto_build:
 	$(MAKE) menuselect.makeopts
 	@if [ "x${ENABLE_DEBUG}" != "x" ] ; then \
 		menuselect/menuselect --enable DONT_OPTIMIZE menuselect.makeopts ; \
 		menuselect/menuselect --enable DEBUG_THREADS menuselect.makeopts ; \
 	fi
 	$(FETCH_ENV) $(MAKE) $(BUILDFLAGS)
-	touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: config.status
-	dh_testdir
-	touch $@
 
 SND_FILE=asterisk-core-sounds-en-gsm-1.4.20.tar.gz
-clean:
-	dh_testdir
-	dh_testroot
-	
-	# The clean target seems to be run before patches are applied.
-	# A brute-force fix to keep the tarball from getting deleted:
-	# (if it has not been stripped from upstream tarball)
+override_dh_clean:
 	if [ -r sounds/$(SND_FILE) ]; then mv sounds/$($SND_FILE) debian/; fi
 	GREP=grep AWK=awk $(MAKE) distclean
 	if [ -r debian/$(SND_FILE) ]; then mv debian/$(SND_FILE) sounds/; fi
-	-$(RM) -rf debian/build
 
-	if [ -r configure.debian_sav ]; then mv configure.debian_sav configure; fi
 	-test -d configs && chmod -x configs/*.sample
-	-$(RM) -f build-arch-stamp build-indep-stamp install-arch install-indep
-	-$(RM) -f config.status menuselect.makeopts
 
 	[ ! -f .version.debian_sav ] || mv .version.debian_sav .version
 	if [ -f configure_deborig ]; then mv configure_deborig configure; fi
-
-	# these were generated while building
-	-$(RM) -f doc/core-en_US.xml utils/poll.c menuselect/mxml/mxml.pc
 
 	dh_clean
 
@@ -151,19 +125,12 @@
 SUBPACKS_EXTRA_DIRS = $(SUBPACKS_EXTRA:%=$(CURDIR)/debian/asterisk-%)
 SUBPACKS_EXTRA_DIRS_MOD = $(SUBPACKS_EXTRA_DIRS:%=%/usr/lib/asterisk/modules)
 
-install: install-arch install-indep
-install-arch: build-arch
-	dh_testdir
-	dh_testroot
-	dh_prep -s
-	dh_installdirs -s
-	
-	$(FETCH_ENV) $(MAKE) $(BUILDFLAGS) DESTDIR=$(CURDIR)/debian/tmp install
+override_dh_auto_install:
+	$(FETCH_ENV) dh_auto_install $(BUILDFLAGS)
 	cp -a configs $(CURDIR)/debian/tmp/usr/share/asterisk/conf
 
-	dh_install -s --sourcedir=debian/tmp
-	dh_lintian -s
-
+override_dh_install:
+	dh_install
 	$(RM) -f $(CURDIR)/debian/asterisk/usr/sbin/aelparse
 	$(RM) -f $(CURDIR)/debian/asterisk/usr/sbin/conf2ael
 	$(RM) -f $(CURDIR)/debian/asterisk/usr/sbin/muted
@@ -182,61 +149,15 @@
 	mv $(CURDIR)/debian/asterisk-voicemail-odbcstorage/usr/lib/asterisk/modules/app_voicemail_odbcstorage.so \
 		$(CURDIR)/debian/asterisk-voicemail-odbcstorage/usr/lib/asterisk/modules/app_voicemail.so
 
-	touch $@
-
-install-indep: build-indep
-	dh_testdir
-	dh_testroot
-	dh_prep -i
-	dh_installdirs -i
-
-	$(FETCH_ENV) $(MAKE) $(BUILDFLAGS) DESTDIR=$(CURDIR)/debian/tmp install samples
-	dh_install -i --sourcedir=debian/tmp
-	dh_lintian -i
-
-	# create a simple config
-	echo "; please read the documentation regarding the Manager Interface (asterisk-doc package)" > \
-		$(CURDIR)/debian/asterisk-config/etc/asterisk/manager.d/README.conf
-	touch $@
-
-binary: binary-indep binary-arch
-binary-indep: install-indep
-	dh_testdir -i
-	dh_testroot -i
-	dh_installlogrotate -i 
-	dh_installdocs -i -XREADME.cygwin
-	dh_installexamples -i
-	dh_installcron -i
-	dh_installchangelogs ChangeLog -i
-	dh_link -i 
-	dh_compress -i
-	dh_fixperms -i
+override_dh_fixperms:
+	dh_fixperms
 	# should follow dh_fixperms; asterisk configurations may contain
 	# sensitive information, such as passwords
 	chmod o-rwx $(CURDIR)/debian/asterisk-config/etc/asterisk/*
 	chmod o+rx  $(CURDIR)/debian/asterisk-config/etc/asterisk/manager.d
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
 
-binary-arch: install-arch
-	dh_testdir -a
-	dh_testroot -a
-	dh_installlogrotate -a
-	dh_installdocs -a
-	dh_installman utils/*.1 doc/*.8 contrib/scripts/*.8
-	dh_installexamples -a
-	dh_installchangelogs ChangeLog -a
-	dh_installinit -a -- defaults 21
-	dh_strip -a --dbg-package=asterisk-dbg
-	dh_link -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+override_dh_strip:
+	dh_strip --dbg-package=asterisk-dbg
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
@@ -273,4 +194,3 @@
 	@echo Cleaning up...
 	@$(RM) -rf ../tarballs/asterisk-$(UPVERSION).tmp/
 
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install clean

More information about the Pkg-voip-commits mailing list