[Pkg-voip-commits] r1330 - in pwlib: branches/sarge/debian
trunk/debian
Kilian Krause
kilian at costa.debian.org
Sun Feb 26 00:04:02 UTC 2006
Author: kilian
Date: 2006-02-26 00:04:01 +0000 (Sun, 26 Feb 2006)
New Revision: 1330
Modified:
pwlib/branches/sarge/debian/control
pwlib/branches/sarge/debian/rules
pwlib/trunk/debian/control
Log:
import Tzafrir's fixes into new branch
Modified: pwlib/branches/sarge/debian/control
===================================================================
--- pwlib/branches/sarge/debian/control 2006-02-25 23:45:53 UTC (rev 1329)
+++ pwlib/branches/sarge/debian/control 2006-02-26 00:04:01 UTC (rev 1330)
@@ -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.0.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, 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/branches/sarge/debian/rules
===================================================================
--- pwlib/branches/sarge/debian/rules 2006-02-25 23:45:53 UTC (rev 1329)
+++ pwlib/branches/sarge/debian/rules 2006-02-26 00:04:01 UTC (rev 1330)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-export DH_COMPAT=4
+export DH_COMPAT=5
# Change this on API breakage
export LIBPTCOMPAT=1.10.0
@@ -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,27 +223,22 @@
dh_testdir
dh_testroot
+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
- cp -af debian/$(PACKAGE)/usr/lib/debug debian/libpt-dbg/usr/lib && \
- rm -rf debian/$(PACKAGE)/usr/lib/debug
- cp -af debian/libpt-plugins-alsa/usr/lib/debug debian/libpt-dbg/usr/lib && \
- rm -rf debian/libpt-plugins-alsa/usr/lib/debug
- cp -af debian/libpt-plugins-oss/usr/lib/debug debian/libpt-dbg/usr/lib && \
- rm -rf debian/libpt-plugins-oss/usr/lib/debug
- cp -af debian/libpt-plugins-v4l/usr/lib/debug debian/libpt-dbg/usr/lib && \
- rm -rf debian/libpt-plugins-v4l/usr/lib/debug
- cp -af debian/libpt-plugins-v4l2/usr/lib/debug debian/libpt-dbg/usr/lib && \
- rm -rf debian/libpt-plugins-v4l2/usr/lib/debug
- cp -af debian/libpt-plugins-avc/usr/lib/debug debian/libpt-dbg/usr/lib && \
- rm -rf debian/libpt-plugins-avc/usr/lib/debug
- cp -af debian/libpt-plugins-dc/usr/lib/debug debian/libpt-dbg/usr/lib && \
- rm -rf debian/libpt-plugins-dc/usr/lib/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
Modified: pwlib/trunk/debian/control
===================================================================
--- pwlib/trunk/debian/control 2006-02-25 23:45:53 UTC (rev 1329)
+++ pwlib/trunk/debian/control 2006-02-26 00:04:01 UTC (rev 1330)
@@ -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.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: debhelper (>=5.0.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-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
More information about the Pkg-voip-commits
mailing list