[Pkg-voip-commits] r9258 - in /dahdi-tools/trunk/debian: changelog compat control dahdi.install patches/remove_dahdi_speed patches/series rules
tzafrir at alioth.debian.org
tzafrir at alioth.debian.org
Sat Sep 10 08:54:41 UTC 2011
Author: tzafrir
Date: Sat Sep 10 08:54:41 2011
New Revision: 9258
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9258
Log:
* Switch to dh
- Patch remove_dahdi_speed: Patch the source. Don't rm later on.
* Compat level 8, while we're at it.
Added:
dahdi-tools/trunk/debian/patches/remove_dahdi_speed
Modified:
dahdi-tools/trunk/debian/changelog
dahdi-tools/trunk/debian/compat
dahdi-tools/trunk/debian/control
dahdi-tools/trunk/debian/dahdi.install
dahdi-tools/trunk/debian/patches/series
dahdi-tools/trunk/debian/rules
Modified: dahdi-tools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/changelog?rev=9258&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/changelog (original)
+++ dahdi-tools/trunk/debian/changelog Sat Sep 10 08:54:41 2011
@@ -4,8 +4,11 @@
* New upstream release.
* Standards version 3.9.2 (no change needed).
* Architecture: linux-any.
-
- -- Tzafrir Cohen <tzafrir at debian.org> Fri, 09 Sep 2011 10:02:56 +0300
+ * Switch to dh
+ - Patch remove_dahdi_speed: Patch the source. Don't rm later on.
+ * Compat level 8, while we're at it.
+
+ -- Tzafrir Cohen <tzafrir at debian.org> Fri, 09 Sep 2011 15:48:37 +0300
dahdi-tools (1:2.4.1-1) unstable; urgency=low
Modified: dahdi-tools/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/compat?rev=9258&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/compat (original)
+++ dahdi-tools/trunk/debian/compat Sat Sep 10 08:54:41 2011
@@ -1,1 +1,1 @@
-7
+8
Modified: dahdi-tools/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/control?rev=9258&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/control (original)
+++ dahdi-tools/trunk/debian/control Sat Sep 10 08:54:41 2011
@@ -4,7 +4,7 @@
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Tzafrir Cohen <tzafrir at debian.org>, Mark Purcell <msp at debian.org>
# groff, man-db and asciidoc are required for generating documentation
-Build-Depends: debhelper (>= 7), dahdi-source (>= 1:2.3.0), libnewt-dev, bzip2, libusb-dev,
+Build-Depends: debhelper (>= 8), dahdi-source (>= 1:2.3.0), libnewt-dev, bzip2, libusb-dev,
asciidoc, groff, man-db
Standards-Version: 3.9.2
Homepage: http://www.asterisk.org/
Modified: dahdi-tools/trunk/debian/dahdi.install
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/dahdi.install?rev=9258&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/dahdi.install (original)
+++ dahdi-tools/trunk/debian/dahdi.install Sat Sep 10 08:54:41 2011
@@ -1,3 +1,4 @@
+etc/init.d/dahdi
usr/sbin/*
usr/share/perl5/Dahdi*
usr/share/dahdi/*
Added: dahdi-tools/trunk/debian/patches/remove_dahdi_speed
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/remove_dahdi_speed?rev=9258&op=file
==============================================================================
--- dahdi-tools/trunk/debian/patches/remove_dahdi_speed (added)
+++ dahdi-tools/trunk/debian/patches/remove_dahdi_speed Sat Sep 10 08:54:41 2011
@@ -1,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -111,7 +111,7 @@ UTILS = dahdi_tool dahdi_test dahdi_mon
+ UTILS += patgen pattest patlooptest hdlcstress hdlctest hdlcgen \
+ hdlcverify timertest dahdi_maint
+
+-BINS:=fxotune fxstest sethdlc dahdi_cfg dahdi_diag dahdi_monitor dahdi_speed dahdi_test dahdi_scan dahdi_tool dahdi_maint
++BINS:=fxotune fxstest sethdlc dahdi_cfg dahdi_diag dahdi_monitor dahdi_test dahdi_scan dahdi_tool dahdi_maint
+ BINS:=$(filter-out $(MENUSELECT_UTILS),$(BINS))
+ MAN_PAGES:=$(wildcard $(BINS:%=doc/%.8))
+
Modified: dahdi-tools/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/series?rev=9258&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/series (original)
+++ dahdi-tools/trunk/debian/patches/series Sat Sep 10 08:54:41 2011
@@ -1,3 +1,4 @@
zaptel_perl
echocan_oslec
init_unload_oslec
+remove_dahdi_speed
Modified: dahdi-tools/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/rules?rev=9258&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/rules (original)
+++ dahdi-tools/trunk/debian/rules Sat Sep 10 08:54:41 2011
@@ -5,23 +5,12 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-USE_BRISTUFF=1
-export HOTPLUG_FIRMWARE=1
-
--include /usr/share/quilt/quilt.make
-
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
endif
-## MODULE-ASSISTANT STUFF
-# prefix of the target package name
PREFIX:=dahdi
-SKPG:=$(PREFIX)-source
-PACKAGE:=$(PREFIX)
PACKAGE_SRC:=$(PREFIX)-tools
-# modifieable for experiments or debugging m-a
DEBVERSION:=$(shell head -n 1 debian/changelog \
| sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
@@ -32,98 +21,22 @@
FILENAME := $(PACKAGE_SRC)_$(DEB_BASE_VERSION).orig.tar.gz
URL := http://downloads.asterisk.org/pub/telephony/$(PACKAGE_SRC)/releases/$(PACKAGE_SRC)-$(UPVERSION).tar.gz
-build: patch build-stamp
-build-stamp:
- dh_testdir
-
- cp -a dahdi.init debian/
- ./configure
+%:
+ dh $@
+
+override_dh_auto_build:
$(MAKE) programs docs
# FIXME: xpp/README.Astribank.html
- touch $@
-clean: clean-unpatched unpatch
-clean-unpatched:
- dh_testdir
- dh_testroot
- rm -f *-stamp
-
- # * Makefile does not exist when running svn-buildpackage
- # as the source tree is not there.
- # FIXME: This will fail with an ugly warning on the clean of the
- # modules build. However only fter the actuual clean.
- [ ! -f Makefile ] || $(MAKE) dist-clean || true
- rm -f debian/dahdi.init
- #rm -f debian/manpage.links debian/manpage.refs debian/*.8
- dh_clean
-install: install-arch install-indep
+override_dh_auto_install:
+ # Without this dahdi.init does not get copied:
+ mkdir -p $(CURDIR)/debian/tmp/etc/init.d
+ # also run the 'config' target, in addition to the 'install' target:
+ dh_auto_install -- config
-install-arch: build-stamp
- dh_testdir
- dh_testroot
- dh_prep -a
- dh_installdirs -a
-
- # Add here commands to install the package into debian/tmp
-
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- # Until upstream kill this stupid thing:
- rm -f $(CURDIR)/debian/tmp/usr/sbin/dahdi_speed
- # Revert upstream r5533:
- rm -f $(CURDIR)/debian/tmp/usr/lib/libtonezone.so.1*
-
- dh_install -a --sourcedir=$(CURDIR)/debian/tmp
- dh_installinit --update-rcd-params="defaults 15 30"
-
-install-indep: build-stamp
- dh_testdir
- dh_testroot
- dh_prep -i
- dh_installdirs -i
-
-
-# Build architecture-independent files here.
-binary-indep: build install-indep
- dh_testdir
- dh_testroot
-
- dh_installdocs -i
- dh_installchangelogs -i ChangeLog
- dh_installexamples -i $(BRISTUFF_EXAMPLES)
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install-arch
- dh_testdir
- dh_testroot
-
- dh_installdocs -a
-
- # should be removed, eventually. Still left for compatibility
- dh_installexamples -a
-
-
- #dh_installmodules -a
- dh_installchangelogs -a ChangeLog
- dh_link -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- # perl modules are in the arch-dep dahdi
- dh_perl -a
- dh_makeshlibs -a -V
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+override_dh_installinit:
+ dh_installinit --onlyscripts
print-version:
@@echo "Debian version: $(DEBVERSION)"
@@ -136,5 +49,3 @@
@@echo Downloading $(UPFILENAME) from $(URL) ...
@@wget -nv -T10 -t3 --verbose -O ../tarballs/$(FILENAME) $(URL)
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
More information about the Pkg-voip-commits
mailing list