[Pkg-voip-commits] r8431 - in /ptlib/trunk/debian: changelog control libpt2.8.0.install rules watch
msp at alioth.debian.org
msp at alioth.debian.org
Sun May 30 03:21:16 UTC 2010
Author: msp
Date: Sun May 30 03:21:08 2010
New Revision: 8431
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8431
Log:
* Sync from branches/ptlib-2.6
- NEW package libpt2.6.7 - soname bump
- Fix FTBFS on GNU/kFreeBSD (Closes: #545948)
* Constrain debian/watch to just track 2.6 series (Lalande release)
- Move to svn://svn.debian.org/pkg-voip/ptlib/branches/ptlib-2.6
* Switch to dh (7) - drop cdbs
* Depreciate libptX.X.X-plugins -> libptX.X.X
- Makes dependent packages binNMU safe
* Reinstate get-orig-source target - uscan
* Remove Build-Conflict with its own runtime (Closes: #459712)
* New upstream release
* NEW package libpt2.8.0 - soname bump
Modified:
ptlib/trunk/debian/changelog
ptlib/trunk/debian/control
ptlib/trunk/debian/libpt2.8.0.install
ptlib/trunk/debian/rules
ptlib/trunk/debian/watch
Modified: ptlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/changelog?rev=8431&op=diff
==============================================================================
--- ptlib/trunk/debian/changelog (original)
+++ ptlib/trunk/debian/changelog Sun May 30 03:21:08 2010
@@ -1,8 +1,26 @@
ptlib (2.8.0-2) UNRELEASED; urgency=low
- * Provides: libpt-plugins - preferred method for others to depend
-
- -- Mark Purcell <msp at debian.org> Sat, 24 Apr 2010 13:25:17 +1000
+ * Sync from branches/ptlib-2.6
+
+ -- Mark Purcell <msp at debian.org> Thu, 13 May 2010 10:41:55 +1000
+
+ptlib (2.6.7-1) unstable; urgency=low
+
+ [Mark Purcell]
+ * New upstream release
+ - NEW package libpt2.6.7 - soname bump
+ - Fix FTBFS on GNU/kFreeBSD (Closes: #545948)
+ * Constrain debian/watch to just track 2.6 series (Lalande release)
+ - Move to svn://svn.debian.org/pkg-voip/ptlib/branches/ptlib-2.6
+ * Switch to dh (7) - drop cdbs
+ * Depreciate libptX.X.X-plugins -> libptX.X.X
+ - Makes dependent packages binNMU safe
+ * Reinstate get-orig-source target - uscan
+
+ [Eugen Dedu]
+ * Remove Build-Conflict with its own runtime (Closes: #459712)
+
+ -- Mark Purcell <msp at debian.org> Thu, 27 May 2010 22:27:41 +1000
ptlib (2.8.0-1) experimental; urgency=low
@@ -10,12 +28,6 @@
* NEW package libpt2.8.0 - soname bump
-- Mark Purcell <msp at debian.org> Sun, 07 Mar 2010 09:31:14 +1100
-
-ptlib (2.6.5-2) unstable; urgency=low
-
- * Remove some conflicts with non-official snapshot packages.
-
- -- Mark Purcell <msp at debian.org> Sat, 03 Oct 2009 17:11:51 +1000
ptlib (2.6.5-1) unstable; urgency=low
Modified: ptlib/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/control?rev=8431&op=diff
==============================================================================
--- ptlib/trunk/debian/control (original)
+++ ptlib/trunk/debian/control Sun May 30 03:21:08 2010
@@ -3,20 +3,13 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
-Build-Depends: debhelper (>= 7), dpatch, g++ (>= 2.95), autotools-dev, doxygen, pkg-config, bison, flex,
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, doxygen, pkg-config, bison, flex,
unixodbc-dev, libssl-dev, libldap2-dev, libsasl2-dev, libkrb5-dev, libexpat1-dev,
libsdl1.2-dev, libdv4-dev,
libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
-Build-Conflicts:
- libpt2.6.5, libpt2.6.4, libpt2.6.3, libpt2.6.2, libpt2.6.1, libpt2.4.2, libpt2.4.1, libpt2.3-beta1,
- libpt-1.11.2, libpt-1.11.2-ptrace, libpt-1.11.2-develop,
- libpt-1.10.10, libpt-1.10.10-ptrace, libpt-1.10.10-develop,
- libpt-1.10.0, libpt-1.10.0-ptrace, libpt-1.10.0-develop,
- libpt-1.8.7, libpt-1.8.3, libpt-1.8.3c2, libpt-1.8.3c2a,
- libpt-dev,
- libpt-snapshot
-Standards-Version: 3.8.3
+Build-Conflicts: libpt-dev
+Standards-Version: 3.8.4
Homepage: http://www.opalvoip.org/
Vcs-Svn: svn://svn.debian.org/pkg-voip/ptlib/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/?opt=dir&sc=1
@@ -24,20 +17,20 @@
Package: libpt2.8.0
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libpt2.8.0-plugins
-Replaces: libpt2.3-beta1
-Conflicts: libpt2.3-beta1
Description: Portable Tools Library
This package contains the shared version of the library PTLib, which is
a moderately large class library that has its genesis many years ago as
a method to produce applications to run on both Microsoft Windows and
Unix X-Window systems.
+ .
+ This package also contains all the current PTLib plugins (alsa, oss, v4l2,
+ and v4l).
Package: libpt-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, libpt2.8.0 (= ${binary:Version}), libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev, unixodbc-dev, pkg-config
-Conflicts: libpt-snapshot-dev, libpt2.3-beta1-dev, libpt-1.11.2-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpt2.8.0 (= ${binary:Version}),
+ libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev, unixodbc-dev, pkg-config
Description: Portable Tools Library development files
This package contains the headers and a static version of the library
PTLib, which is a moderately large class library that has its genesis
@@ -48,9 +41,7 @@
Section: debug
Priority: extra
Architecture: any
-Depends: ${misc:Depends}, libpt2.8.0 (= ${binary:Version})
-Replaces: libpt2.3-beta1-dbg
-Conflicts: libpt2.3-beta1-dbg
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpt2.8.0 (= ${binary:Version})
Description: Portable Tools Library development debug files
This package contains the shared and static debug symbols of the library
PTLib, which is a moderately large class library that has its genesis
@@ -69,14 +60,3 @@
PTLib, which is a moderately large class library that has its genesis
many years ago as a method to produce applications to run on both
Microsoft Windows and Unix X-Window systems.
-
-Package: libpt2.8.0-plugins
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libpt2.8.0 (= ${binary:Version})
-Provides: libpt-plugins
-Replaces: libpt2.6.3-plugins-alsa, libpt2.6.3-plugins-oss, libpt2.6.3-plugins-v4l2, libpt2.6.3-plugins-v4l, libpt2.6.1-plugins-alsa, libpt2.6.1-plugins-oss, libpt2.6.1-plugins-v4l2, libpt2.6.1-plugins-v4l, libpt-snapshot-plugins-v4l2, libpt2.3-beta1-plugins-v4l2
-Conflicts: libpt2.6.3-plugins-alsa, libpt2.6.3-plugins-oss, libpt2.6.3-plugins-v4l2, libpt2.6.3-plugins-v4l, libpt2.6.1-plugins-alsa, libpt2.6.1-plugins-oss, libpt2.6.1-plugins-v4l2, libpt2.6.1-plugins-v4l, libpt-snapshot-plugins-v4l2, libpt2.3-beta1-plugins-v4l2
-Description: Portable Tools Library plugins
- This package contains all the current PTLib plugins (alsa, oss, v4l2,
- and v4l). Install this package if you want to use a video or audio
- device.
Modified: ptlib/trunk/debian/libpt2.8.0.install
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/libpt2.8.0.install?rev=8431&op=diff
==============================================================================
--- ptlib/trunk/debian/libpt2.8.0.install (original)
+++ ptlib/trunk/debian/libpt2.8.0.install Sun May 30 03:21:08 2010
@@ -1,1 +1,2 @@
usr/lib/libpt.so.*.*[.-]*
+usr/lib/ptlib-*/devices/*
Modified: ptlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/rules?rev=8431&op=diff
==============================================================================
--- ptlib/trunk/debian/rules (original)
+++ ptlib/trunk/debian/rules Sun May 30 03:21:08 2010
@@ -1,203 +1,28 @@
#!/usr/bin/make -f
-DEBVERSION := $(shell head -n 1 debian/changelog \
- | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION := $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://' -e 's/-[0-9.]*(\+b[0-9])?$$//' -e 's/.dfsg[0-9]*$$//')
-REV := $(shell echo $(UPVERSION) | sed -r -e 's/^.*svn//')
+%:
+ dh $@
-FILENAME := ptlib_$(UPVERSION).orig.tar.gz
-URL := http://ftp.gnome.org/pub/gnome/sources/ptlib/2.6/ptlib-$(UPVERSION).tar.gz
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-oss --enable-v4l --disable-avc --disable-dc
+override_dh_auto_build:
+ dh_auto_build -- all docs
-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)
-VER_SUB := $(shell awk '/BUILD_NUMBER/ { print $$3 }' version.h 2>/dev/null)
-endif
+override_dh_strip:
+ dh_strip -a --dbg-package=libpt2.8.0-dbg
-DIRNAME := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
-#DIRNAME := 2.4.1
-PACKAGE=libpt$(DIRNAME)
-
-CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-LDFLAGS += -Wl,-z,def
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-
-# used for sed-ating out host specific data
-export UNAME_R=`uname -r`
-
-export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build $(DEB_HOST_GNU_TYPE)
-else
- confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-include /usr/share/dpatch/dpatch.make
-
-build: build-arch build-indep
-
-build-arch: config.status build-arch-stamp
-
-config.status: patch-stamp autotools configure
- ./configure $(confflags) --prefix=/usr --enable-oss --enable-v4l --disable-dc
-
-autotools:
- rm -f config.sub config.guess
- cp /usr/share/misc/config.sub config.sub
- cp /usr/share/misc/config.guess config.guess
- rm -f plugins/config.sub plugins/config.guess
- cp /usr/share/misc/config.sub plugins/config.sub
- cp /usr/share/misc/config.guess plugins/config.guess
- touch autotools
-
-build-arch-stamp: config.status
- $(MAKE) $(MAKEFLAGS)
-
- # then we ensure that the fresh build works with hello world.
+override_dh_auto_test:
$(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world clean
$(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world opt
if (samples/hello_world/obj*/hello 2>/dev/null);then \
- echo opt hello_world sample incorrectly compiled static; false ; \
+ echo opt hello_world sample incorrectly compiled static; false ; \
else \
- echo opt hello_world sample correctly compiled non-static; \
+ echo opt hello_world sample correctly compiled non-static; \
fi
ln -s lib* lib ; LD_LIBRARY_PATH=$(CURDIR)/lib samples/hello_world/obj*/hello
# if this won't work, we needn't even try going any further...
rm lib
- touch build-arch-stamp
-
-build-indep: build-indep-stamp
-build-indep-stamp: config.status
- $(MAKE) docs
- touch build-indep-stamp
-
-clean: clean-patched unpatch
-clean-patched:
- $(checkdir)
- rm -f build-arch-stamp build-indep-stamp patch-stamp
- if [ -f Makefile ];then \
- $(MAKE) clean || true ; \
- $(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world clean||true ; \
- fi
- rm -f include/ptbuildopts.h
- rm -f Makefile config.log config.status autotools
- rm -f config.sub config.guess plugins/config.sub plugins/config.guess
- rm -f plugins/Makefile plugins/config.status plugins/config.log
- rm -rf lib
- rm -f make/ptbuildopts.mak make/ptlib-config include/ptbuildopts.h
- rm -rf plugins/ptlib*
- rm -f plugins/Makefile plugins/config.status plugins/config.log
- rm -f `find . -name "*~"`
- rm -rf `find debian/* -type d -name "libpt-*"`
- rm -rf debian/files* core
- rm -f debian/*substvars
- rm -f debian/*.debhelper
- rm -rf html
- rm -f core a.out
- dh_clean
-
-install: install-indep install-arch
-install-indep:
- dh_testdir
- dh_testroot
- dh_prep
- dh_clean -i
- dh_installdirs -i
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -a
- dh_installdirs -a
-
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
- dh_install -a
- # see libpt-dev.install for list of files
-
- # TODO replace by libpt2.6.4-plugins.install
- mkdir -p debian/$(PACKAGE)-plugins/usr/lib/ptlib-$(DIRNAME)
- mv debian/tmp/usr/lib/ptlib*/devices/ debian/$(PACKAGE)-plugins/usr/lib/ptlib-$(DIRNAME)
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-multi
-# in another 'make' thread.
-binary-common:
- dh_testdir
- dh_testroot
- #$(PACKAGE) has docs in /usr/share/doc, all the others use links
- dh_installdocs -N$(PACKAGE)-plugins -N$(PACKAGE)-dev -N$(PACKAGE)-dbg
- dh_installman
- dh_installchangelogs -N$(PACKAGE)-plugins -N$(PACKAGE)-dev -N$(PACKAGE)-dbg
- -test "x$(DH_OPTIONS)" = "x-a" && for pkg in plugins dev dbg; do mkdir -p debian/$(PACKAGE)-$$pkg/usr/share/doc; ln -s $(PACKAGE) debian/$(PACKAGE)-$$pkg/usr/share/doc/$(PACKAGE)-$$pkg; done
-
- dh_link
- dh_compress
- dh_fixperms
- # a new variable will be needed if an epoch is introduced to our versioning
- dh_makeshlibs -V '$(PACKAGE) (>= $(UPVERSION)~)'
- dh_installdeb
- dh_shlibdeps -L $(PACKAGE) -l debian/$(PACKAGE)/usr/lib
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-strip:
- dh_testdir
- dh_testroot
-
-ifneq (4,$(DH_COMPAT))
- dh_strip -N$(PACKAGE)-dbg --dbg-package=$(PACKAGE)-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) $(PACKAGE)-plugins ; \
- do \
- cp -af debian/$$pack/usr/lib/debug debian/$(PACKAGE)-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
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-strip
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-print-version:
- @@echo "Debian version: $(DEBVERSION)"
- @@echo "Upstream version: $(UPVERSION)"
- @@echo "svn REV: $(REV)"
-
get-orig-source:
- @@dh_testdir
- @@[ -d ../tarballs/. ]||mkdir -p ../tarballs
- @@#this is for stable versions
- @@echo Downloading $(FILENAME) from $(URL) for repacking ...
- @@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
- @@#and this is for SVN
- @@#echo 'Checking out for repacking (might take 15 min) ...'
- @@#svn export https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/ptlib/trunk@$(REV) ../tarballs/ptlib-$(REV).tmp
- @@#echo 'Getting the changelog (might take 15 min) ...'
- @@#cd ../tarballs/ptlib-$(REV).tmp; svn2cl -o changelog https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/ptlib/trunk@$(REV)
- @@#echo Creating the tarball ...
- @@#cd ../tarballs/ptlib-$(REV).tmp; tar zcf ../ptlib_$(UPVERSION).orig.tar.gz *
- @@#rm -rf ../tarballs/ptlib-$(REV).tmp
- @@echo Ready for packaging.
-
-binary: binary-arch binary-indep
-.PHONY: build clean clean-patched binary-indep binary-arch binary install install-indep install-arch
+ uscan --force-download
Modified: ptlib/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/watch?rev=8431&op=diff
==============================================================================
--- ptlib/trunk/debian/watch (original)
+++ ptlib/trunk/debian/watch Sun May 30 03:21:08 2010
@@ -1,4 +1,3 @@
version=3
http://sf.net/opalvoip/ptlib-(\d.\d.\d).tar.bz2 debian svn-upgrade
-http://ftp.gnome.org/pub/gnome/sources/ptlib/(?:[\d\.]+)/ptlib-(\d.*).tar.gz debian svn-upgrade
More information about the Pkg-voip-commits
mailing list