[Pkg-voip-commits] r1323 - pwlib/trunk/debian

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2006-02-25 20:54:40 +0000 (Sat, 25 Feb 2006)
New Revision: 1323

Modified:
   pwlib/trunk/debian/changelog
   pwlib/trunk/debian/control
   pwlib/trunk/debian/rules
Log:
* hush version.h error message when tarball not yet extracted
* Sarge compatibility: buildepends on libdc1394-13-dev || libdc1394-11-dev 
* Sarge compatibility: if debhelper compat is 4, use older strip


Modified: pwlib/trunk/debian/changelog
===================================================================
--- pwlib/trunk/debian/changelog	2006-02-23 11:45:04 UTC (rev 1322)
+++ pwlib/trunk/debian/changelog	2006-02-25 20:54:40 UTC (rev 1323)
@@ -1,6 +1,9 @@
 pwlib (1.9.3-3) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * hush version.h error message when tarball not yet extracted
+  * Sarge compatibility: buildepends on libdc1394-13-dev || libdc1394-11-dev 
+  * Sarge compatibility: if debhelper compat is 4, use older strip
 
  -- Kilian Krause <kilian at debian.org>  Sun, 19 Feb 2006 21:23:34 +0000
 

Modified: pwlib/trunk/debian/control
===================================================================
--- pwlib/trunk/debian/control	2006-02-23 11:45:04 UTC (rev 1322)
+++ pwlib/trunk/debian/control	2006-02-25 20:54:40 UTC (rev 1323)
@@ -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>
-Build-Depends: debhelper (>=4.9.0), bison, flex, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, g++ (>=2.95), autotools-dev, dpatch (>=1.11), libasound2-dev, libavc1394-dev, libraw1394-dev, libdv-dev, libdc1394-13-dev, libsasl2-dev, libkrb5-dev, doxygen, linux-kernel-headers, binutils (>= 2.14.90.0.7)
+Build-Depends: debhelper (>=4.2.32), bison, flex, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, g++ (>=2.95), autotools-dev, dpatch (>=1.11), libasound2-dev, libavc1394-dev, libraw1394-dev, libdv-dev, libdc1394-11-dev || libdc1394-11-dev, libsasl2-dev, libkrb5-dev, doxygen, linux-kernel-headers, binutils (>= 2.14.90.0.7)
 Build-Depends-Indep: doxygen
 Build-Conflicts: libpt-1.10.0, libpt-1.8.7, libpt-1.8.3, libpt-1.8.3c2, libpt-1.8.3c2a, libpt-dev
 Standards-Version: 3.6.2

Modified: pwlib/trunk/debian/rules
===================================================================
--- pwlib/trunk/debian/rules	2006-02-23 11:45:04 UTC (rev 1322)
+++ pwlib/trunk/debian/rules	2006-02-25 20:54:40 UTC (rev 1323)
@@ -8,9 +8,10 @@
 PACKAGE=libpt-$(LIBPTCOMPAT)
 
 
-VER_MAJOR := $(shell awk '/MAJOR_VERSION/ { print $$3 }' version.h)
-VER_MINOR := $(shell awk '/MINOR_VERSION/ { print $$3 }' version.h)
-VER_SUB   := $(shell awk '/BUILD_NUMBER/  { print $$3 }' version.h)
+# can err if the tarball is not yet extracted
+VER_MAJOR := $(shell awk '/MAJOR_VERSION/ { print $$3 }' version.h 2>/dev/null)
+VER_MINOR := $(shell awk '/MINOR_VERSION/ { print $$3 }' version.h 2>/dev/null)
+VER_SUB   := $(shell awk '/BUILD_NUMBER/  { print $$3 }' version.h 2>/dev/null)
 
 SHLIBSVER := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
 
@@ -222,9 +223,22 @@
 	dh_testdir
 	dh_testroot
 	
-	# yes, we do need DH_COMPAT=5 here...
+ifneq (5,$(DH_COMPAT))
 	dh_strip --dbg-package=libpt-dbg
+else
+	# As dh_strip does not work fine for multiple binary package
+	# we need to workaround that manually
+	dh_strip --exclude=libpt_d --keep-debug
 
+	for pack in $(PACKAGE) libpt-plugins-alsa libpt-plugins-oss \
+		libpt-plugins-v4l libpt-plugins-v4l2 libpt-plugins-avc \
+		libpt-plugins-dc ; \
+	do \
+		cp -af debian/$$pack/usr/lib/debug debian/libpt-dbg/usr/lib && \
+			rm -rf debian/$$pack/usr/lib/debug; \
+	done
+endif
+
 # Build architecture independant packages using the common target.
 binary-indep: build-indep install-indep
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common