[Pkg-voip-commits] r3611 - in opal/trunk/debian: . patches
kilian at alioth.debian.org
kilian at alioth.debian.org
Sat May 26 16:57:09 UTC 2007
Author: kilian
Date: 2007-05-26 16:57:08 +0000 (Sat, 26 May 2007)
New Revision: 3611
Added:
opal/trunk/debian/patches/notrace.dpatch
Removed:
opal/trunk/debian/libopal-dbg.dirs
Modified:
opal/trunk/debian/changelog
opal/trunk/debian/control
opal/trunk/debian/libopal-dev.dirs
opal/trunk/debian/patches/00list
opal/trunk/debian/rules
Log:
build opt, opt+ptrace and debug+ptrace version like pwlib.
Modified: opal/trunk/debian/changelog
===================================================================
--- opal/trunk/debian/changelog 2007-05-26 08:30:02 UTC (rev 3610)
+++ opal/trunk/debian/changelog 2007-05-26 16:57:08 UTC (rev 3611)
@@ -1,9 +1,9 @@
opal (2.2.4~dfsg-1) UNRELEASED; urgency=low
* NOT RELEASED YET
- * Build opt and debug version. Bump to pwlib 1.10.2-3 therefor.
+ * Build opt, opt+ptrace and debug version like PWLib. Bump to pwlib 1.10.7 therefore.
- -- Kilian Krause <kilian at debian.org> Thu, 4 Jan 2007 19:14:15 +0100
+ -- Kilian Krause <kilian at debian.org> Sat, 26 May 2007 18:56:17 +0200
opal (2.2.3.dfsg-3) unstable; urgency=high
Modified: opal/trunk/debian/control
===================================================================
--- opal/trunk/debian/control 2007-05-26 08:30:02 UTC (rev 3610)
+++ opal/trunk/debian/control 2007-05-26 16:57:08 UTC (rev 3611)
@@ -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.2), libpt-dbg (>= 1.10.2-3~), libpt-dev (>= 1.10.2-3~), g++ (>= 2.95), dpatch (>= 1.11), doxygen, autotools-dev, libspeex-dev (>= 1.1.11)
+Build-Depends: debhelper (>= 4.0.2), libpt-dev (>= 1.10.7~dfsg~), g++ (>= 2.95), dpatch (>= 1.11), doxygen, autotools-dev, libspeex-dev (>= 1.1.11)
Build-Depends-Indep: doxygen
Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14), libopenh323-dev, libopal-dev
Standards-Version: 3.6.2
@@ -14,6 +14,7 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
+Conflicts: libopal-2.2.0-ptrace, libopal-2.2.0-develop
Suggests: libopal-dev
Description: Open Phone Abstraction Library - successor of OpenH323
This package contains the shared version of the OPAL library.
@@ -26,11 +27,52 @@
For more information on the OPAL project visit them at
http://www.voxgratia.org/
+Package: libopal-2.2.0-ptrace
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libopal-2.2.0, libopal-2.2.0-develop
+Suggests: libopal-dev
+Description: Open Phone Abstraction Library - Ptrace enabled version for extended debugging
+ This package contains the shared version of the OPAL library.
+ .
+ The OPAL project aims to create a full featured, interoperable, Open Source
+ implementation of the H.323 and SIP protocols that can be used freely by
+ everybody. These protocols are most used for Voice over IP (VoIP)
+ conferencing.
+ .
+ This build was compiled with extra ptracing information included. Do not use
+ in production environment. Also contains the debug symbols for this build.
+ .
+ For more information on the OPAL project visit them at
+ http://www.voxgratia.org/
+
+Package: libopal-2.2.0-develop
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Conflicts: libopal-2.2.0-ptrace, libopal-2.2.0
+Suggests: libopal-dev
+Description: Open Phone Abstraction Library - full debug runtime with ptrace
+ This package contains the shared version of the OPAL library.
+ .
+ The OPAL project aims to create a full featured, interoperable, Open Source
+ implementation of the H.323 and SIP protocols that can be used freely by
+ everybody. These protocols are most used for Voice over IP (VoIP)
+ conferencing.
+ .
+ This build was compiled with extra ptracing and debug information included. Do
+ not use in production environment. Also contains the debug symbols for this
+ build.
+ .
+ For more information on the OPAL project visit them at
+ http://www.voxgratia.org/
+
Package: libopal-dev
Section: libdevel
Architecture: any
Conflicts: openmpi-dev
-Depends: libopal-2.2.0 (= ${Source-Version}), libpt-dev (>= 1.10.0)
+Depends: libopal-2.2.0 (= ${Source-Version})|libopal-2.2.0-ptrace (= ${Source-Version})|libopal-2.2.0-develop (= ${Source-Version}), libpt-dev (>= 1.10.7~dfsg~)
Description: OPAL library header files
This package contains the the headers and a static version of the
OPAL library.
@@ -62,6 +104,7 @@
Package: libopal-dbg
Section: libdevel
Priority: extra
+Depends: libopal-2.2.0
Architecture: any
Description: OPAL library debug symbols
This package contains the shared and static debug symbols of the
Deleted: opal/trunk/debian/libopal-dbg.dirs
===================================================================
--- opal/trunk/debian/libopal-dbg.dirs 2007-05-26 08:30:02 UTC (rev 3610)
+++ opal/trunk/debian/libopal-dbg.dirs 2007-05-26 16:57:08 UTC (rev 3611)
@@ -1 +0,0 @@
-usr/lib
Modified: opal/trunk/debian/libopal-dev.dirs
===================================================================
--- opal/trunk/debian/libopal-dev.dirs 2007-05-26 08:30:02 UTC (rev 3610)
+++ opal/trunk/debian/libopal-dev.dirs 2007-05-26 16:57:08 UTC (rev 3611)
@@ -1,2 +1,3 @@
usr/include/opal
+usr/lib
usr/share/opal
Modified: opal/trunk/debian/patches/00list
===================================================================
--- opal/trunk/debian/patches/00list 2007-05-26 08:30:02 UTC (rev 3610)
+++ opal/trunk/debian/patches/00list 2007-05-26 16:57:08 UTC (rev 3611)
@@ -1,2 +1,3 @@
libname
+notrace
remove_ilbc
Added: opal/trunk/debian/patches/notrace.dpatch
===================================================================
--- opal/trunk/debian/patches/notrace.dpatch (rev 0)
+++ opal/trunk/debian/patches/notrace.dpatch 2007-05-26 16:57:08 UTC (rev 3611)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## notrace.dpatch by <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compilation with NOTRACE. The OBJDIR_SUFFIX is 'n' already, no need to suffix it twice.
+
+ at DPATCH@
+diff -urNad opal-2.2.4~dfsg~/Makefile.in opal-2.2.4~dfsg/Makefile.in
+--- opal-2.2.4~dfsg~/Makefile.in 2007-05-26 10:13:55.000000000 +0000
++++ opal-2.2.4~dfsg/Makefile.in 2007-05-26 10:14:22.000000000 +0000
+@@ -248,9 +248,6 @@
+ endif
+
+ OPAL_OBJDIR = $(OPAL_LIBDIR)/$(PT_OBJBASE)
+-ifdef NOTRACE
+-OPAL_OBJDIR += n
+-endif
+
+ OBJDIR = $(OPAL_OBJDIR)
+ LIBDIR = $(OPAL_LIBDIR)
Property changes on: opal/trunk/debian/patches/notrace.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: opal/trunk/debian/rules
===================================================================
--- opal/trunk/debian/rules 2007-05-26 08:30:02 UTC (rev 3610)
+++ opal/trunk/debian/rules 2007-05-26 16:57:08 UTC (rev 3611)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-export DH_COMPAT=4
+export DH_COMPAT=5
# Change this on API breakage
export LIBOPALCOMPAT=2.2.0
@@ -10,18 +10,26 @@
PACKAGE=libopal-$(LIBOPALCOMPAT)
+# excludes for the -ptrace and -develop version
+STRIP_EXCLUDES = -N$(PACKAGE) -Nlibopal-dbg -Nlibopal-dev -Nsimpleopal
+
ifneq (,$(shell test -f version.h&&grep MAJOR_VERSION version.h))
-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)
+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)
endif
-SHLIBSVER=$(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
+SHLIBSVER := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
-MAKE_BUILD_PARAM=OPALDIR=$(CURDIR) PWLIBDIR=/usr/share/pwlib
+CFLAGS := -g
-include /usr/share/dpatch/dpatch.make
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+endif
+MAKE_BUILD_PARAM := OPALDIR=$(CURDIR) PWLIBDIR=/usr/share/pwlib
+
+
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -31,18 +39,24 @@
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
-DEBVERSION:=$(shell head -n 1 debian/changelog \
+# Ensure the build aborts when there are still references to undefined
+# symbols.
+LDFLAGS += -Wl,-z,def
+
+DEBVERSION := $(shell head -n 1 debian/changelog \
| sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//')
-URLVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//' -e 's/\./_/g')
+UPVERSION := $(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//')
+URLVERSION := $(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//' -e 's/\./_/g')
FILENAME := opal_$(UPVERSION)~dfsg.orig.tar.gz
UPFILENAME := opal_$(UPVERSION).orig.tar.gz
URL := http://www.voxgratia.org/releases/opal-v$(URLVERSION)-src-tar.gz
+include /usr/share/dpatch/dpatch.make
+
build: build-arch build-indep
-build-arch: build-arch-stamp
+build-arch: config.status build-arch-stamp
config.status: patch-stamp autotools configure
./configure $(confflags) --prefix=/usr
@@ -60,32 +74,54 @@
touch $@
build-arch-stamp: config.status
- $(MAKE) $(MAKE_BUILD_PARAM) bothnoshared bothshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/highopt optshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/highopt optnoshared
+
+ # put NOTRACE to empty to build with PTRACING code
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt optshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt optnoshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=d OPAL_LIBDIR=$(CURDIR)/lib/debug debugshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=d OPAL_LIBDIR=$(CURDIR)/lib/debug debugnoshared
+
# ensure we do a fresh check with hello world.
# ...first static
-$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
$(RM) -rf samples/simple/obj_*
- ##$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple bothnoshared
- ##samples/simple/obj_*_d/simpleopal --help >/dev/null
- ##samples/simple/obj_*_r/simpleopal --help >/dev/null
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/highopt -C samples/simple optnoshared
+
+ # put NOTRACE to empty to build with PTRACING code
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt -C samples/simple optnoshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=d OPAL_LIBDIR=$(CURDIR)/lib/debug -C samples/simple debugnoshared
+
+ samples/simple/obj_*_n/simpleopal --help >/dev/null
+ samples/simple/obj_*_r/simpleopal --help >/dev/null
+ samples/simple/obj_*_d/simpleopal --help >/dev/null
## then shared...
- ##$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
- ##$(RM) -rf samples/simple/obj_*
- $(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple bothshared
+ $(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
+ $(RM) -rf samples/simple/obj_*
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/highopt -C samples/simple optshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt -C samples/simple optshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=d OPAL_LIBDIR=$(CURDIR)/lib/debug -C samples/simple debugshared
if (samples/simple/obj_*_d/simpleopal --help >/dev/null);then \
echo shared debug simpleopal incorrectly compiled static; false;\
else \
echo shared debug simpleopal correctly compiled non-static; \
fi
- LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj_*_d/simpleopal --help >/dev/null
+ LD_LIBRARY_PATH=$(CURDIR)/lib/debug samples/simple/obj_*_d/simpleopal --help >/dev/null
if (samples/simple/obj_*_r/simpleopal --help >/dev/null);then \
echo shared opt simpleopal incorrectly compiled static; false;\
else \
echo shared opt simpleopal correctly compiled non-static; \
fi
- LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj_*_r/simpleopal --help >/dev/null
- $(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
- $(RM) -rf samples/simple/obj_*
+ LD_LIBRARY_PATH=$(CURDIR)/lib/opt samples/simple/obj_*_r/simpleopal --help >/dev/null
+ if (samples/simple/obj_*_n/simpleopal --help >/dev/null);then \
+ echo shared highopt simpleopal incorrectly compiled static; false;\
+ else \
+ echo shared highopt simpleopal correctly compiled non-static; \
+ fi
+ LD_LIBRARY_PATH=$(CURDIR)/lib/highopt samples/simple/obj_*_n/simpleopal --help >/dev/null
+ #$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
+ #$(RM) -rf samples/simple/obj_*
touch build-arch-stamp
@@ -100,8 +136,10 @@
dh_testroot
-rm -f build-arch-stamp build-indep-stamp patch-stamp
-rm -f config.status config.log autotools
- -$(MAKE) $(MAKE_BUILD_PARAM) optclean debugclean clean
- -$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
+ -if [ -f Makefile ];then \
+ $(MAKE) $(MAKE_BUILD_PARAM) optclean debugclean clean ||true;\
+ $(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean ||true;\
+ fi
-rm -rf samples/simple/obj*
-rm -f opal_inc.mak include/opal/buildopts.h
-rm -rf lib
@@ -129,47 +167,57 @@
dh_testroot
dh_clean -k -a
dh_installdirs -a
+ install -d -m 755 $(CURDIR)/debian/$(PACKAGE)/usr/lib \
+ $(CURDIR)/debian/$(PACKAGE)-ptrace/usr/lib \
+ $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
+ install -m 755 lib/highopt/libopal.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
+ install -m 755 lib/opt/libopal.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-ptrace/usr/lib
+ install -m 755 lib/debug/libopal.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
- $(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(CURDIR)/debian/$(PACKAGE) OPAL_LIBDIR=/usr/lib install
ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT))
+ for suffix in "" "-ptrace" "-develop";do \
ln -s libopal.so.$(SHLIBSVER) \
- debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT)
+ debian/$(PACKAGE)$$suffix/usr/lib/libopal.so.$(LIBOPALCOMPAT); \
+ done
endif
ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT2))
+ for suffix in "" "-ptrace" "-develop";do \
ln -s libopal.so.$(SHLIBSVER) \
- debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT2)
+ debian/$(PACKAGE)$$suffix/usr/lib/libopal.so.$(LIBOPALCOMPAT2); \
+ done
endif
ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT3))
+ for suffix in "" "-ptrace" "-develop";do \
ln -s libopal.so.$(SHLIBSVER) \
- debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT3)
+ debian/$(PACKAGE)$$suffix/usr/lib/libopal.so.$(LIBOPALCOMPAT3); \
+ done
endif
ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT4))
+ for suffix in "" "-ptrace" "-develop";do \
ln -s libopal.so.$(SHLIBSVER) \
- debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT4)
+ debian/$(PACKAGE)$$suffix/usr/lib/libopal.so.$(LIBOPALCOMPAT4); \
+ done
endif
# simpleopal
- $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OPAL_LIBDIR=$(CURDIR)/lib/highopt INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
# clean simple to install it as a sample in the docs
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
$(RM) -rf samples/simple/obj_*
-# libopal-dbg
- $(MAKE) $(MAKE_BUILD_PARAM) DEBUG=1 DESTDIR=$(CURDIR)/debian/libopal-dbg OPAL_LIBDIR=/usr/lib install
- $(RM) -rf $(CURDIR)/debian/libopal-dbg/usr/include
- cp lib/libopal*.a $(CURDIR)/debian/libopal-dbg/usr/lib
+# libopal-*-(ptrace|develop)
+ cp -v lib/opt/libopal_s.a debian/$(PACKAGE)-ptrace/usr/lib
+ cp -v lib/debug/libopal_s.a debian/$(PACKAGE)-develop/usr/lib
# libopal-dev package
- dh_movefiles --sourcedir=debian/$(PACKAGE) -plibopal-dev `cd debian/$(PACKAGE); ls -1 usr/lib/*.so` usr/include
- dh_movefiles --sourcedir=debian/libopal-dbg -plibopal-dev `cd debian/$(PACKAGE); ls -1 usr/lib/*.so`
- rm -rf debian/$(PACKAGE)/usr/include debian/$(PACKAGE)/usr/share/opal/opal_inc.mak
- rm -f debian/$(PACKAGE)/usr/lib/libopal.so.?
- #rm -f debian/$(PACKAGE)/usr/lib/libopal.so.?.??
+ cp lib/highopt/libopal*.a $(CURDIR)/debian/libopal-dev/usr/lib
+ ln -s libopal.so.$(SHLIBSVER) debian/libopal-dev/usr/lib/libopal.so
+ ln -s libopal.so.$(SHLIBSVER) debian/libopal-dev/usr/lib/libopal.so.$(VER_MAJOR)
+ ln -s libopal.so.$(SHLIBSVER) debian/libopal-dev/usr/lib/libopal.so.$(VER_MAJOR).$(VER_MINOR)
- #cp -v lib/libopal.a debian/libopal-dev/usr/lib
sed -e 's#^OPALDIR.*#OPALDIR = \/usr\/lib\/opal#g' \
opal_inc.mak > debian/libopal-dev/usr/share/opal/opal_inc.mak
- #cp -vr include/* $(CURDIR)/debian/libopal-dev/usr/include/opal/.
- #find debian/libopal-dev/usr/include -type f -exec chmod 644 {} \;
+ cp -vr include/* debian/libopal-dev/usr/include/opal
+ find debian/libopal-dev/usr/include -type f -exec chmod 644 {} \;
cp version.h debian/libopal-dev/usr/include/opal/
@@ -197,7 +245,7 @@
dh_link
dh_compress
dh_fixperms
- dh_makeshlibs -V "$(PACKAGE) (>= $(DEBVERSION))"
+ dh_makeshlibs -V '$(PACKAGE) (>= $(DEBVERSION))|$(PACKAGE)-ptrace (>= $(DEBVERSION))|$(PACKAGE)-develop (>= $(DEBVERSION))'
dh_installdeb
dh_shlibdeps -L $(PACKAGE) -l debian/$(PACKAGE)/usr/lib
@@ -208,12 +256,26 @@
binary-strip:
dh_testdir
dh_testroot
- dh_strip --keep-debug --exclude=libopal_d
-
- cp -af debian/$(PACKAGE)/usr/lib/debug debian/libopal-dbg/usr/lib && \
- rm -rf debian/$(PACKAGE)/usr/lib/debug
- rm -rf debian/simpleopal/usr/lib/
+ifneq (4,$(DH_COMPAT))
+ dh_strip -N$(PACKAGE)-dbg -N$(PACKAGE)-ptrace -N$(PACKAGE)-develop --dbg-package=libopal-dbg
+ # can't ship those in libopal-dbg due to namespace overlap
+ dh_strip -p$(PACKAGE)-ptrace $(STRIP_EXCLUDES) -N$(PACKAGE)-develop --dbg-package=libopal-ptrace
+ dh_strip -p$(PACKAGE)-develop $(STRIP_EXCLUDES) -N$(PACKAGE)-ptrace --dbg-package=libopal-develop
+else
+ # As dh_strip does not work fine for multiple binary package
+ # we need to workaround that manually
+ dh_strip --exclude=libopal_d --keep-debug
+ for pack in $(PACKAGE) simpleopal ; do \
+ cp -af debian/$$pack/usr/lib/debug debian/libopal-dbg/usr/lib && \
+ rm -rf debian/$$pack/usr/lib/debug; \
+ done
+ for pack in -ptrace -develop;do \
+ cp -af debian/$(PACKAGE)$$pack/usr/lib/debug debian/libopal-dbg$$pack/usr/lib && \
+ rm -rf debian/$(PACKAGE)$$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
More information about the Pkg-voip-commits
mailing list