[Pkg-voip-commits] r9256 - in /dahdi-linux/trunk/debian: changelog control dahdi-linux.dahdi.udev dahdi-linux.lintian-overrides dahdi-linux.udev patches/notest patches/series rules

tzafrir at alioth.debian.org tzafrir at alioth.debian.org
Fri Sep 9 09:40:07 UTC 2011 

Author: tzafrir
Date: Fri Sep  9 09:40:06 2011
New Revision: 9256

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9256
Log:
* New upstream release: 2.5.0.1 (Closes: #639702)
* Switch to dh.
* Patch notest: Remove a bogus upstream 'test' target.
* Lintian override for an odd interpteter a dummy kernel module init script.
* Dahdi udev rules are now named 'dahdi-linux.conf'.

Added:
    dahdi-linux/trunk/debian/dahdi-linux.lintian-overrides
    dahdi-linux/trunk/debian/dahdi-linux.udev
      - copied unchanged from r9255, dahdi-linux/trunk/debian/dahdi-linux.dahdi.udev
    dahdi-linux/trunk/debian/patches/notest
Removed:
    dahdi-linux/trunk/debian/dahdi-linux.dahdi.udev
Modified:
    dahdi-linux/trunk/debian/changelog
    dahdi-linux/trunk/debian/control
    dahdi-linux/trunk/debian/patches/series
    dahdi-linux/trunk/debian/rules

Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=9256&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Fri Sep  9 09:40:06 2011
@@ -1,6 +1,6 @@
-dahdi-linux (1:2.5.0+dfsg-1) UNRELEASED; urgency=low
-
-  * New upstream release.
+dahdi-linux (1:2.5.0.1+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release (Closes: #639702).
     - Patch wcb4xxp_bn4s0e removed: merged upstream.
     - Patch define_spinlock removed: merged upstream.
     - Patch dahdi-linux-extra updated.
@@ -11,8 +11,12 @@
     - Updated OpenVox drivers: opvxd115 added (digital cards).
   * Patch define_spinlock: include a (slightly big) build fix from upstream.
   * Standards version 3.9.2 (no change needed).
-
- -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 20 Jun 2011 22:48:30 +0300
+  * Switch to dh.
+  * Patch notest: Remove a bogus upstream 'test' target.
+  * Lintian override for an odd interpteter a dummy kernel module init script. 
+  * Dahdi udev rules are now named 'dahdi-linux.conf'.
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Fri, 09 Sep 2011 12:03:53 +0300
 
 dahdi-linux (1:2.4.1+dfsg-1) unstable; urgency=low
 

Modified: dahdi-linux/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/control?rev=9256&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/control (original)
+++ dahdi-linux/trunk/debian/control Fri Sep  9 09:40:06 2011
@@ -3,7 +3,7 @@
 Priority: optional
 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>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 7), bzip2, asciidoc
+Build-Depends: debhelper (>=  7.0.50~), bzip2, asciidoc
 Standards-Version: 3.9.2
 Homepage: http://www.asterisk.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/dahdi-linux/trunk/

Added: dahdi-linux/trunk/debian/dahdi-linux.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/dahdi-linux.lintian-overrides?rev=9256&op=file
==============================================================================
--- dahdi-linux/trunk/debian/dahdi-linux.lintian-overrides (added)
+++ dahdi-linux/trunk/debian/dahdi-linux.lintian-overrides Fri Sep  9 09:40:06 2011
@@ -1,0 +1,2 @@
+#/usr/share/dahdi/init_card_5_30 is a dummy script:
+unusual-interpreter usr/share/dahdi/init_card_5_30 #!/bin/true

Added: dahdi-linux/trunk/debian/patches/notest
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/notest?rev=9256&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/notest (added)
+++ dahdi-linux/trunk/debian/patches/notest Fri Sep  9 09:40:06 2011
@@ -1,0 +1,15 @@
+Description: Remove a bodus "test" target
+Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+
+--- a/Makefile
++++ b/Makefile
+@@ -206,9 +206,6 @@ dist-clean: clean
+ firmware-download:
+ 	@$(MAKE) -C drivers/dahdi/firmware all
+ 
+-test:
+-	./test-script $(DESTDIR)/lib/modules/$(KVERS) dahdi
+-
+ docs: $(GENERATED_DOCS)
+ 
+ README.html: README

Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=9256&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Fri Sep  9 09:40:06 2011
@@ -3,3 +3,4 @@
 dahdi_linux_extra
 no_firmware_download
 chanmute
+notest

Modified: dahdi-linux/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/rules?rev=9256&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/rules (original)
+++ dahdi-linux/trunk/debian/rules Fri Sep  9 09:40:06 2011
@@ -1,15 +1,9 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-USE_BRISTUFF=0
 export HOTPLUG_FIRMWARE=1
-
--include /usr/share/quilt/quilt.make
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -52,7 +46,10 @@
 
 MOD_ARGS=MODULES_EXTRA="$(EXTRA_MODS)" SUBDIRS_EXTRA="$(EXTRA_SUBDIRS)"
 
-kdist_clean: clean-unpatched
+%:
+	dh $@
+
+kdist_clean: clean
 
 kdist_config: prep-deb-files
 
@@ -81,44 +78,22 @@
 
 ## END OF M-A SECTION
 
-build: patch build-stamp
-build-stamp: 
-	dh_testdir
-	
+override_dh_auto_build:
 	$(MAKE) docs
-	for mod in $(BRISTUFF_MODULES); do for i in c h; do \
-		ln -s $$mod/$$mod.$$i drivers/dahdi/$$mod.$$i; \
-	done; done
 	$(MAKE) $(GENERATED_SOURCES)
-	touch $@
 
-clean: clean-unpatched unpatch
-clean-unpatched:
-	dh_testdir
-	dh_testroot
-	rm -f *-stamp
-	
-	# Delete the generated bristuff symlinks:
-	$(RM) -f $(BRISTUFF_MODULES:%=%.[ch])
-	# Add here commands to clean up after the build process.
+override_dh_auto_clean:
 	rm -f $(GENERATED_SOURCES)
-	# * 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.
 	rm -f dahdi/include/version.h
 	[ ! -f Makefile ] || $(MAKE) dist-clean || true
-	dh_clean
 
 TARPARDIR=$(CURDIR)/debian/tmp
 TARDIR=$(TARPARDIR)/modules/$(PREFIX)
-install: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	
+
+override_dh_auto_install:
 	$(MAKE) install-include DESTDIR=$(CURDIR)/debian/$(SKPG)
+
+override_dh_install:
 	dh_install
 	# driver source code
 	mkdir -p $(TARDIR)/debian/generated
@@ -136,39 +111,10 @@
 	
 	tar cjf debian/$(SKPG)/usr/src/$(PREFIX).tar.bz2 \
 	  -C $(TARPARDIR) modules
-	dh_installudev --name=dahdi
-	
-# Build architecture-independent files here.
-binary: install
-	dh_testdir
-	dh_testroot
-	
-	dh_installdocs
-	dh_installchangelogs -i ChangeLog
-	dh_installexamples -i
-	dh_perl
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
 	@@echo "Upstream version:        $(UPVERSION)"
-
-# For the record: updating openvox drivers:
-# wget 'http://www.openvox.cn/viewvc/dahdi/trunk/opvxa1200.c?view=co' \
-#  | sed -e '\r$//' >drivers/dahdi/opvxa1200.c
-#
-# Updating the zaphfc drivers:
-#   rm -rf old new
-#   mkdir -p old new/drivers/dahdi
-#   svn export http://zaphfc.googlecode.com/svn/branches/2.2/zaphfc/ new/drivers/dahdi/zaphfc
-#   diff -Npur  --no-timestamps old new >debian/patches/zaphfc
-#   rm -rf old new
 
 TARBALL_DIR=../tarballs/$(PACKAGE_SRC)-$(UPVERSION).tmp
 get-orig-source:
@@ -187,4 +133,3 @@
 	@@$(RM) -rf $(TARBALL_DIR)/
 	@@$(RM) -f ../tarballs/$(UPFILENAME)
 
-.PHONY: build clean binary install configure patch unpatch

More information about the Pkg-voip-commits mailing list