[Pkg-voip-commits] r3609 - pwlib/trunk/debian
kilian at alioth.debian.org
kilian at alioth.debian.org
Sat May 26 08:26:24 UTC 2007
Author: kilian
Date: 2007-05-26 08:26:24 +0000 (Sat, 26 May 2007)
New Revision: 3609
Removed:
pwlib/trunk/debian/libpt-plugins-alsa.dirs
pwlib/trunk/debian/libpt-plugins-avc.dirs
pwlib/trunk/debian/libpt-plugins-dc.dirs
pwlib/trunk/debian/libpt-plugins-oss.dirs
pwlib/trunk/debian/libpt-plugins-v4l.dirs
pwlib/trunk/debian/libpt-plugins-v4l2.dirs
Modified:
pwlib/trunk/debian/changelog
pwlib/trunk/debian/control
pwlib/trunk/debian/rules
Log:
Include Debug symbols for -ptrace and -develop in main package.
Cleanup rules a bit. Dirs to install plugins to are created from rules, no need
for *.dirs any more.
Modified: pwlib/trunk/debian/changelog
===================================================================
--- pwlib/trunk/debian/changelog 2007-05-26 08:24:12 UTC (rev 3608)
+++ pwlib/trunk/debian/changelog 2007-05-26 08:26:24 UTC (rev 3609)
@@ -1,18 +1,21 @@
pwlib (1.10.7~dfsg~pre1-1) UNRELEASED; urgency=low
+ * NOT RELEASED YET
* New upstream version.
* Update debian/rules to build also ptrace-enabled opt version and
ptrace-enabled debug version (with extra PTRACE code) as was often
requested by Ekiga developers.
- * Add extra debug packages for new packages.
+ * Ship external debug symbols directly in new ptrace and develop package.
* Add symlinks for linking only in libpt-dev rather than each libpt package.
Backward compatibility links are still added to allow clean upgrade paths
without rebuild when build-version has been bumped. Upstream reckons the
API with stable OpenH323 releases (pwlib, opal, openh323) is supposed to
- remain identical for all upsates with the same minor version number.
+ remain identical for all upsates with the same minor version number.
(Closes: #424050)
+ * Depend on at least one plugin for audio and video for libpt-1.10.0. The
+ -develop and -ptrace have their plugins included. No need to depend here.
- -- Kilian Krause <kilian at debian.org> Sun, 20 May 2007 16:59:21 +0200
+ -- Kilian Krause <kilian at debian.org> Sat, 26 May 2007 10:12:12 +0200
pwlib (1.10.2-2) unstable; urgency=high
Modified: pwlib/trunk/debian/control
===================================================================
--- pwlib/trunk/debian/control 2007-05-26 08:24:12 UTC (rev 3608)
+++ pwlib/trunk/debian/control 2007-05-26 08:26:24 UTC (rev 3609)
@@ -13,7 +13,7 @@
Package: libpt-1.10.0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libpt-plugins-alsa|libpt-plugins-oss, libpt-plugins-v4l|libpt-plugins-v4l2|libpt-plugins-avc|libpt-plugins-dc
Replaces: libpt-1.8.7, libpt-1.8.3c2, libpt-1.8.3c2a
Conflicts: libpt-1.10.0-ptrace, libpt-1.10.0-develop
Description: Portable Windows Library
@@ -40,7 +40,7 @@
suitable for development environments that do need more information on what
happens internally.
.
- The package also contains all plugins.
+ The package also contains all plugins and debug symbols.
.
For more information on PWLib visit the development homepage
http://www.voxgratia.org/
@@ -59,9 +59,9 @@
This version was compiled with just all ptrace and debug code and is therefore
suitable for development purposes. It should not be used in production
environments due to a very large overhead that will not scale well with a
- large number of calls.
+ large number of calls.
.
- The package also contains all plugins.
+ The package also contains all plugins and debug symbols.
.
For more information on PWLib visit the development homepage
http://www.voxgratia.org/
@@ -96,44 +96,6 @@
For more information on PWLib visit the development homepage
http://www.voxgratia.org/
-Package: libpt-dbg-ptrace
-Section: libdevel
-Priority: extra
-Architecture: any
-Depends: libpt-1.10.0-ptrace (= ${Source-Version})
-Conflicts: libpt-dbg, libpt-dbg-develop
-Description: Portable Windows Library development debug files - ptrace version
- This package contains the shared and static debug symbols of the library
- PWLib, 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 is not the debug compiled
- version of PWLib which would yield much more detailled information as a
- compromise of benefit and compile power consumption.
- .
- The debug symbols come from libpt-1.10.0-ptrace rather than from libpt-1.10.0.
- .
- For more information on PWLib visit the development homepage
- http://www.voxgratia.org/
-
-Package: libpt-dbg-develop
-Section: libdevel
-Priority: extra
-Architecture: any
-Depends: libpt-1.10.0-develop (= ${Source-Version})
-Conflicts: libpt-dbg, libpt-dbg-ptrace
-Description: Portable Windows Library development debug files - debug version
- This package contains the shared and static debug symbols of the library
- PWLib, 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 is not the debug compiled
- version of PWLib which would yield much more detailled information as a
- compromise of benefit and compile power consumption.
- .
- The debug symbols come from libpt-1.10.0-develop rather than from libpt-1.10.0.
- .
- For more information on PWLib visit the development homepage
- http://www.voxgratia.org/
-
Package: libpt-doc
Section: doc
Priority: extra
@@ -150,7 +112,7 @@
Package: libpt-plugins-v4l
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})|libpt-1.10.0-ptrace (= ${Source-Version})|libpt-1.10.0-develop (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})
Description: Portable Windows Library Video Plugin for Video4Linux
This package contains the PWLib plugin for usage with Video4Linux
devices. Install this package, if you want to use a video device
@@ -159,7 +121,7 @@
Package: libpt-plugins-v4l2
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})|libpt-1.10.0-ptrace (= ${Source-Version})|libpt-1.10.0-develop (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})
Description: Portable Windows Library Video Plugin for Video4Linux v2
This package contains the PWLib plugin for usage with Video4Linux v2
devices. Install this package, if you want to use a video device
@@ -168,7 +130,7 @@
Package: libpt-plugins-avc
Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})|libpt-1.10.0-ptrace (= ${Source-Version})|libpt-1.10.0-develop (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})
Description: PWLib Video Plugin for IEEE1394 (FireWire) AVC devices
This package contains the PWLib plugin for usage with AVC devices
on FireWire. Install this package, if you want to use such a video
@@ -176,7 +138,7 @@
Package: libpt-plugins-dc
Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})|libpt-1.10.0-ptrace (= ${Source-Version})|libpt-1.10.0-develop (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})
Description: PWLib Video Plugin for IEEE1394 (Firewire) DC Devices
This package contains the PWLib plugin for usage with DC Devices
on Firewire. Install this package, if you want to use such a video
@@ -184,7 +146,7 @@
Package: libpt-plugins-oss
Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})|libpt-1.10.0-ptrace (= ${Source-Version})|libpt-1.10.0-develop (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})
Description: Portable Windows Library Audio Plugins for the OSS Interface
This package contains the PWLib plugin for usage with the Open Sound
System interface. Install this package, if you are utilising this
@@ -192,7 +154,7 @@
Package: libpt-plugins-alsa
Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})|libpt-1.10.0-ptrace (= ${Source-Version})|libpt-1.10.0-develop (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})
Recommends: alsa-base
Description: Portable Windows Library Audio Plugin for the ALSA Interface
This package contains the PWLib plugin for usage with the Advanced
Deleted: pwlib/trunk/debian/libpt-plugins-alsa.dirs
===================================================================
--- pwlib/trunk/debian/libpt-plugins-alsa.dirs 2007-05-26 08:24:12 UTC (rev 3608)
+++ pwlib/trunk/debian/libpt-plugins-alsa.dirs 2007-05-26 08:26:24 UTC (rev 3609)
@@ -1 +0,0 @@
-usr/lib/pwlib/device/sound/
Deleted: pwlib/trunk/debian/libpt-plugins-avc.dirs
===================================================================
--- pwlib/trunk/debian/libpt-plugins-avc.dirs 2007-05-26 08:24:12 UTC (rev 3608)
+++ pwlib/trunk/debian/libpt-plugins-avc.dirs 2007-05-26 08:26:24 UTC (rev 3609)
@@ -1 +0,0 @@
-usr/lib/pwlib/device/videoinput/
Deleted: pwlib/trunk/debian/libpt-plugins-dc.dirs
===================================================================
--- pwlib/trunk/debian/libpt-plugins-dc.dirs 2007-05-26 08:24:12 UTC (rev 3608)
+++ pwlib/trunk/debian/libpt-plugins-dc.dirs 2007-05-26 08:26:24 UTC (rev 3609)
@@ -1 +0,0 @@
-usr/lib/pwlib/device/videoinput/
Deleted: pwlib/trunk/debian/libpt-plugins-oss.dirs
===================================================================
--- pwlib/trunk/debian/libpt-plugins-oss.dirs 2007-05-26 08:24:12 UTC (rev 3608)
+++ pwlib/trunk/debian/libpt-plugins-oss.dirs 2007-05-26 08:26:24 UTC (rev 3609)
@@ -1 +0,0 @@
-usr/lib/pwlib/device/sound/
Deleted: pwlib/trunk/debian/libpt-plugins-v4l.dirs
===================================================================
--- pwlib/trunk/debian/libpt-plugins-v4l.dirs 2007-05-26 08:24:12 UTC (rev 3608)
+++ pwlib/trunk/debian/libpt-plugins-v4l.dirs 2007-05-26 08:26:24 UTC (rev 3609)
@@ -1 +0,0 @@
-usr/lib/pwlib/device/videoinput/
Deleted: pwlib/trunk/debian/libpt-plugins-v4l2.dirs
===================================================================
--- pwlib/trunk/debian/libpt-plugins-v4l2.dirs 2007-05-26 08:24:12 UTC (rev 3608)
+++ pwlib/trunk/debian/libpt-plugins-v4l2.dirs 2007-05-26 08:26:24 UTC (rev 3609)
@@ -1 +0,0 @@
-usr/lib/pwlib/device/videoinput/
Modified: pwlib/trunk/debian/rules
===================================================================
--- pwlib/trunk/debian/rules 2007-05-26 08:24:12 UTC (rev 3608)
+++ pwlib/trunk/debian/rules 2007-05-26 08:26:24 UTC (rev 3609)
@@ -29,7 +29,6 @@
CFLAGS += -O0
endif
-export CFLAGS
# used for sed-ating out host specific data
export UNAME_R=`uname -r`
@@ -66,7 +65,7 @@
build-arch: config.status build-arch-stamp
-config.status: patch-stamp autotools
+config.status: patch-stamp autotools configure
./configure $(confflags) --enable-plugins --enable-v4l2 --prefix=/usr
autotools:
@@ -77,8 +76,8 @@
cp /usr/share/misc/config.sub plugins/config.sub
cp /usr/share/misc/config.guess plugins/config.guess
touch autotools
-
-build-arch-stamp:
+
+build-arch-stamp: config.status
# first build static and shared...
# ### internal settings and variables structure:
# make/ptlib.mak
@@ -363,8 +362,8 @@
ifneq (4,$(DH_COMPAT))
dh_strip -N$(PACKAGE)-dbg -N$(PACKAGE)-ptrace -N$(PACKAGE)-develop --dbg-package=libpt-dbg
# can't ship those in libpt-dbg due to namespace overlap
- dh_strip -p$(PACKAGE)-ptrace $(STRIP_EXCLUDES) -N$(PACKAGE)-develop --dbg-package=libpt-dbg-ptrace
- dh_strip -p$(PACKAGE)-develop $(STRIP_EXCLUDES) -N$(PACKAGE)-ptrace --dbg-package=libpt-dbg-develop
+ dh_strip -p$(PACKAGE)-ptrace $(STRIP_EXCLUDES) -N$(PACKAGE)-develop --dbg-package=$(PACKAGE)-ptrace
+ dh_strip -p$(PACKAGE)-develop $(STRIP_EXCLUDES) -N$(PACKAGE)-ptrace --dbg-package=$(PACKAGE)-develop
else
# As dh_strip does not work fine for multiple binary package
# we need to workaround that manually
@@ -377,10 +376,6 @@
cp -af debian/$$pack/usr/lib/debug debian/libpt-dbg/usr/lib && \
rm -rf debian/$$pack/usr/lib/debug; \
done
- for pack in -ptrace -develop;do \
- cp -af debian/$(PACKAGE)$$pack/usr/lib/debug debian/libpt-dbg$$pack/usr/lib && \
- rm -rf debian/$(PACKAGE)$$pack/usr/lib/debug; \
- done
endif
# Build architecture independant packages using the common target.
More information about the Pkg-voip-commits
mailing list