[Pkg-voip-commits] r2291 - zaptel/branches/sarge/debian

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2006-08-23 23:35:18 +0000 (Wed, 23 Aug 2006)
New Revision: 2291

Added:
   zaptel/branches/sarge/debian/zaptel-modules.postinst
   zaptel/branches/sarge/debian/zaptel-modules.postrm
   zaptel/branches/sarge/debian/zaptel-source.postinst
Modified:
   zaptel/branches/sarge/debian/changelog
   zaptel/branches/sarge/debian/control
   zaptel/branches/sarge/debian/rules
Log:
Reverting changes 2222-2223 in this branch.
(Untested yet, as zaptel 1.2.8 is not yet buildable)


Modified: zaptel/branches/sarge/debian/changelog
===================================================================
--- zaptel/branches/sarge/debian/changelog	2006-08-23 23:27:56 UTC (rev 2290)
+++ zaptel/branches/sarge/debian/changelog	2006-08-23 23:35:18 UTC (rev 2291)
@@ -19,10 +19,6 @@
   * Simplified vzaphfc patch.
 
   [ Mark Purcell ]
-  * Build-Depends: debhelper (>= 5.0.37) and dh_installmodules makes
-    zaptel-source.postinst & zaptel-modules.post{inst,rm} obsolete
-    Fixes: postinst/postrm depmod -- update templates to use dh_installmodules
-    instead (Closes: #381754)
   * postinst failure (Closes: #361312)
   * zaptel-modules from testing don't compile on Sarge (Closes: #376719)
   * pciradio.c:1810: error: syntax error before string constant (Closes:
@@ -30,7 +26,7 @@
   * Can't recompile zaptel modules on Sarge (Closes: #375581)
   * zaptel-modules from testing don't compile on Sarge (Closes: #376719)
 
- -- Mark Purcell <msp at debian.org>  Thu, 10 Aug 2006 23:39:58 +0100
+ -- Mark Purcell <msp at debian.org>  Thu, 10 Aug 2006 22:51:10 +0100
 
 zaptel (1:1.2.7.dfsg-2) unstable; urgency=low
 

Modified: zaptel/branches/sarge/debian/control
===================================================================
--- zaptel/branches/sarge/debian/control	2006-08-23 23:27:56 UTC (rev 2290)
+++ zaptel/branches/sarge/debian/control	2006-08-23 23:35:18 UTC (rev 2291)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Santiago Ruano Rincón <santiago at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Build-Depends: debhelper (>= 5.0.37), libnewt-dev, dpatch (>= 2.0.9), bzip2, libusb-dev
+Build-Depends: debhelper (>> 4.0.4), libnewt-dev, dpatch (>= 2.0.9), bzip2, libusb-dev
 Standards-Version: 3.6.2
 
 Package: zaptel

Modified: zaptel/branches/sarge/debian/rules
===================================================================
--- zaptel/branches/sarge/debian/rules	2006-08-23 23:27:56 UTC (rev 2290)
+++ zaptel/branches/sarge/debian/rules	2006-08-23 23:35:18 UTC (rev 2291)
@@ -60,6 +60,11 @@
 	dh_compress
 	dh_fixperms
 	dh_installdeb
+	# Note: I don't want to edit the file in the debian/ directory itself.
+	# I figure that there must be existing fuctionality in dpkg/debhelper. How?
+	sed -i -e 's/_KVERS_/$(KVERS)/' \
+	  debian/$(PKGNAME)/DEBIAN/postinst \
+	  debian/$(PKGNAME)/DEBIAN/postrm
 	dh_gencontrol -- -v$(VERSION)
 	dh_md5sums
 	dh_builddeb --destdir=$(DEB_DESTDIR)
@@ -139,6 +144,9 @@
 	  debian/control \
 	  debian/control.modules.in \
 	  $(TARDIR)/debian/
+	mv $(TARDIR)/debian/zaptel-modules.postinst $(TARDIR)/debian/postinst 
+	cp debian/zaptel-modules.postinst $(TARDIR)/debian/postinst
+	cp debian/zaptel-modules.postrm $(TARDIR)/debian/postrm
 	
 	tar cjf debian/$(PREFIX)-source/usr/src/$(PREFIX).tar.bz2 \
 	  -C $(TARPARDIR) modules

Added: zaptel/branches/sarge/debian/zaptel-modules.postinst
===================================================================
--- zaptel/branches/sarge/debian/zaptel-modules.postinst	2006-08-23 23:27:56 UTC (rev 2290)
+++ zaptel/branches/sarge/debian/zaptel-modules.postinst	2006-08-23 23:35:18 UTC (rev 2291)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# not stopping on error: in the worst case depmod won't be run.
+#set -e
+
+if [ "`uname -r`" = "_KVERS_" ] ; then
+  depmod -a
+fi
+
+#DEBHELPER#

Added: zaptel/branches/sarge/debian/zaptel-modules.postrm
===================================================================
--- zaptel/branches/sarge/debian/zaptel-modules.postrm	2006-08-23 23:27:56 UTC (rev 2290)
+++ zaptel/branches/sarge/debian/zaptel-modules.postrm	2006-08-23 23:35:18 UTC (rev 2291)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# not stopping on error: in the worst case depmod won't be run.
+#set -e
+
+if [ "`uname -r`" = "_KVERS_" ] && [ -x depmod ]; then
+   depmod -a
+fi
+
+#DEBHELPER#

Added: zaptel/branches/sarge/debian/zaptel-source.postinst
===================================================================
--- zaptel/branches/sarge/debian/zaptel-source.postinst	2006-08-23 23:27:56 UTC (rev 2290)
+++ zaptel/branches/sarge/debian/zaptel-source.postinst	2006-08-23 23:35:18 UTC (rev 2291)
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "`uname -r`" = "_KVERS_" ] ; then
+   depmod -a &
+fi
+
+#DEBHELPER#