[Pkg-voip-commits] r4243 - openh323/trunk/debian
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Thu Aug 23 08:21:19 UTC 2007
Author: paravoid
Date: 2007-08-23 08:21:19 +0000 (Thu, 23 Aug 2007)
New Revision: 4243
Modified:
openh323/trunk/debian/changelog
openh323/trunk/debian/control
openh323/trunk/debian/rules
Log:
* Drop the notrace variant and provide the ptrace variant as
libopenh323-1.18.0. This reverts to the old ABI and the one that the
libopenh323-dev compiled for. (Closes: #438817)
Modified: openh323/trunk/debian/changelog
===================================================================
--- openh323/trunk/debian/changelog 2007-08-23 07:10:12 UTC (rev 4242)
+++ openh323/trunk/debian/changelog 2007-08-23 08:21:19 UTC (rev 4243)
@@ -2,8 +2,13 @@
* NOT RELEASED YET
- -- Kilian Krause <kilian at debian.org> Sat, 11 Aug 2007 15:15:48 +0200
+ [ Faidon Liambotis ]
+ * Drop the notrace variant and provide the ptrace variant as
+ libopenh323-1.18.0. This reverts to the old ABI and the one that the
+ libopenh323-dev compiled for. (Closes: #438817)
+ -- Faidon Liambotis <paravoid at debian.org> Thu, 23 Aug 2007 11:19:53 +0300
+
openh323 (1.18.0.dfsg-3) unstable; urgency=low
* Don't build notrace version with -DPASN_NOPRINTON to fix FTBFS in gnugk.
Modified: openh323/trunk/debian/control
===================================================================
--- openh323/trunk/debian/control 2007-08-23 07:10:12 UTC (rev 4242)
+++ openh323/trunk/debian/control 2007-08-23 08:21:19 UTC (rev 4243)
@@ -14,7 +14,8 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libopenh323-1.18.0-ptrace, libopenh323-1.18.0-develop
+Conflicts: libopenh323-1.18.0-develop
+Provides: libopenh323-1.18.0-ptrace
Description: H.323 aka VoIP library
This package contains the shared version of the OpenH323 library.
.
@@ -26,26 +27,6 @@
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}
-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
@@ -69,7 +50,7 @@
Package: libopenh323-dev
Section: libdevel
Architecture: any
-Depends: libopenh323-1.18.0 (= ${binary:Version})|libopenh323-1.18.0-ptrace (= ${binary:Version})|libopenh323-1.18.0-develop (= ${binary:Version}), libssl-dev, libpt-dev (>= 1.10.7~dfsg~)
+Depends: libopenh323-1.18.0 (= ${binary:Version}) | libopenh323-1.18.0-develop (= ${binary: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
@@ -82,8 +63,7 @@
Voice over IP (VoIP) conferencing.
.
The static library comes in all three flavours:
- libopenh323_s.a - notrace opt version
- libopenh323_r_s.a - ptrace-enabled opt version
+ libopenh323_s.a - ptrace-enabled opt version
libopenh323_d_s.a - ptrace-enabled debug version
.
For more information on the OpenH323 project visit them at
Modified: openh323/trunk/debian/rules
===================================================================
--- openh323/trunk/debian/rules 2007-08-23 07:10:12 UTC (rev 4242)
+++ openh323/trunk/debian/rules 2007-08-23 08:21:19 UTC (rev 4243)
@@ -69,9 +69,6 @@
touch autotools
build-arch-stamp: config.status
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/notrace optshared
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/notrace 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
@@ -82,19 +79,15 @@
# ...first static
[ ! -f samples/simple/Makefile ]||$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
$(RM) -rf samples/simple/obj_*
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=0 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/notrace -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/notrace -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 \
@@ -109,12 +102,6 @@
echo shared opt simph323 correctly compiled non-static; \
fi
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 notrace simph323 incorrectly compiled static; false;\
- else \
- echo shared notrace simph323 correctly compiled non-static; \
- fi
- LD_LIBRARY_PATH=$(CURDIR)/lib/notrace 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...
@@ -163,29 +150,25 @@
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/notrace/libopenh323.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
- install -m 755 lib/opt/libopenh323.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-ptrace/usr/lib
+ install -m 755 lib/opt/libopenh323.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
install -m 755 lib/debug/libopenh323.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/notrace DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OH323_LIBDIR=$(CURDIR)/lib/opt DESTDIR=$(CURDIR)/debian/$(PACKAGE)-ptrace -C plugins install
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OH323_LIBDIR=$(CURDIR)/lib/opt DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=d OH323_LIBDIR=$(CURDIR)/lib/debug DESTDIR=$(CURDIR)/debian/$(PACKAGE)-develop -C plugins install
ifneq ($(SHLIBSVER),$(LIBH323COMPAT))
- for suffix in "" "-ptrace" "-develop";do \
+ for suffix in "" "-develop";do \
ln -s libopenh323.so.$(SHLIBSVER) \
debian/$(PACKAGE)$$suffix/usr/lib/libopenh323.so.$(LIBH323COMPAT); \
done
endif
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE=1 P_SHAREDLIB=1 OBJDIR_SUFFIX=n OH323_LIBDIR=$(CURDIR)/lib/notrace INSTALL_DIR=$(CURDIR)/debian/simph323/usr -C samples/simple install
+ $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OH323_LIBDIR=$(CURDIR)/lib/opt 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
-$(RM) -r samples/simple/obj*
# libopenh323-dev package
- cp -v lib/notrace/libopenh323_s.a debian/libopenh323-dev/usr/lib
- cp -v lib/opt/libopenh323_s.a debian/libopenh323-dev/usr/lib/libopenh323_r_s.a
+ cp -v lib/opt/libopenh323_s.a debian/libopenh323-dev/usr/lib
cp -v lib/debug/libopenh323_s.a debian/libopenh323-dev/usr/lib/libopenh323_d_s.a
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)
@@ -223,7 +206,7 @@
dh_link
dh_compress
dh_fixperms
- dh_makeshlibs -V '$(PACKAGE) (>= $(DEBVERSION))|$(PACKAGE)-ptrace (>= $(DEBVERSION))|$(PACKAGE)-develop (>= $(DEBVERSION))'
+ dh_makeshlibs -V '$(PACKAGE) (>= $(DEBVERSION)) | $(PACKAGE)-develop (>= $(DEBVERSION))'
dh_installdeb
dh_shlibdeps -L $(PACKAGE) -l debian/$(PACKAGE)/usr/lib
@@ -235,10 +218,9 @@
dh_testdir
dh_testroot
ifneq (4,$(DH_COMPAT))
- dh_strip -N$(PACKAGE)-dbg -N$(PACKAGE)-ptrace -N$(PACKAGE)-develop --dbg-package=libopenh323-dbg
+ dh_strip -N$(PACKAGE)-dbg -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
+ dh_strip -p$(PACKAGE)-develop $(STRIP_EXCLUDES) --dbg-package=libopenh323-develop
else
# As dh_strip does not work fine for multiple binary package
# we need to workaround that manually
@@ -248,7 +230,7 @@
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 \
+ for pack in -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
More information about the Pkg-voip-commits
mailing list