[Pkg-voip-commits] r2232 - openser/trunk/debian

[Julien Blache]

Author: jblache
Date: 2006-08-12 15:43:00 +0000 (Sat, 12 Aug 2006)
New Revision: 2232

Modified:
   openser/trunk/debian/changelog
   openser/trunk/debian/control
   openser/trunk/debian/rules
Log:
Remove compatibility code introduced to ease Sarge builds in the upstream CVS.


Modified: openser/trunk/debian/changelog
===================================================================
--- openser/trunk/debian/changelog	2006-08-12 14:43:03 UTC (rev 2231)
+++ openser/trunk/debian/changelog	2006-08-12 15:43:00 UTC (rev 2232)
@@ -2,8 +2,15 @@
 
   * NOT RELEASED YET
 
- -- Julien BLACHE <jblache at debian.org>  Sun, 30 Jul 2006 15:34:07 +0200
+  * debian/rules:
+    + Remove DH_COMPAT 4 compatibility code which was introduced only for
+      Sarge backward-compatiblity in the upstream CVS; there's now a
+      packaging directory dedicated to Sarge.
+  * debian/control:
+    + Build-Depends cleanup.
 
+ -- Julien BLACHE <jblache at debian.org>  Sat, 12 Aug 2006 17:41:00 +0200
+
 openser (1.1.0-2) unstable; urgency=low
 
   * Initial Debian release (closes: #380450).

Modified: openser/trunk/debian/control
===================================================================
--- openser/trunk/debian/control	2006-08-12 14:43:03 UTC (rev 2231)
+++ openser/trunk/debian/control	2006-08-12 15:43:00 UTC (rev 2232)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Maintainers <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Julien BLACHE <jblache at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, libmysqlclient15-dev | libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev | postgresql-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev
+Build-Depends: debhelper (>= 5), dpatch, libmysqlclient15-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev
 Standards-Version: 3.7.2
 
 Package: openser

Modified: openser/trunk/debian/rules
===================================================================
--- openser/trunk/debian/rules	2006-08-12 14:43:03 UTC (rev 2231)
+++ openser/trunk/debian/rules	2006-08-12 15:43:00 UTC (rev 2232)
@@ -2,7 +2,6 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
-COMPAT_LVL = $(shell cat debian/compat)
 ALL_PACKAGES = openser openser-mysql-module openser-postgres-module \
 	openser-jabber-module openser-cpl-module openser-radius-modules \
 	openser-unixodbc-module
@@ -195,17 +194,7 @@
 	dh_installinfo
 	dh_installchangelogs
 	dh_link
-# Emulate debhelper v5 behaviour for Sarge backports with debhelper v4
-ifeq ($(COMPAT_LVL),4)
-	dh_strip --keep-debug
-	mkdir -p $(CURDIR)/debian/openser-dbg/usr/lib/debug
-	for p in $(ALL_PACKAGES); do \
-		tar cf - -C $(CURDIR)/debian/$$p/usr/lib/debug . | tar xf - -C $(CURDIR)/debian/openser-dbg/usr/lib/debug \
-		&& rm -rf $(CURDIR)/debian/$$p/usr/lib/debug; \
-	done
-else
 	dh_strip --dbg-package=openser-dbg
-endif
 	dh_compress 
 	dh_fixperms
 	dh_installdeb