[Pkg-voip-commits] r3614 - in openh323/trunk/debian: . patches
kilian at alioth.debian.org
kilian at alioth.debian.org
Sat May 26 20:39:24 UTC 2007
Author: kilian
Date: 2007-05-26 20:39:23 +0000 (Sat, 26 May 2007)
New Revision: 3614
Added:
openh323/trunk/debian/patches/01_libname.dpatch
Removed:
openh323/trunk/debian/patches/01_openh323u.mak.in.dpatch
Modified:
openh323/trunk/debian/control
openh323/trunk/debian/libopenh323-dev.dirs
openh323/trunk/debian/patches/00list
openh323/trunk/debian/rules
Log:
finish opt, opt+ptrace, debug extensions of existing code.
Modified: openh323/trunk/debian/control
===================================================================
--- openh323/trunk/debian/control 2007-05-26 18:55:42 UTC (rev 3613)
+++ openh323/trunk/debian/control 2007-05-26 20:39:23 UTC (rev 3614)
@@ -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~), libssl-dev, libgsm1-dev (>=1.0.10-11), libspeex-dev (>=1.1.11-1), dpatch (>=1.11), libsasl2-dev, doxygen, autotools-dev, binutils (>= 2.17-1)
+Build-Depends: debhelper (>=4.0.2), libpt-dev (>=1.10.7~dfsg~), libssl-dev, libgsm1-dev (>=1.0.10-11), libspeex-dev (>=1.1.11-1), dpatch (>=1.11), libsasl2-dev, doxygen, autotools-dev, binutils (>= 2.17-1)
Build-Depends-Indep: doxygen
Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14), libopenh323-dev, libopenh323-1.15.3c2, libopenh323-1.15.6
Standards-Version: 3.6.2
@@ -16,7 +16,7 @@
Depends: ${shlibs:Depends}
Suggests: libopenh323-dev
Replaces: libopenh323-1.15.2, libopenh323-1.15.3c2, libopenh323-1.15.6, libopenh323-1.17.3
-Conflicts: libopenh323-1.15.2, libopenh323-1.15.3c2, libopenh323-1.15.6, libopenh323-1.17.3
+Conflicts: libopenh323-1.18.0-ptrace, libopenh323-1.18.0-develop
Description: H.323 aka VoIP library
This package contains the shared version of the OpenH323 library.
.
@@ -28,10 +28,54 @@
For more information on the OpenH323 project visit them at
http://www.voxgratia.org/
+Package: libopenh323-1.18.0-ptrace
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: libopenh323-dev
+Replaces: libopenh323-1.15.2, libopenh323-1.15.3c2, libopenh323-1.15.6, libopenh323-1.17.3
+Conflicts: libopenh323-1.18.0, libopenh323-1.18.0-develop
+Description: H.323 aka VoIP library
+ This package contains the shared version of the OpenH323 library.
+ .
+ The OpenH323 project aims to create a full featured, interoperable,
+ Open Source implementation of the ITU H.323 teleconferencing protocol
+ that can be used freely by everybody. This protocol is most used for
+ Voice over IP (VoIP) conferencing.
+ .
+ This package was compiled with PTRACE output enabled. It's not recommended to
+ run this in a production environment. It also contains the static library and
+ debug symbols.
+ .
+ For more information on the OpenH323 project visit them at
+ http://www.voxgratia.org/
+
+Package: libopenh323-1.18.0-develop
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: libopenh323-dev
+Replaces: libopenh323-1.15.2, libopenh323-1.15.3c2, libopenh323-1.15.6, libopenh323-1.17.3
+Conflicts: libopenh323-1.18.0-ptrace, libopenh323-1.18.0
+Description: H.323 aka VoIP library
+ This package contains the shared version of the OpenH323 library.
+ .
+ The OpenH323 project aims to create a full featured, interoperable,
+ Open Source implementation of the ITU H.323 teleconferencing protocol
+ that can be used freely by everybody. This protocol is most used for
+ Voice over IP (VoIP) conferencing.
+ .
+ This package was compiled with full debugging and PTRACE output enabled. It's
+ not recommended to run this in a production environment. It also contains the
+ static library and debug symbols.
+ .
+ For more information on the OpenH323 project visit them at
+ http://www.voxgratia.org/
+
Package: libopenh323-dev
Section: libdevel
Architecture: any
-Depends: libopenh323-1.18.0 (= ${Source-Version}), libssl-dev, libpt-dev (>= 1.10.2)
+Depends: libopenh323-1.18.0 (= ${Source-Version})|libopenh323-1.18.0-ptrace (= ${Source-Version})|libopenh323-1.18.0-develop (= ${Source-Version}), libssl-dev, libpt-dev (>= 1.10.7~dfsg~)
Conflicts: liboh323-dev, libopenh323-dev
Replaces: liboh323-dev
Description: H.323 aka VoIP library development files
Modified: openh323/trunk/debian/libopenh323-dev.dirs
===================================================================
--- openh323/trunk/debian/libopenh323-dev.dirs 2007-05-26 18:55:42 UTC (rev 3613)
+++ openh323/trunk/debian/libopenh323-dev.dirs 2007-05-26 20:39:23 UTC (rev 3614)
@@ -1,2 +1,3 @@
usr/include/openh323
+usr/lib
usr/share/openh323
Modified: openh323/trunk/debian/patches/00list
===================================================================
--- openh323/trunk/debian/patches/00list 2007-05-26 18:55:42 UTC (rev 3613)
+++ openh323/trunk/debian/patches/00list 2007-05-26 20:39:23 UTC (rev 3614)
@@ -1,5 +1,6 @@
-01_openh323u.mak.in
+01_libname
03_Makefile.in
10_openh323u.mak
+notrace
ixjuser.h
ixjlid.h
Added: openh323/trunk/debian/patches/01_libname.dpatch
===================================================================
--- openh323/trunk/debian/patches/01_libname.dpatch (rev 0)
+++ openh323/trunk/debian/patches/01_libname.dpatch 2007-05-26 20:39:23 UTC (rev 3614)
@@ -0,0 +1,35 @@
+#! /bin/sh -e
+## 01_openh323u.mak.in.dpatch by Kilian Krause <kilian at debian.org>
+##
+## DP: Fixes the libraries' file names
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+ at DPATCH@
+diff -urNad openh323-1.18.0.dfsg~/openh323u.mak.in openh323-1.18.0.dfsg/openh323u.mak.in
+--- openh323-1.18.0.dfsg~/openh323u.mak.in 2005-01-03 07:25:51.000000000 +0100
++++ openh323-1.18.0.dfsg/openh323u.mak.in 2007-05-26 21:23:47.216315965 +0200
+@@ -216,7 +216,7 @@
+ OH323_SUFFIX = $(OBJ_SUFFIX)
+ endif # NOTRACE
+
+-OH323_BASE = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
++OH323_BASE = openh323$(LIB_TYPE)
+ OH323_FILE = lib$(OH323_BASE).$(LIB_SUFFIX)
+
+ LDFLAGS += -L$(OH323_LIBDIR)
Property changes on: openh323/trunk/debian/patches/01_libname.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: openh323/trunk/debian/patches/01_openh323u.mak.in.dpatch
===================================================================
--- openh323/trunk/debian/patches/01_openh323u.mak.in.dpatch 2007-05-26 18:55:42 UTC (rev 3613)
+++ openh323/trunk/debian/patches/01_openh323u.mak.in.dpatch 2007-05-26 20:39:23 UTC (rev 3614)
@@ -1,41 +0,0 @@
-#! /bin/sh -e
-## 01_openh323u.mak.in.dpatch by Tim Johann <t1m at phrogstar.de>
-##
-## DP: Fixes the libraries' file names
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
- at DPATCH@
-diff -urNad openh323-1.15.3/openh323u.mak.in /tmp/dpep.kZjO8C/openh323-1.15.3/openh323u.mak.in
---- openh323-1.15.3/openh323u.mak.in 2005-02-21 00:15:08.816215617 +0000
-+++ /tmp/dpep.kZjO8C/openh323-1.15.3/openh323u.mak.in 2005-02-21 00:17:08.504518194 +0000
-@@ -209,7 +209,13 @@
- #STDCCFLAGS += -DNO_H323_VIDEO
- #endif
-
--OH323_BASE = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
-+#OH323_BASE = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE)
-+ifeq ($(findstring $(OH323_SUFFIX),d),)
-+OH323_BASE = openh323
-+else
-+OH323_BASE = openh323_$(OH323_SUFFIX)
-+endif
-+
- OH323_FILE = lib$(OH323_BASE).$(LIB_SUFFIX)
-
- LDFLAGS += -L$(OH323_LIBDIR)
Modified: openh323/trunk/debian/rules
===================================================================
--- openh323/trunk/debian/rules 2007-05-26 18:55:42 UTC (rev 3613)
+++ openh323/trunk/debian/rules 2007-05-26 20:39:23 UTC (rev 3614)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-export DH_COMPAT=4
+export DH_COMPAT=5
# Change this on API breakage
export LIBH323COMPAT=1.17.4
@@ -8,6 +8,9 @@
#PACKAGE=libopenh323-$(LIBH323COMPAT)
PACKAGE=libopenh323-1.18.0
+# excludes for the -ptrace and -develop version
+STRIP_EXCLUDES = -N$(PACKAGE) -Nlibopenh323-dbg -Nlibopenh323-dev -Nsimph323
+
ifneq (,$(shell test -f version.h&&grep MAJOR_VERSION 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)
@@ -16,10 +19,15 @@
SHLIBSVER := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
-MAKE_BUILD_PARAM=OPENH323DIR=$(CURDIR)
+CFLAGS := -g
-include /usr/share/dpatch/dpatch.make
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+endif
+MAKE_BUILD_PARAM := OPENH323DIR=$(CURDIR)
+
+
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -29,15 +37,20 @@
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 := openh323_$(UPVERSION).dfsg.orig.tar.gz
UPFILENAME := openh323_$(UPVERSION).orig.tar.gz
URL := http://www.voxgratia.org/releases/openh323-v$(URLVERSION)-src-tar.gz
+include /usr/share/dpatch/dpatch.make
build: build-arch build-indep
@@ -56,32 +69,56 @@
touch autotools
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 OH323_LIBDIR=$(CURDIR)/lib/highopt optshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OH323_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 OH323_LIBDIR=$(CURDIR)/lib/opt optshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=r OH323_LIBDIR=$(CURDIR)/lib/opt optnoshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=d OH323_LIBDIR=$(CURDIR)/lib/debug debugshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=d OH323_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/simph323 --help >/dev/null
- ##samples/simple/obj_*_r/simph323 --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) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OH323_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 OH323_LIBDIR=$(CURDIR)/lib/opt -C samples/simple optnoshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=d OH323_LIBDIR=$(CURDIR)/lib/debug -C samples/simple debugnoshared
+
+ samples/simple/obj_*_n/simph323 --help >/dev/null
+ samples/simple/obj_*_r/simph323 --help >/dev/null
+ samples/simple/obj_*_d/simph323 --help >/dev/null
+ ## then shared...
+ $(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 OH323_LIBDIR=$(CURDIR)/lib/highopt -C samples/simple optshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OH323_LIBDIR=$(CURDIR)/lib/opt -C samples/simple optshared
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=d OH323_LIBDIR=$(CURDIR)/lib/debug -C samples/simple debugshared
if (samples/simple/obj_*_d/simph323 --help >/dev/null);then \
echo shared debug simph323 incorrectly compiled static; false;\
else \
echo shared debug simph323 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/simph323 --help >/dev/null
if (samples/simple/obj_*_r/simph323 --help >/dev/null);then \
echo shared opt simph323 incorrectly compiled static; false;\
else \
echo shared opt simph323 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/simph323 --help >/dev/null
+ if (samples/simple/obj_*_n/simph323 --help >/dev/null);then \
+ echo shared highopt simph323 incorrectly compiled static; false;\
+ else \
+ echo shared highopt simph323 correctly compiled non-static; \
+ fi
+ LD_LIBRARY_PATH=$(CURDIR)/lib/highopt samples/simple/obj_*_n/simph323 --help >/dev/null
+ #$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
+ #$(RM) -rf samples/simple/obj_*
+ # save it to install in package later...
+
touch build-arch-stamp
build-indep: build-indep-stamp
@@ -95,10 +132,10 @@
dh_testroot
-rm -f build-arch-stamp build-indep-stamp patch-stamp
-rm -f config.status config.log autotools
- if [ -f Makefile ];then \
+ -if [ -f Makefile ];then \
$(MAKE) $(MAKE_BUILD_PARAM) optclean clean ;\
+ $(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean;\
fi
- -$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean;\
-rm -rf samples/simple/obj*
-rm -f Makefile openh323u.mak include/openh323buildopts.h
-rm -rf lib
@@ -125,34 +162,40 @@
dh_testroot
dh_clean -k -a
dh_installdirs -a
-
- $(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C src install
+ 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/libopenh323.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
+ install -m 755 lib/opt/libopenh323.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-ptrace/usr/lib
+ install -m 755 lib/debug/libopenh323.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
+
$(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
ifneq ($(SHLIBSVER),$(LIBH323COMPAT))
+ for suffix in "" "-ptrace" "-develop";do \
ln -s libopenh323.so.$(SHLIBSVER) \
- debian/$(PACKAGE)/usr/lib/libopenh323.so.$(LIBH323COMPAT)
+ debian/$(PACKAGE)$$suffix/usr/lib/libopenh323.so.$(LIBH323COMPAT); \
+ done
endif
- $(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/simph323/usr -C samples/simple install
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/highopt INSTALL_DIR=$(CURDIR)/debian/simph323/usr -C samples/simple install
# clean simple to install it as a sample in the docs
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
-rmdir samples/simple/obj*
# libopenh323-dbg package
- $(MAKE) $(MAKE_BUILD_PARAM) DEBUG=1 DESTDIR=$(CURDIR)/debian/libopenh323-dbg install
- $(RM) -rf $(CURDIR)/debian/libopenh323-dbg/usr/include
- cp lib/libopenh323*.a $(CURDIR)/debian/libopenh323-dbg/usr/lib
+ cp -v lib/opt/libopenh323_s.a debian/$(PACKAGE)-ptrace/usr/lib
+ cp -v lib/debug/libopenh323_s.a debian/$(PACKAGE)-develop/usr/lib
# libopenh323-dev package
- dh_movefiles -plibopenh323-dev --sourcedir=debian/$(PACKAGE) usr/lib/libopenh323.so
- rm debian/$(PACKAGE)/usr/lib/libopenh323.so.? \
- debian/$(PACKAGE)/usr/lib/libopenh323.so.?.??
+ cp -v lib/highopt/libopenh323*.a $(CURDIR)/debian/libopenh323-dev/usr/lib
+ ln -s libopenh323.so.$(SHLIBSVER) debian/libopenh323-dev/usr/lib/libopenh323.so
+ ln -s libopenh323.so.$(SHLIBSVER) debian/libopenh323-dev/usr/lib/libopenh323.so.$(VER_MAJOR)
+ ln -s libopenh323.so.$(SHLIBSVER) debian/libopenh323-dev/usr/lib/libopenh323.so.$(VER_MAJOR).$(VER_MINOR)
- cp -v lib/libopenh323.a debian/libopenh323-dev/usr/lib
sed -e 's#^OPENH323DIR.*#OPENH323DIR = \/usr\/share\/openh323#g' \
openh323u.mak > debian/libopenh323-dev/usr/share/openh323/openh323u.mak
cp -vr include/* $(CURDIR)/debian/libopenh323-dev/usr/include/openh323/.
+ find debian/libopenh323-dev/usr/include -type f -exec chmod 644 {} \;
cp version.h debian/libopenh323-dev/usr/include/openh323/
- find debian/libopenh323-dev/usr/include -type f -exec chmod 644 {} \;
# linking stuff under usr/share/openh323
ln -s ../../include/openh323/version.h debian/libopenh323-dev/usr/share/openh323/
@@ -166,7 +209,6 @@
# binary-arch/binary-multi
# in another 'make' thread.
binary-common:
-
dh_testdir
dh_testroot
dh_installdocs
@@ -181,9 +223,9 @@
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
dh_gencontrol
dh_md5sums
@@ -192,11 +234,25 @@
binary-strip:
dh_testdir
dh_testroot
- dh_strip --keep-debug --exclude=libopenh323_d
+ifneq (4,$(DH_COMPAT))
+ dh_strip -N$(PACKAGE)-dbg -N$(PACKAGE)-ptrace -N$(PACKAGE)-develop --dbg-package=libopenh323-dbg
+ # can't ship those in libopenh323-dbg due to namespace overlap
+ dh_strip -p$(PACKAGE)-ptrace $(STRIP_EXCLUDES) -N$(PACKAGE)-develop --dbg-package=libopenh323-ptrace
+ dh_strip -p$(PACKAGE)-develop $(STRIP_EXCLUDES) -N$(PACKAGE)-ptrace --dbg-package=libopenh323-develop
+else
+ # As dh_strip does not work fine for multiple binary package
+ # we need to workaround that manually
+ dh_strip --exclude=libopenh323_d --keep-debug
- cp -af debian/$(PACKAGE)/usr/lib/debug debian/libopenh323-dbg/usr/lib && \
- rm -rf debian/$(PACKAGE)/usr/lib/debug
- rm -rf debian/simph323/usr/lib/
+ for pack in $(PACKAGE) simph323 ; do \
+ cp -af debian/$$pack/usr/lib/debug debian/libopenh323-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/libopenh323-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
More information about the Pkg-voip-commits
mailing list