[Pkg-voip-commits] r6219 - in /pwlib/branches/experimental/debian: README.Debian changelog control libpt-dev.dirs libpt-dev.manpages rules
dedu-guest at alioth.debian.org
dedu-guest at alioth.debian.org
Fri Sep 26 13:21:26 UTC 2008
Author: dedu-guest
Date: Fri Sep 26 13:21:26 2008
New Revision: 6219
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6219
Log:
New stable version 2.4.1, with update of debian files
Modified:
pwlib/branches/experimental/debian/README.Debian
pwlib/branches/experimental/debian/changelog
pwlib/branches/experimental/debian/control
pwlib/branches/experimental/debian/libpt-dev.dirs
pwlib/branches/experimental/debian/libpt-dev.manpages
pwlib/branches/experimental/debian/rules
Modified: pwlib/branches/experimental/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/branches/experimental/debian/README.Debian?rev=6219&op=diff
==============================================================================
--- pwlib/branches/experimental/debian/README.Debian (original)
+++ pwlib/branches/experimental/debian/README.Debian Fri Sep 26 13:21:26 2008
@@ -1,53 +1,15 @@
- ptlib/pwlib on Debian
-------------------------
+ptlib on Debian
+===============
- Some changes of installation paths of the original libpt package had
- to be made to comply with the Filesystem Hierarchy Standard under
- UNIX-like operating systems:
-
- - The libraries were installed under /usr/lib, the header files under
- /usr/include, /usr/include/ptlib and /usr/include/ptclib.
- - The ptlib-config script was installed under /usr/bin.
- - Documentation of the main package libpt resides in
- /usr/share/doc/libpt-$(VERSION), the one in package libpt-doc installs
- to /usr/share/doc/libpt-$(VERSION)-doc.
+ptlib-config is not distributed, as pkg-config is now used.
+There's no support for firewire, yet, because as of this release it
+isn't possible to build in support of both A/V AND digital camera on
+firewire.
- The shared libraries are named
- libpt.so.$(SOVERSION)
- for simplicity, in contrast to the upstream versions
- libpt_$(OS)_$(Arch).so.$(SOVERSION)
- .
+The changelog was grabbed with "svn log".
- Another point was to get a single directory to contain all
- subdirectories necessary to build other libraries and applications of
- the openh323 project that rely on ptlib (as the ptlib is part of the
- openh323 project efforts).
-
- These packages assume that the source tree of ptlib is still there
- and be pointed to by the PTLIBDIR environment variable.
- Now, to facilitate that, the structure of the source tree
- was mimicked in /usr/share/ptlib mainly through
- linking.
-
- You merely have to export PTLIB=/usr/share/ptlib before building mentioned
- packages. Therein the makefile include files which are central to
- the building process of both ptlib and openh323 can be found.
-
- Furthermore, the ptlib-config script had to be modified to reflect the
- aforementioned changes. The contents of OSRELEASE (=`uname -r`)
- and the value of the -DP_LINUX (=$OSRELEASE) in CCFLAGS were deleted,
- because its purpose was not clear within a packaged version.
-
- The LIBS var now contains a
- -lpt
- , which it lacked in upstream source for some unknown reason.
+For any help or comments, please contact Debian VoIP Team at
+<pgk-voip-maintainers at lists.alioth.debian.org>
- There's no support for firewire, yet, because as of this release it
- isn't possible to build in support of both A/V AND digital camera on
- firewire.
-
- The changelog was grabbed with "svn log".
-
- For any help or comments, please contact Debian VoIP Team at
- <pgk-voip-maintainers at lists.alioth.debian.org>
+ -- Eugen Dedu <dedu at pu-pm.univ-fcomte.fr>, Fri, 26 Sep 2008 15:06:11 +0200
Modified: pwlib/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/branches/experimental/debian/changelog?rev=6219&op=diff
==============================================================================
--- pwlib/branches/experimental/debian/changelog (original)
+++ pwlib/branches/experimental/debian/changelog Fri Sep 26 13:21:26 2008
@@ -1,6 +1,8 @@
-ptlib (2.3.0+svn20940-2) UNRELEASED; urgency=low
+ptlib (2.4.1-1) UNRELEASED; urgency=low
+ [ Eugen Dedu ]
* NOT RELEASED YET
+ * New stable version 2.4.1, with update of debian files
-- Mark Purcell <msp at debian.org> Sun, 14 Sep 2008 19:21:11 +1000
Modified: pwlib/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/branches/experimental/debian/control?rev=6219&op=diff
==============================================================================
--- pwlib/branches/experimental/debian/control (original)
+++ pwlib/branches/experimental/debian/control Fri Sep 26 13:21:26 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, dpatch, libdc1394-13-dev, bison, flex, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, g++ (>=2.95), autotools-dev, libasound2-dev, libavc1394-dev, libraw1394-dev, libdv4-dev, libsasl2-dev, libkrb5-dev, doxygen
Build-Conflicts:
- libpt2.3-beta1,
+ 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,
@@ -17,37 +17,38 @@
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: libpt2.3-beta1
+Package: libpt2.4.1
Section: libs
Architecture: any
-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
+Depends: ${shlibs:Depends}
+Suggests: libpt2.4.1-plugins-alsa|libpt2.4.1-plugins-oss, libpt2.4.1-plugins-v4l2|libpt2.4.1-plugins-v4l|libpt2.4.1-plugins-avc|libpt2.4.1-plugins-dc
+Replaces: libpt-snapshot, libpt2.3-beta1
+Conflicts: libpt-snapshot, libpt2.3-beta1
Description: Portable Tools Library - svn snapshot
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.
-Package: libpt2.3-beta1-dev
+Package: libpt2.4.1-dev
Section: libdevel
Architecture: any
-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
+Depends: libpt2.4.1 (= ${binary:Version}), libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev
+Conflicts: libpt-dev, libpt-snapshot-dev, libpt2.3-beta1-dev
+Replaces: libpt-snapshot-dev, libpt2.3-beta1-dev
Description: Portable Tools Library development files - svn snapshot
This package contains the headers and a static 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.
-Package: libpt2.3-beta1-dbg
+Package: libpt2.4.1-dbg
Section: libdevel
Priority: extra
Architecture: any
-Depends: libpt2.3-beta1 (= ${binary:Version})
-Replaces: libpt-snapshot-dbg
-Conflicts: libpt-snapshot-dbg
+Depends: libpt2.4.1 (= ${binary:Version})
+Replaces: libpt-snapshot-dbg, libpt2.3-beta1-dbg
+Conflicts: libpt-snapshot-dbg, libpt2.3-beta1-dbg
Description: Portable Tools Library development debug files - svn snapshot
This package contains the shared and static debug symbols of the library
PTLib, which is a moderately large class library that has its genesis
@@ -56,7 +57,7 @@
version of PTLib which would yield much more detailled information as a
compromise of benefit and compile power consumption.
-Package: libpt2.3-beta1-doc
+Package: libpt2.4.1-doc
Section: doc
Priority: extra
Architecture: all
@@ -66,66 +67,65 @@
many years ago as a method to produce applications to run on both
Microsoft Windows and Unix X-Window systems.
-Package: libpt2.3-beta1-plugins-v4l
+Package: libpt2.4.1-plugins-v4l2
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libpt2.3-beta1 (= ${binary:Version})
-Replaces: libpt-snapshot-plugins-v4l
-Conflicts: libpt-snapshot-plugins-v4l
+Depends: ${shlibs:Depends}, libpt2.4.1 (= ${binary:Version})
+Replaces: libpt-snapshot-plugins-v4l2, libpt2.3-beta1-plugins-v4l2
+Conflicts: libpt-snapshot-plugins-v4l2, libpt2.3-beta1-plugins-v4l2
+Description: Portable Tools Library video plugin for Video4Linux v2 - svn snapshot
+ This package contains the PTLib plugin for usage with Video4Linux v2
+ devices. Install this package, if you want to use a video device
+ that is not attached to FireWire.
+
+Package: libpt2.4.1-plugins-v4l
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libpt2.4.1 (= ${binary:Version})
+Replaces: libpt-snapshot-plugins-v4l, libpt2.3-beta1-plugins-v4l
+Conflicts: libpt-snapshot-plugins-v4l, libpt2.3-beta1-plugins-v4l
Description: Portable Tools Library video plugin for Video4Linux - svn snapshot
This package contains the PTLib plugin for usage with Video4Linux
devices. Install this package, if you want to use a video device
that is not attached to FireWire.
-Package: libpt2.3-beta1-plugins-v4l2
-Section: libs
+Package: libpt2.4.1-plugins-avc
Architecture: any
-Depends: ${shlibs:Depends}, libpt2.3-beta1 (= ${binary:Version})
-Replaces: libpt-snapshot-plugins-v4l2
-Conflicts: libpt-snapshot-plugins-v4l2
-Description: Portable Tools Library video plugin for Video4Linux v2 - svn snapshot
- This package contains the PTLib plugin for usage with Video4Linux v2
- devices. Install this package, if you want to use a video device
- that is not attached to FireWire.
-
-Package: libpt2.3-beta1-plugins-avc
-Architecture: any
-Depends: ${shlibs:Depends}, libpt2.3-beta1 (= ${binary:Version})
-Replaces: libpt-snapshot-plugins-avc
-Conflicts: libpt-snapshot-plugins-avc
+Depends: ${shlibs:Depends}, libpt2.4.1 (= ${binary:Version})
+Replaces: libpt-snapshot-plugins-avc, libpt2.3-beta1-plugins-avc
+Conflicts: libpt-snapshot-plugins-avc, libpt2.3-beta1-plugins-avc
Description: PTLib video plugin for IEEE1394 (FireWire) AVC devices - svn snapshot
This package contains the PTLib plugin for usage with AVC devices
on FireWire. Install this package, if you want to use such a video
device.
-Package: libpt2.3-beta1-plugins-dc
+Package: libpt2.4.1-plugins-dc
Architecture: any
-Depends: ${shlibs:Depends}, libpt2.3-beta1 (= ${binary:Version})
-Replaces: libpt-snapshot-plugins-dc
-Conflicts: libpt-snapshot-plugins-dc
+Depends: ${shlibs:Depends}, libpt2.4.1 (= ${binary:Version})
+Replaces: libpt-snapshot-plugins-dc, libpt2.3-beta1-plugins-dc
+Conflicts: libpt-snapshot-plugins-dc, libpt2.3-beta1-plugins-dc
Description: PTLib video plugin for IEEE1394 (Firewire) DC Devices - svn snapshot
This package contains the PTLib plugin for usage with DC Devices
on Firewire. Install this package, if you want to use such a video
device.
-Package: libpt2.3-beta1-plugins-oss
+Package: libpt2.4.1-plugins-alsa
Architecture: any
-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
- This package contains the PTLib plugin for usage with the Open Sound
- System interface. Install this package, if you are utilising this
- interface.
-
-Package: libpt2.3-beta1-plugins-alsa
-Architecture: any
-Depends: ${shlibs:Depends}, libpt2.3-beta1 (= ${binary:Version})
-Replaces: libpt-snapshot-plugins-alsa
-Conflicts: libpt-snapshot-plugins-alsa
+Depends: ${shlibs:Depends}, libpt2.4.1 (= ${binary:Version})
+Replaces: libpt-snapshot-plugins-alsa, libpt2.3-beta1-plugins-alsa
+Conflicts: libpt-snapshot-plugins-alsa, libpt2.3-beta1-plugins-alsa
Recommends: alsa-base
Description: PTLib audio plugin for the ALSA Interface - svn snapshot
This package contains the PTLib plugin for usage with the Advanced
Linux Sound Architecture interface. Install this package, if you
are utilising this interface.
+Package: libpt2.4.1-plugins-oss
+Architecture: any
+Depends: ${shlibs:Depends}, libpt2.4.1 (= ${binary:Version})
+Replaces: libpt-snapshot-plugins-oss, libpt2.3-beta1-plugins-oss
+Conflicts: libpt-snapshot-plugins-oss, libpt2.3-beta1-plugins-oss
+Description: PTLib audio plugin for the OSS Interface - svn snapshot
+ This package contains the PTLib plugin for usage with the Open Sound
+ System interface. Install this package, if you are utilising this
+ interface.
Modified: pwlib/branches/experimental/debian/libpt-dev.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/branches/experimental/debian/libpt-dev.dirs?rev=6219&op=diff
==============================================================================
--- pwlib/branches/experimental/debian/libpt-dev.dirs (original)
+++ pwlib/branches/experimental/debian/libpt-dev.dirs Fri Sep 26 13:21:26 2008
@@ -1,3 +1,2 @@
usr/include
usr/lib
-usr/bin
Modified: pwlib/branches/experimental/debian/libpt-dev.manpages
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/branches/experimental/debian/libpt-dev.manpages?rev=6219&op=diff
==============================================================================
--- pwlib/branches/experimental/debian/libpt-dev.manpages (original)
+++ pwlib/branches/experimental/debian/libpt-dev.manpages Fri Sep 26 13:21:26 2008
@@ -1,1 +1,1 @@
-debian/ptlib-config.1
+#debian/ptlib-config.1
Modified: pwlib/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/branches/experimental/debian/rules?rev=6219&op=diff
==============================================================================
--- pwlib/branches/experimental/debian/rules (original)
+++ pwlib/branches/experimental/debian/rules Fri Sep 26 13:21:26 2008
@@ -7,24 +7,27 @@
#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
+FILENAME := ptlib_$(UPVERSION).orig.tar.gz
#URL := http://www.voxgratia.org/releases/ptlib-v$(URLVERSION)-src-tar.gz
-
-
-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)
+URL := http://ftp.gnome.org/pub/gnome/sources/ptlib/2.4/ptlib-$(UPVERSION).tar.gz
+
+
+#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
-
-SHLIBSVER := $(VER_MAJOR).$(VER_MINOR)
-PACKAGE=libpt2.3-beta1
+#endif
+
+#DIRNAME := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
+#SHLIBSVER := $(VER_MAJOR).$(VER_MINOR)
+DIRNAME := 2.4.1
+PACKAGE=libpt$(DIRNAME)
#SHLIBSVER (2.3.0) may differ from SHLIBSSUFFIX of the so (2.3-beta0)
# replace 2.3beta0 (if without '-') with 2.3-beta0
-SHLIBSSUFFIX := $(shell make -f make/common.mak print-version | sed -e 's/-*beta/-beta/')
-
-CFLAGS := -g -O2
+#SHLIBSSUFFIX := $(shell make -f make/common.mak print-version | sed -e 's/-*beta/-beta/')
+
+CFLAGS := -Wall -g -O2
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -55,7 +58,7 @@
build-arch: config.status build-arch-stamp
config.status: patch-stamp autotools configure
- ./configure $(confflags) --enable-oss --prefix=/usr --disable-sunaudio
+ ./configure $(confflags) --prefix=/usr --enable-oss --enable-v4l --disable-sunaudio
autotools:
rm -f config.sub config.guess
@@ -67,33 +70,28 @@
touch autotools
build-arch-stamp: config.status
- # first build static and shared...
-
- $(MAKE) PTLIBDIR=$(CURDIR) optshared
- $(MAKE) PTLIBDIR=$(CURDIR) optnoshared # static
+ $(MAKE)
+ #$(MAKE) optnoshared # compile static plugins, uncomment if needed
# 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*
- $(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world/ optnoshared
- samples/hello_world/obj/hello
+ # 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
- $(RM) -rf samples/hello_world/obj
- $(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world/ optshared
- if (samples/hello_world/obj/hello 2>/dev/null);then \
+ $(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 ; \
else \
echo opt hello_world sample correctly compiled non-static; \
fi
- ln -s lib* lib ; LD_LIBRARY_PATH=$(CURDIR)/lib samples/hello_world/obj/hello ; rm lib
+ 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...
- # 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 lib
cp debian/libpt-dev.dirs debian/$(PACKAGE)-dev.dirs
cp debian/libpt-dev.manpages debian/$(PACKAGE)-dev.manpages
@@ -111,10 +109,9 @@
$(checkdir)
rm -f build-arch-stamp build-indep-stamp patch-stamp
if [ -f Makefile ];then \
- $(MAKE) PTLIBDIR=$(CURDIR) clean || true ; \
- $(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world/ clean||true ; \
+ $(MAKE) clean || true ; \
+ $(MAKE) PTLIBDIR=$(CURDIR) -C samples/hello_world clean||true ; \
fi
- 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
@@ -149,29 +146,32 @@
$(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/
+ #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
for i in v4l2 v4l avc dc; do \
- mkdir -p debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-2.3.1/devices/videoinput ; \
+ mkdir -p debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-$(DIRNAME)/devices/videoinput ; \
mv debian/install/usr/lib/ptlib*/devices/videoinput/$${i}_pwplugin.so \
- debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib*/devices/videoinput/ ; \
+ debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-$(DIRNAME)/devices/videoinput/ ; \
done
for i in alsa oss; do \
- mkdir -p debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-2.3.1/devices/sound ; \
+ mkdir -p debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-$(DIRNAME)/devices/sound ; \
mv debian/install/usr/lib/ptlib*/devices/sound/$${i}_pwplugin.so \
- debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib*/devices/sound/ ; \
+ 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*/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/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
@@ -179,29 +179,29 @@
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
+ #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
+ #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
+ #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
+ #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
+ #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
@@ -211,9 +211,8 @@
dh_testroot
#$(PACKAGE) has docs in /usr/share/doc, all the others use links
dh_installdocs -N$(PACKAGE)-plugins-alsa -N$(PACKAGE)-plugins-avc -N$(PACKAGE)-plugins-dc -N$(PACKAGE)-plugins-oss -N$(PACKAGE)-plugins-v4l -N$(PACKAGE)-plugins-v4l2 -N$(PACKAGE)-dev -N$(PACKAGE)-dbg
- #-test "x$(DH_OPTIONS)" = "x-a" && find debian/$(PACKAGE)-doc/usr/share/doc/$(PACKAGE)-doc -name .svn -exec rm -rf {} \;
dh_installman
- dh_installchangelogs -N$(PACKAGE)-plugins-alsa -N$(PACKAGE)-plugins-avc -N$(PACKAGE)-plugins-dc -N$(PACKAGE)-plugins-oss -N$(PACKAGE)-plugins-v4l -N$(PACKAGE)-plugins-v4l2 -N$(PACKAGE)-dev -N$(PACKAGE)-dbg changelog
+ dh_installchangelogs -N$(PACKAGE)-plugins-alsa -N$(PACKAGE)-plugins-avc -N$(PACKAGE)-plugins-dc -N$(PACKAGE)-plugins-oss -N$(PACKAGE)-plugins-v4l -N$(PACKAGE)-plugins-v4l2 -N$(PACKAGE)-dev -N$(PACKAGE)-dbg
-test "x$(DH_OPTIONS)" = "x-a" && for pkg in plugins-alsa plugins-avc plugins-dc plugins-oss plugins-v4l plugins-v4l2 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
@@ -265,16 +264,16 @@
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
@@#this is for stable versions
- @@#echo Downloading $(FILENAME) from $(URL) for repacking ...
- @@#wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+ @@echo Downloading $(FILENAME) from $(URL) for repacking ...
+ @@wget -N -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 '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
More information about the Pkg-voip-commits
mailing list