[Pkg-voip-commits] r6964 - in /ptlib/trunk/debian: changelog compat control libpt-dev.install libpt2.6.1.install rules watch
msp at alioth.debian.org
msp at alioth.debian.org
Thu Apr 2 12:49:35 UTC 2009
Author: msp
Date: Thu Apr 2 12:49:34 2009
New Revision: 6964
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6964
Log:
* Switch development package to libpt-dev. Guidance from debian-release
* Begin migration from old libpt versions
* Update debian/watch -> sf.net & ftp.gnome.org
* debian/libpt-dev.install replaces mv/cp stataments in debian/rules
* Add Build-Depends: libv4l-dev (Closes: #512931)
Added:
ptlib/trunk/debian/libpt-dev.install
ptlib/trunk/debian/libpt2.6.1.install
Modified:
ptlib/trunk/debian/changelog
ptlib/trunk/debian/compat
ptlib/trunk/debian/control
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=6964&op=diff
==============================================================================
--- ptlib/trunk/debian/changelog (original)
+++ ptlib/trunk/debian/changelog Thu Apr 2 12:49:34 2009
@@ -1,14 +1,22 @@
ptlib (2.6.1-1) UNRELEASED; urgency=low
- * NOT RELEASED YET
* New upstream release.
+
+ [ Eugen Dedu ]
* Remove DC and AVC plugin packages, since they do not compile anymore
with current versions of libraw1394/libdc1394/libavc1394 in debian.
* debian/rules: Honour DEB_BUILD_OPTIONS parameter for parallel builds.
* Activate libv4l, adding support for many webcams. (Closes: #512931).
* Fix control fields: Vcs-Svn and Vcs-Browser.
- -- Mark Purcell <msp at debian.org> Wed, 10 Dec 2008 21:50:58 +1100
+ [ Mark Purcell ]
+ * Switch development package to libpt-dev. Guidance from debian-release
+ * Begin migration from old libpt versions
+ * Update debian/watch -> sf.net & ftp.gnome.org
+ * debian/libpt-dev.install replaces mv/cp stataments in debian/rules
+ * Add Build-Depends: libv4l-dev (Closes: #512931)
+
+ -- Mark Purcell <msp at debian.org> Tue, 31 Mar 2009 06:03:52 +1100
ptlib (2.4.2-3) experimental; urgency=low
Modified: ptlib/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/compat?rev=6964&op=diff
==============================================================================
--- ptlib/trunk/debian/compat (original)
+++ ptlib/trunk/debian/compat Thu Apr 2 12:49:34 2009
@@ -1,1 +1,1 @@
-5
+7
Modified: ptlib/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/control?rev=6964&op=diff
==============================================================================
--- ptlib/trunk/debian/control (original)
+++ ptlib/trunk/debian/control Thu Apr 2 12:49:34 2009
@@ -3,7 +3,7 @@
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, dpatch, bison, flex, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, g++ (>= 2.95), autotools-dev, libasound2-dev, libdv4-dev, libsasl2-dev, libkrb5-dev, doxygen, pkg-config, unixodbc-dev
+Build-Depends: debhelper, dpatch, bison, flex, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, g++ (>= 2.95), autotools-dev, libasound2-dev, libdv4-dev, libsasl2-dev, libkrb5-dev, doxygen, pkg-config, unixodbc-dev, libv4l-dev
Build-Conflicts:
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,
@@ -12,13 +12,12 @@
libpt-1.8.7, libpt-1.8.3, libpt-1.8.3c2, libpt-1.8.3c2a,
libpt-dev,
libpt-snapshot
-Standards-Version: 3.8.0.0
+Standards-Version: 3.8.0
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/?op=log
Package: libpt2.6.1
-Section: libs
Architecture: any
Depends: ${shlibs:Depends}
Suggests: libpt2.6.1-plugins-alsa|libpt2.6.1-plugins-oss, libpt2.6.1-plugins-v4l2|libpt2.6.1-plugins-v4l
@@ -30,12 +29,11 @@
a method to produce applications to run on both Microsoft Windows and
Unix X-Window systems.
-Package: libpt2.6.1-dev
+Package: libpt-dev
Section: libdevel
Architecture: any
Depends: libpt2.6.1 (= ${binary:Version}), libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev, unixodbc-dev, pkg-config
-Conflicts: libpt-dev, libpt-snapshot-dev, libpt2.3-beta1-dev
-Replaces: libpt-snapshot-dev, libpt2.3-beta1-dev
+Conflicts: libpt-snapshot-dev, libpt2.3-beta1-dev, libpt-1.11.2-dev
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
@@ -43,7 +41,7 @@
Microsoft Windows and Unix X-Window systems.
Package: libpt2.6.1-dbg
-Section: libdevel
+Section: debug
Priority: extra
Architecture: any
Depends: libpt2.6.1 (= ${binary:Version})
@@ -57,7 +55,7 @@
version of PTLib which would yield much more detailled information as a
compromise of benefit and compile power consumption.
-Package: libpt2.6.1-doc
+Package: libpt-doc
Section: doc
Priority: extra
Architecture: all
@@ -68,7 +66,6 @@
Microsoft Windows and Unix X-Window systems.
Package: libpt2.6.1-plugins-v4l2
-Section: libs
Architecture: any
Depends: ${shlibs:Depends}, libpt2.6.1 (= ${binary:Version})
Replaces: libpt-snapshot-plugins-v4l2, libpt2.3-beta1-plugins-v4l2
@@ -79,7 +76,6 @@
that is not attached to FireWire.
Package: libpt2.6.1-plugins-v4l
-Section: libs
Architecture: any
Depends: ${shlibs:Depends}, libpt2.6.1 (= ${binary:Version})
Replaces: libpt-snapshot-plugins-v4l, libpt2.3-beta1-plugins-v4l
Added: ptlib/trunk/debian/libpt-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/libpt-dev.install?rev=6964&op=file
==============================================================================
--- ptlib/trunk/debian/libpt-dev.install (added)
+++ ptlib/trunk/debian/libpt-dev.install Thu Apr 2 12:49:34 2009
@@ -1,0 +1,6 @@
+usr/include/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
+version.h usr/include/ptlib
+
Added: ptlib/trunk/debian/libpt2.6.1.install
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/libpt2.6.1.install?rev=6964&op=file
==============================================================================
--- ptlib/trunk/debian/libpt2.6.1.install (added)
+++ ptlib/trunk/debian/libpt2.6.1.install Thu Apr 2 12:49:34 2009
@@ -1,0 +1,1 @@
+usr/lib/libpt.so.*.*[.-]*
Modified: ptlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/rules?rev=6964&op=diff
==============================================================================
--- ptlib/trunk/debian/rules (original)
+++ ptlib/trunk/debian/rules Thu Apr 2 12:49:34 2009
@@ -5,10 +5,7 @@
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//')
-#URLVERSION := $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://' -e 's/-[0-9.]*(\+b[0-9])?$$//' -e 's/.dfsg[0-9]*$$//' -e 's/\./_/g')
-
FILENAME := ptlib_$(UPVERSION).orig.tar.gz
-#URL := http://www.voxgratia.org/releases/ptlib-v$(URLVERSION)-src-tar.gz
URL := http://ftp.gnome.org/pub/gnome/sources/ptlib/2.6/ptlib-$(UPVERSION).tar.gz
@@ -64,17 +61,8 @@
build-arch-stamp: config.status
$(MAKE) $(MAKEFLAGS)
- #$(MAKE) optnoshared # compile static plugins, uncomment if needed
# then we ensure that the fresh build works with hello world.
- # ...in static
- # I do not see why check in static too, so I comment out the following lines
- #$(MAKE) -C samples/hello_world/ clean
- #$(MAKE) -C samples/hello_world/ optnoshared
- #samples/hello_world/obj*/hello
- # why isn't hello checked here as below?
-
- # ...and in shared..
$(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 \
@@ -86,15 +74,11 @@
# if this won't work, we needn't even try going any further...
rm lib
- cp debian/libpt-dev.dirs debian/$(PACKAGE)-dev.dirs
- cp debian/libpt-dev.manpages debian/$(PACKAGE)-dev.manpages
-
touch build-arch-stamp
build-indep: build-indep-stamp
build-indep-stamp: config.status
$(MAKE) docs
- cp debian/libpt-doc.docs debian/$(PACKAGE)-doc.docs
touch build-indep-stamp
clean: clean-patched unpatch
@@ -136,66 +120,24 @@
dh_clean -k -a
dh_installdirs -a
- $(MAKE) DESTDIR=$(CURDIR)/debian/install install
-
- mv debian/install/usr/include debian/$(PACKAGE)-dev/usr
- mv debian/install/usr/lib/pkgconfig debian/$(PACKAGE)-dev/usr/lib
- mv debian/install/usr/lib/libpt_s.a debian/$(PACKAGE)-dev/usr/lib
- mv debian/install/usr/lib/libpt.so.*.*[.-]* debian/$(PACKAGE)/usr/lib
- mv debian/install/usr/lib/libpt.so* debian/$(PACKAGE)-dev/usr/lib
- #not necessarily because of pkg-config
- #mv debian/install/usr/bin debian/$(PACKAGE)-dev/usr
- #mv debian/install/usr/share debian/$(PACKAGE)-dev/usr/
- rm -rf debian/install/usr/bin
- rm -rf debian/install/usr/share
-
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+
+ dh_install -a
+ # see libpt-dev.install for list of files
+
+ # TODO replace by libpt2.6.1-plugins-{v4l2,v4l}.install
for i in v4l2 v4l; do \
mkdir -p debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-$(DIRNAME)/devices/videoinput ; \
- mv debian/install/usr/lib/ptlib*/devices/videoinput/$${i}_pwplugin.so \
+ mv debian/tmp/usr/lib/ptlib*/devices/videoinput/$${i}_pwplugin.so \
debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-$(DIRNAME)/devices/videoinput/ ; \
done
+
+ # TODO replace by libpt2.6.1-plugins-{alsa,oss}.install
for i in alsa oss; do \
mkdir -p debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-$(DIRNAME)/devices/sound ; \
- mv debian/install/usr/lib/ptlib*/devices/sound/$${i}_pwplugin.so \
+ mv debian/tmp/usr/lib/ptlib*/devices/sound/$${i}_pwplugin.so \
debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-$(DIRNAME)/devices/sound/ ; \
done
-
- # to check that it is empty, i.e. all the files have been moved
- rmdir debian/install/usr/lib/ptlib-$(DIRNAME)/devices/videoinput
- rmdir debian/install/usr/lib/ptlib-$(DIRNAME)/devices/sound
- rmdir debian/install/usr/lib/ptlib-$(DIRNAME)/devices
- rmdir debian/install/usr/lib/ptlib-$(DIRNAME)
- rmdir debian/install/usr/lib
- rmdir debian/install/usr
- rmdir debian/install
-
- cp debian/libpt.docs debian/$(PACKAGE).docs
-
- # modify various variables in the files
- #sed -i -e 's#$$(PTLIBDIR)/include/ptlib/unix#/usr/include/ptlib/unix#g' \
- # -e 's#$$(PTLIBDIR)/lib#/usr/lib#g' debian/$(PACKAGE)-dev/usr/share/ptlib/make/unix.mak
-
- # changing build/machine dependent data in ptlib-config
- #sed -i -e 's#^OSRELEASE=.*#OSRELEASE=\"\"#g' \
- # -e 's#^\(CCFLAGS=.*-DP_LINUX\)='$(UNAME_R)'\(.*\)\"#\1 \2 -DPHAS_TEMPLATES -I/usr/include/ptlib -I/usr/include/ptlib/unix\"#g' \
- # debian/$(PACKAGE)-dev/usr/share/ptlib/make/ptlib-config
-
-
- # erasing build host specific && unnecessary stuff off ptbuildopts.mak
- #sed -i -e 's#^PTLIBDIR.*#PTLIBDIR = /usr/share/ptlib#g' \
- # -e 's#^OSRELEASE.*#OSRELEASE =#g' \
- # -e 's#^\(STDCCFLAGS.*-DP_LINUX\)='$(UNAME_R)'\(.*\)#\1 \2#g' \
- # debian/$(PACKAGE)-dev/usr/share/ptlib/make/ptbuildopts.mak
-
- # for using /usr/share/ptlib as a single PTLIBDIR
- #ln -s ../../lib debian/$(PACKAGE)-dev/usr/share/ptlib
-
- cp version.h debian/$(PACKAGE)-dev/usr/include/ptlib
- #ln -s ../../include/ptlib/version.h debian/$(PACKAGE)-dev/usr/share/ptlib
- #mkdir debian/$(PACKAGE)-dev/usr/share/ptlib/include
- #ln -s ../../../include/ptbuildopts.h debian/$(PACKAGE)-dev/usr/share/ptlib/include
- #ln -s ../../../include/ptlib.h debian/$(PACKAGE)-dev/usr/share/ptlib/include
- #ln -s ../../../include/ptlib debian/$(PACKAGE)-dev/usr/share/ptlib/include
# Must not depend on anything. This is to be called by
# binary-arch/binary-multi
Modified: ptlib/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/watch?rev=6964&op=diff
==============================================================================
--- ptlib/trunk/debian/watch (original)
+++ ptlib/trunk/debian/watch Thu Apr 2 12:49:34 2009
@@ -1,3 +1,4 @@
version=3
-http://sf.net/opalvoip/ptlib-(\d.*)-src.tar.gz debian svn-upgrade
+http://sf.net/opalvoip/ptlib-(\d.\d.\d).tar.bz2 debian svn-upgrade
+http://ftp.gnome.org/pub/gnome/sources/ptlib/2.6/ptlib-(\d.*).tar.gz debian svn-upgrade
More information about the Pkg-voip-commits
mailing list