[Pkg-voip-commits] r6179 - in /pwlib/branches/experimental/debian: changelog control libpt-dev.dirs patches/00list patches/01_unix.mak_Os.dpatch patches/04_names.dpatch patches/06_plugins_shared.dpatch rules
dedu-guest at alioth.debian.org
dedu-guest at alioth.debian.org
Mon Sep 8 21:30:57 UTC 2008
Author: dedu-guest
Date: Mon Sep 8 21:30:57 2008
New Revision: 6179
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6179
Log:
Build from svn snapshot REV 20904, take into account the changes, make
use of make install, simplify the install target in rules file, rename
package to -beta1
Removed:
pwlib/branches/experimental/debian/patches/00list
pwlib/branches/experimental/debian/patches/01_unix.mak_Os.dpatch
pwlib/branches/experimental/debian/patches/04_names.dpatch
pwlib/branches/experimental/debian/patches/06_plugins_shared.dpatch
Modified:
pwlib/branches/experimental/debian/changelog
pwlib/branches/experimental/debian/control
pwlib/branches/experimental/debian/libpt-dev.dirs
pwlib/branches/experimental/debian/rules
Modified: pwlib/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/branches/experimental/debian/changelog?rev=6179&op=diff
==============================================================================
--- pwlib/branches/experimental/debian/changelog (original)
+++ pwlib/branches/experimental/debian/changelog Mon Sep 8 21:30:57 2008
@@ -2,9 +2,11 @@
[ Eugen Dedu ]
* First upload of svn snapshot to debian.
+ * Build from REV 20904, take into account the changes
+ * Make use of make install, simplify the install target in rules file
+ * Rename package to -beta1
[ Mark Purcell ]
- * Build from svn snapshot REV 20863
* 2.3.0 was tagged at REV 20678, thus this version 2.3.0+svn
* svn REV checkout is controlled from debian/changelog version
* Updated debian/watch to pickup next tag
Modified: pwlib/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/branches/experimental/debian/control?rev=6179&op=diff
==============================================================================
--- pwlib/branches/experimental/debian/control (original)
+++ pwlib/branches/experimental/debian/control Mon Sep 8 21:30:57 2008
@@ -5,7 +5,7 @@
Uploaders: Mark Purcell <msp at debian.org>, Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
Build-Depends: debhelper, libdc1394-13-dev, bison, flex, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, g++ (>=2.95), autotools-dev, dpatch, libasound2-dev, libavc1394-dev, libraw1394-dev, libdv-dev, libsasl2-dev, libkrb5-dev, doxygen
Build-Conflicts:
- libpt-2.3,
+ 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,
@@ -17,10 +17,10 @@
Vcs-Svn: svn://svn.debian.org/pkg-voip/pwlib-titan/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/pwlib-titan/?op=log
-Package: libpt-2.3
+Package: libpt2.3-beta1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libpt-2.3-plugins-alsa|libpt-2.3-plugins-oss, libpt-2.3-plugins-v4l2|libpt-2.3-plugins-v4l|libpt-2.3-plugins-avc|libpt-2.3-plugins-dc
+Depends: ${shlibs:Depends}, libpt2.3-beta1-plugins-alsa|libpt2.3-beta1-plugins-oss, libpt2.3-beta1-plugins-v4l2|libpt2.3-beta1-plugins-v4l|libpt2.3-beta1-plugins-avc|libpt2.3-beta1-plugins-dc
Replaces: libpt-snapshot
Conflicts: libpt-snapshot
Description: Portable Tools Library - svn snapshot
@@ -29,10 +29,10 @@
a method to produce applications to run on both Microsoft Windows and
Unix X-Window systems.
-Package: libpt-2.3-dev
+Package: libpt2.3-beta1-dev
Section: libdevel
Architecture: any
-Depends: libpt-2.3 (= ${binary:Version}), libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev
+Depends: libpt2.3-beta1 (= ${binary:Version}), libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev
Conflicts: libpt-dev, libpt-snapshot-dev
Replaces: libpt-snapshot-dev
Description: Portable Tools Library development files - svn snapshot
@@ -41,11 +41,11 @@
many years ago as a method to produce applications to run on both
Microsoft Windows and Unix X-Window systems.
-Package: libpt-2.3-dbg
+Package: libpt2.3-beta1-dbg
Section: libdevel
Priority: extra
Architecture: any
-Depends: libpt-2.3 (= ${binary:Version})
+Depends: libpt2.3-beta1 (= ${binary:Version})
Replaces: libpt-snapshot-dbg
Conflicts: libpt-snapshot-dbg
Description: Portable Tools Library development debug files - svn snapshot
@@ -56,7 +56,7 @@
version of PTLib which would yield much more detailled information as a
compromise of benefit and compile power consumption.
-Package: libpt-2.3-doc
+Package: libpt2.3-beta1-doc
Section: doc
Priority: extra
Architecture: all
@@ -66,10 +66,10 @@
many years ago as a method to produce applications to run on both
Microsoft Windows and Unix X-Window systems.
-Package: libpt-2.3-plugins-v4l
+Package: libpt2.3-beta1-plugins-v4l
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libpt-2.3 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libpt2.3-beta1 (= ${binary:Version})
Replaces: libpt-snapshot-plugins-v4l
Conflicts: libpt-snapshot-plugins-v4l
Description: Portable Tools Library video plugin for Video4Linux - svn snapshot
@@ -77,10 +77,10 @@
devices. Install this package, if you want to use a video device
that is not attached to FireWire.
-Package: libpt-2.3-plugins-v4l2
+Package: libpt2.3-beta1-plugins-v4l2
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libpt-2.3 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libpt2.3-beta1 (= ${binary:Version})
Replaces: libpt-snapshot-plugins-v4l2
Conflicts: libpt-snapshot-plugins-v4l2
Description: Portable Windows Library video plugin for Video4Linux v2 - svn snapshot
@@ -88,9 +88,9 @@
devices. Install this package, if you want to use a video device
that is not attached to FireWire.
-Package: libpt-2.3-plugins-avc
+Package: libpt2.3-beta1-plugins-avc
Architecture: any
-Depends: ${shlibs:Depends}, libpt-2.3 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libpt2.3-beta1 (= ${binary:Version})
Replaces: libpt-snapshot-plugins-avc
Conflicts: libpt-snapshot-plugins-avc
Description: PTLib video plugin for IEEE1394 (FireWire) AVC devices - svn snapshot
@@ -98,9 +98,9 @@
on FireWire. Install this package, if you want to use such a video
device.
-Package: libpt-2.3-plugins-dc
+Package: libpt2.3-beta1-plugins-dc
Architecture: any
-Depends: ${shlibs:Depends}, libpt-2.3 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libpt2.3-beta1 (= ${binary:Version})
Replaces: libpt-snapshot-plugins-dc
Conflicts: libpt-snapshot-plugins-dc
Description: PTLib video plugin for IEEE1394 (Firewire) DC Devices - svn snapshot
@@ -108,9 +108,9 @@
on Firewire. Install this package, if you want to use such a video
device.
-Package: libpt-2.3-plugins-oss
+Package: libpt2.3-beta1-plugins-oss
Architecture: any
-Depends: ${shlibs:Depends}, libpt-2.3 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libpt2.3-beta1 (= ${binary:Version})
Replaces: libpt-snapshot-plugins-oss
Conflicts: libpt-snapshot-plugins-oss
Description: PTLib audio plugin for the OSS Interface - svn snapshot
@@ -118,9 +118,9 @@
System interface. Install this package, if you are utilising this
interface.
-Package: libpt-2.3-plugins-alsa
+Package: libpt2.3-beta1-plugins-alsa
Architecture: any
-Depends: ${shlibs:Depends}, libpt-2.3 (= ${binary:Version})
+Depends: ${shlibs:Depends}, libpt2.3-beta1 (= ${binary:Version})
Replaces: libpt-snapshot-plugins-alsa
Conflicts: libpt-snapshot-plugins-alsa
Recommends: alsa-base
Modified: pwlib/branches/experimental/debian/libpt-dev.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/branches/experimental/debian/libpt-dev.dirs?rev=6179&op=diff
==============================================================================
--- pwlib/branches/experimental/debian/libpt-dev.dirs (original)
+++ pwlib/branches/experimental/debian/libpt-dev.dirs Mon Sep 8 21:30:57 2008
@@ -1,4 +1,3 @@
usr/include
usr/lib
-usr/share/ptlib/include
usr/bin
Modified: pwlib/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/branches/experimental/debian/rules?rev=6179&op=diff
==============================================================================
--- pwlib/branches/experimental/debian/rules (original)
+++ pwlib/branches/experimental/debian/rules Mon Sep 8 21:30:57 2008
@@ -20,7 +20,7 @@
endif
SHLIBSVER := $(VER_MAJOR).$(VER_MINOR)
-PACKAGE=libpt-$(SHLIBSVER)
+PACKAGE=libpt2.3-beta1
#SHLIBSVER (2.3.0) may differ from SHLIBSSUFFIX of the so (2.3-beta0)
# replace 2.3beta0 (if without '-') with 2.3-beta0
@@ -70,49 +70,33 @@
build-arch-stamp: config.status
# first build static and shared...
- # ### internal settings and variables structure:
- # make/ptlib.mak
- # -> make/unix.mak
- # (OBJ_SUFFIX = r|d) - what object suffix will we use (removed with Debian patch)
- # (OBJDIR_SUFFIX = $(OBJ_SUFFIX)) - what the target namespace for all the objects will be
- # (LIB_TYPE = _s) # for static lib (P_SHAREDLIB = 0)
- # (PW_LIBDIR = $(PWLIBDIR)/lib) - target where libpt.so.* will be built into
- ## PTLIB_BASE = pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX) --- this one is just "pt" for Debian
- ## PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
- ## PT_OBJBASE = obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
- # (if not debian-patched)
- # --> make/ptbuildopts.mak
- # -> make/common.mak
- # PTLIB_BASE=pt
- # 1. shared, with ptrace but opt: DEBUG=0 OBJDIR_SUFFIX=r optshared
- # 2. static, with ptrace but opt: DEBUG=0 OBJDIR_SUFFIX=r optnoshared
$(MAKE) PTLIBDIR=$(CURDIR) optshared
- $(MAKE) PTLIBDIR=$(CURDIR) optnoshared
+ $(MAKE) PTLIBDIR=$(CURDIR) optnoshared # static
# then we ensure that the fresh build works with hello world.
# ...in static
$(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world/ clean
- $(RM) -rf samples/hello_world/obj_*
-
+ $(RM) -rf samples/hello_world/obj*
$(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world/ optnoshared
-
- samples/hello_world/obj_*_r/hello
+ samples/hello_world/obj/hello
+ # why isn't hello checked here as below?
# ...and in shared..
$(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world/ clean
- $(RM) -rf samples/hello_world/obj_*
+ $(RM) -rf samples/hello_world/obj
$(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world/ optshared
- if (samples/hello_world/obj_*_r/hello 2>/dev/null);then \
+ if (samples/hello_world/obj/hello 2>/dev/null);then \
echo opt hello_world sample incorrectly compiled static; false ; \
else \
echo opt hello_world sample correctly compiled non-static; \
fi
- LD_LIBRARY_PATH=$(CURDIR)/lib samples/hello_world/obj_*_r/hello
+ ln -s lib* lib ; LD_LIBRARY_PATH=$(CURDIR)/lib samples/hello_world/obj/hello ; rm lib
# if this won't work, we needn't even try going any further...
# cleanup to make sure we don't install any of the samples we just compiled
$(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world/ clean
- $(RM) -rf samples/hello_world/obj_*
+ $(RM) -rf samples/hello_world/obj
+
cp debian/libpt-dev.dirs debian/$(PACKAGE)-dev.dirs
cp debian/libpt-dev.manpages debian/$(PACKAGE)-dev.manpages
@@ -132,7 +116,7 @@
$(MAKE) PTLIBDIR=$(CURDIR) clean || true ; \
$(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world/ clean||true ; \
fi
- rm -rf samples/hello_world/obj_*
+ rm -rf samples/hello_world/obj
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
@@ -164,87 +148,62 @@
dh_clean -k -a
dh_installdirs -a
- install -d -m 755 $(CURDIR)/debian/$(PACKAGE)/usr/lib
- install -m 755 lib/libpt.so.*.*[.-]* $(CURDIR)/debian/$(PACKAGE)/usr/lib
+ $(MAKE) DESTDIR=$(CURDIR)/debian/install install
+
+ mv debian/install/usr/include debian/$(PACKAGE)-dev/usr
+ mv debian/install/usr/bin 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
+ mv debian/install/usr/share debian/$(PACKAGE)-dev/usr/
+
+ for i in v4l2 v4l avc dc; do \
+ mkdir -p debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-2.3.1/devices/videoinput ; \
+ mv debian/install/usr/lib/ptlib*/devices/videoinput/$${i}_pwplugin.so \
+ debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib*/devices/videoinput/ ; \
+ done
+ for i in alsa oss; do \
+ mkdir -p debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-2.3.1/devices/sound ; \
+ mv debian/install/usr/lib/ptlib*/devices/sound/$${i}_pwplugin.so \
+ debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib*/devices/sound/ ; \
+ done
+
+ # to check that it is empty, i.e. all the files have been moved
+ rmdir debian/install/usr/lib/ptlib*/devices/videoinput
+ rmdir debian/install/usr/lib/ptlib*/devices/sound
+ rmdir debian/install/usr/lib/ptlib*/devices
+ rmdir debian/install/usr/lib/ptlib*
+ rmdir debian/install/usr/lib
+ rmdir debian/install/usr
+ rmdir debian/install
+
cp debian/libpt.docs debian/$(PACKAGE).docs
-# $(PACKAGE)-dev
- install -d -m 755 $(CURDIR)/debian/$(PACKAGE)-dev/usr/lib/pkgconfig
- cp -v ptlib.pc debian/$(PACKAGE)-dev/usr/lib/pkgconfig
- ln -s libpt.so.$(SHLIBSSUFFIX) debian/$(PACKAGE)-dev/usr/lib/libpt.so
- ln -s libpt.so.$(SHLIBSSUFFIX) debian/$(PACKAGE)-dev/usr/lib/libpt.so.$(VER_MAJOR).$(VER_MINOR)
- ln -s libpt.so.$(SHLIBSSUFFIX) debian/$(PACKAGE)-dev/usr/lib/libpt.so.$(VER_MAJOR)
-
- cp -vr include/pt* debian/$(PACKAGE)-dev/usr/include
- #-find debian/$(PACKAGE)-dev/usr/include -name .svn -exec rm -rf {} \;
- #remove 2 empty directories
- rmdir debian/$(PACKAGE)-dev/usr/include/ptlib/macos/ptlib
- rmdir debian/$(PACKAGE)-dev/usr/include/ptlib/macos
- cp -vr make `pwd`/debian/$(PACKAGE)-dev/usr/share/ptlib
- #-find debian/$(PACKAGE)-dev/usr/share/ptlib -name .svn -exec rm -rf {} \;
+ # 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
- # copy static opt version to $(PACKAGE)-dev
- install -m 755 lib/libpt_s.a debian/$(PACKAGE)-dev/usr/lib/
- find debian/$(PACKAGE)-dev/usr/include -type f -exec chmod 644 {} \;
- # ptlib-config in $(PACKAGE)-dev
+
# changing build/machine dependent data in ptlib-config
- -rm -f `find debian/$(PACKAGE)-dev/ -name ptlib-config`
- sed -e 's#^OSRELEASE=.*#OSRELEASE=\"\"#g' \
- -e 's#^LIBDIR=.*#LIBDIR=\"/usr/lib\"#g' \
+ 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' \
- -e 's#^\(LIBS=.*\)\"#\1 -lpt\"#g' \
- make/ptlib-config > debian/$(PACKAGE)-dev/usr/bin/ptlib-config
- chmod 0755 debian/$(PACKAGE)-dev/usr/bin/ptlib-config
- ln -s ../../../bin/ptlib-config debian/$(PACKAGE)-dev/usr/share/ptlib/make/
+ debian/$(PACKAGE)-dev/usr/share/ptlib/make/ptlib-config
+
# erasing build host specific && unnecessary stuff off ptbuildopts.mak
- -rm -f `find debian/$(PACKAGE)-dev/ -name ptbuildopts.mak`
- sed -e 's#^PTLIBDIR.*#PTLIBDIR = /usr/share/ptlib#g' \
+ 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' \
- make/ptbuildopts.mak > debian/$(PACKAGE)-dev/usr/share/ptlib/make/ptbuildopts.mak
+ 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
- # should not be part of a distribution package:
- -rm -f `find debian/$(PACKAGE)-dev/ -name "*.in"`
-
-# plugins
-
- #$(PACKAGE)-plugins-v4l
- install -d -m 755 debian/$(PACKAGE)-plugins-v4l/usr/lib/ptlib/$(SHLIBSVER)/device/videoinput/
- cp lib/device/videoinput/v4l_pwplugin.so \
- debian/$(PACKAGE)-plugins-v4l/usr/lib/ptlib/$(SHLIBSVER)/device/videoinput/
-
- #$(PACKAGE)-plugins-v4l2
- install -d -m 755 debian/$(PACKAGE)-plugins-v4l2/usr/lib/ptlib/$(SHLIBSVER)/device/videoinput/
- cp lib/device/videoinput/v4l2_pwplugin.so \
- debian/$(PACKAGE)-plugins-v4l2/usr/lib/ptlib/$(SHLIBSVER)/device/videoinput/
-
- #$(PACKAGE)-plugins-avc
- install -d -m 755 debian/$(PACKAGE)-plugins-avc/usr/lib/ptlib/$(SHLIBSVER)/device/videoinput/
- cp lib/device/videoinput/avc_pwplugin.so \
- debian/$(PACKAGE)-plugins-avc/usr/lib/ptlib/$(SHLIBSVER)/device/videoinput/
-
- #$(PACKAGE)-plugins-dc
- install -d -m 755 debian/$(PACKAGE)-plugins-dc/usr/lib/ptlib/$(SHLIBSVER)/device/videoinput/
- cp lib/device/videoinput/dc_pwplugin.so \
- debian/$(PACKAGE)-plugins-dc/usr/lib/ptlib/$(SHLIBSVER)/device/videoinput/
-
- #$(PACKAGE)-plugins-oss
- install -d -m 755 debian/$(PACKAGE)-plugins-oss/usr/lib/ptlib/$(SHLIBSVER)/device/sound/
- cp lib/device/sound/oss_pwplugin.so \
- debian/$(PACKAGE)-plugins-oss/usr/lib/ptlib/$(SHLIBSVER)/device/sound/
-
- #$(PACKAGE)-plugins-alsa
- install -d -m 755 debian/$(PACKAGE)-plugins-alsa/usr/lib/ptlib/$(SHLIBSVER)/device/sound/
- cp lib/device/sound/alsa_pwplugin.so \
- debian/$(PACKAGE)-plugins-alsa/usr/lib/ptlib/$(SHLIBSVER)/device/sound/
# Must not depend on anything. This is to be called by
# binary-arch/binary-multi
More information about the Pkg-voip-commits
mailing list