[Pkg-voip-commits] r4421 - /openh323-titan/trunk/debian/ /openh323-titan/trunk/debian/patches/ /pwlib-titan/trunk/debian/
kilian at alioth.debian.org
kilian at alioth.debian.org
Thu Sep 6 11:33:23 UTC 2007
Author: kilian
Date: Thu Sep 6 11:33:23 2007
New Revision: 4421
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4421
Log:
Update to latest "official" Titan release.
Added:
openh323-titan/trunk/debian/patches/ixjlid.h.dpatch (with props)
pwlib-titan/trunk/debian/compat
Modified:
openh323-titan/trunk/debian/changelog
openh323-titan/trunk/debian/control
openh323-titan/trunk/debian/patches/00list
openh323-titan/trunk/debian/rules
pwlib-titan/trunk/debian/changelog
pwlib-titan/trunk/debian/control
pwlib-titan/trunk/debian/rules
Modified: openh323-titan/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openh323-titan/trunk/debian/changelog?rev=4421&op=diff
==============================================================================
--- openh323-titan/trunk/debian/changelog (original)
+++ openh323-titan/trunk/debian/changelog Thu Sep 6 11:33:23 2007
@@ -1,4 +1,4 @@
-openh323-titan (1.19.1~dfsg-1) UNRELEASED; urgency=low
+openh323-titan (1.19.0.1~dfsg-1) UNRELEASED; urgency=low
* NOT RELEASED YET
* New upstream release (Codename: Titan, development branch)
Modified: openh323-titan/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/openh323-titan/trunk/debian/control?rev=4421&op=diff
==============================================================================
--- openh323-titan/trunk/debian/control (original)
+++ openh323-titan/trunk/debian/control Thu Sep 6 11:33:23 2007
@@ -3,19 +3,19 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 5), libpt-1.11.1-dev (>=1.11.1~), libssl-dev, libgsm1-dev (>=1.0.10-11), libspeex-dev (>=1.1.11-1), dpatch (>=1.11), libsasl2-dev, autotools-dev, binutils (>= 2.17-1), dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 5), libpt-1.11.0-dev (>=1.11.0~), libssl-dev, libgsm1-dev (>=1.0.10-11), libspeex-dev (>=1.1.11-1), dpatch (>=1.11), libsasl2-dev, autotools-dev, binutils (>= 2.17-1), dpkg-dev (>= 1.13.19)
Build-Depends-Indep: doxygen
-Build-Conflicts: libopenh323-dev, libopenh323-1.19.1
+Build-Conflicts: libopenh323-dev, libopenh323-1.19.0, libopenh323-1.19.0-dev
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
-Package: libopenh323-1.19.1
+Package: libopenh323-1.19.0
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libopenh323-1.19.1-develop
-Provides: libopenh323-1.19.1-ptrace
+Conflicts: libopenh323-1.19.0-develop
+Provides: libopenh323-1.19.0-ptrace
Description: H.323 aka VoIP library
This package contains the shared version of the OpenH323 library.
.
@@ -27,11 +27,11 @@
For more information on the OpenH323 project visit them at
http://www.voxgratia.org/
-Package: libopenh323-1.19.1-develop
+Package: libopenh323-1.19.0-develop
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libopenh323-1.19.1-ptrace, libopenh323-1.19.1
+Conflicts: libopenh323-1.19.0-ptrace, libopenh323-1.19.0
Description: H.323 aka VoIP library
This package contains the shared version of the OpenH323 library.
.
@@ -47,10 +47,10 @@
For more information on the OpenH323 project visit them at
http://www.voxgratia.org/
-Package: libopenh323-1.19.1-dev
+Package: libopenh323-1.19.0-dev
Section: libdevel
Architecture: any
-Depends: libopenh323-1.19.1 (= ${binary:Version}) | libopenh323-1.19.1-develop (= ${binary:Version}), libssl-dev, libpt-1.11.1-dev (>= 1.11.1~)
+Depends: libopenh323-1.19.0 (= ${binary:Version}) | libopenh323-1.19.0-develop (= ${binary:Version}), libssl-dev, libpt-1.11.0-dev (>= 1.11.0~)
Description: H.323 aka VoIP library development files
This package contains the the headers and a static version of the
OpenH323 library.
@@ -83,11 +83,11 @@
For more information on the OpenH323 project visit them at
http://www.voxgratia.org/
-Package: libopenh323-1.19.1-dbg
+Package: libopenh323-1.19.0-dbg
Section: libdevel
Priority: extra
Architecture: any
-Depends: libopenh323-1.19.1 (= ${binary:Version})
+Depends: libopenh323-1.19.0 (= ${binary:Version})
Description: H.323 aka VoIP library development debug files
This package contains the shared and static debug version of the
OpenH323 library.
@@ -100,7 +100,7 @@
For more information on the OpenH323 project visit them at
http://www.voxgratia.org/
-Package: libopenh323-1.19.1-doc
+Package: libopenh323-1.19.0-doc
Section: doc
Priority: extra
Architecture: all
Modified: openh323-titan/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/openh323-titan/trunk/debian/patches/00list?rev=4421&op=diff
==============================================================================
--- openh323-titan/trunk/debian/patches/00list (original)
+++ openh323-titan/trunk/debian/patches/00list Thu Sep 6 11:33:23 2007
@@ -4,4 +4,5 @@
notrace
printon_with_notrace
ixjuser.h
+ixjlid.h
#pwlib_versioned_plugins
Added: openh323-titan/trunk/debian/patches/ixjlid.h.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/openh323-titan/trunk/debian/patches/ixjlid.h.dpatch?rev=4421&op=file
==============================================================================
--- openh323-titan/trunk/debian/patches/ixjlid.h.dpatch (added)
+++ openh323-titan/trunk/debian/patches/ixjlid.h.dpatch Thu Sep 6 11:33:23 2007
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ixjlid.h.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compilation of IXJ on Ubuntu
+
+ at DPATCH@
+diff -urN openh323.old/include/ixjlid.h openh323-1.18.0.dfsg/include/ixjlid.h
+--- openh323.old/include/ixjlid.h 2006-03-02 12:12:52.000000000 +0100
++++ openh323-1.18.0.dfsg/include/ixjlid.h 2006-12-26 13:55:31.000000000 +0100
+@@ -274,7 +274,6 @@
+
+ #ifdef P_LINUX
+ #include <linux/telephony.h>
+-#include <linux/compiler.h>
+ #include <linux/ixjuser.h>
+ #endif
+
Propchange: openh323-titan/trunk/debian/patches/ixjlid.h.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: openh323-titan/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/openh323-titan/trunk/debian/rules?rev=4421&op=diff
==============================================================================
--- openh323-titan/trunk/debian/rules (original)
+++ openh323-titan/trunk/debian/rules Thu Sep 6 11:33:23 2007
@@ -1,5 +1,4 @@
#!/usr/bin/make -f
-
# excludes for the -ptrace and -develop version
STRIP_EXCLUDES = -N$(PACKAGE) -Nlibopenh323-$(SHLIBSVER)-dbg -Nlibopenh323-$(SHLIBSVER)-dev -Nsimph323-titan
@@ -99,7 +98,7 @@
#$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
#$(RM) -rf samples/simple/obj_*
# save it to install in package later...
- cp debian/libopenh323-dev.docs debian/$(PACKAGE)-dev.docs
+ cp debian/libopenh323-dev.dirs debian/$(PACKAGE)-dev.dirs
touch build-arch-stamp
build-indep: build-indep-stamp
@@ -162,23 +161,23 @@
$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
-$(RM) -r samples/simple/obj*
-# libopenh323-dev package
- cp -v lib/opt/libopenh323_s.a debian/libopenh323-dev/usr/lib
- cp -v lib/debug/libopenh323_s.a debian/libopenh323-dev/usr/lib/libopenh323_d_s.a
- ln -s libopenh323.so.$(SHLIBSVER) debian/libopenh323-dev/usr/lib/libopenh323.so
- ln -s libopenh323.so.$(SHLIBSVER) debian/libopenh323-dev/usr/lib/libopenh323.so.$(VER_MAJOR)
- ln -s libopenh323.so.$(SHLIBSVER) debian/libopenh323-dev/usr/lib/libopenh323.so.$(VER_MAJOR).$(VER_MINOR)
+# $(PACKAGE)-dev package
+ cp -v lib/opt/libopenh323_s.a debian/$(PACKAGE)-dev/usr/lib
+ cp -v lib/debug/libopenh323_s.a debian/$(PACKAGE)-dev/usr/lib/libopenh323_d_s.a
+ ln -s libopenh323.so.$(SHLIBSVER) debian/$(PACKAGE)-dev/usr/lib/libopenh323.so
+ ln -s libopenh323.so.$(SHLIBSVER) debian/$(PACKAGE)-dev/usr/lib/libopenh323.so.$(VER_MAJOR)
+ ln -s libopenh323.so.$(SHLIBSVER) debian/$(PACKAGE)-dev/usr/lib/libopenh323.so.$(VER_MAJOR).$(VER_MINOR)
sed -e 's#^OPENH323DIR.*#OPENH323DIR = \/usr\/share\/openh323#g' \
- openh323u.mak > debian/libopenh323-dev/usr/share/openh323/openh323u.mak
- cp -vr include/* $(CURDIR)/debian/libopenh323-dev/usr/include/openh323/.
- find debian/libopenh323-dev/usr/include -type f -exec chmod 644 {} \;
- cp version.h debian/libopenh323-dev/usr/include/openh323/
+ openh323u.mak > debian/$(PACKAGE)-dev/usr/share/openh323/openh323u.mak
+ cp -vr include/* $(CURDIR)/debian/$(PACKAGE)-dev/usr/include/openh323/.
+ find debian/$(PACKAGE)-dev/usr/include -type f -exec chmod 644 {} \;
+ cp version.h debian/$(PACKAGE)-dev/usr/include/openh323/
# linking stuff under usr/share/openh323
- ln -s ../../include/openh323/version.h debian/libopenh323-dev/usr/share/openh323/
- ln -s ../../include/openh323 debian/libopenh323-dev/usr/share/openh323/include
- ln -s ../../lib debian/libopenh323-dev/usr/share/openh323/
+ ln -s ../../include/openh323/version.h debian/$(PACKAGE)-dev/usr/share/openh323/
+ ln -s ../../include/openh323 debian/$(PACKAGE)-dev/usr/share/openh323/include
+ ln -s ../../lib debian/$(PACKAGE)-dev/usr/share/openh323/
# doc
cp debian/libopenh323.docs debian/$(PACKAGE).docs
Modified: pwlib-titan/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib-titan/trunk/debian/changelog?rev=4421&op=diff
==============================================================================
--- pwlib-titan/trunk/debian/changelog (original)
+++ pwlib-titan/trunk/debian/changelog Thu Sep 6 11:33:23 2007
@@ -1,4 +1,4 @@
-pwlib-titan (1.11.1-1) UNRELEASED; urgency=low
+pwlib-titan (1.11.0~dfsg1-1) UNRELEASED; urgency=low
* New upstream release (unstable branch).
* NOT RELEASED YET
Added: pwlib-titan/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib-titan/trunk/debian/compat?rev=4421&op=file
==============================================================================
--- pwlib-titan/trunk/debian/compat (added)
+++ pwlib-titan/trunk/debian/compat Thu Sep 6 11:33:23 2007
@@ -1,0 +1,1 @@
+5
Modified: pwlib-titan/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib-titan/trunk/debian/control?rev=4421&op=diff
==============================================================================
--- pwlib-titan/trunk/debian/control (original)
+++ pwlib-titan/trunk/debian/control Thu Sep 6 11:33:23 2007
@@ -5,16 +5,16 @@
Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
Build-Depends: debhelper (>=4.9.0), libdc1394-13-dev, bison, flex, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, g++ (>=2.95), autotools-dev, dpatch (>=1.11), libasound2-dev, libavc1394-dev, libraw1394-dev, libdv-dev, libsasl2-dev, libkrb5-dev, doxygen, linux-kernel-headers|linux-libc-dev, binutils (>= 2.14.90.0.7), dpkg-dev (>= 1.13.19)
Build-Depends-Indep: doxygen
-Build-Conflicts: libpt-1.11.1, libpt-1.11.1-ptrace, libpt-1.11.1-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
+Build-Conflicts: libpt-1.11.0, libpt-1.11.0-ptrace, libpt-1.11.0-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
Standards-Version: 3.6.2
XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/pwlib/trunk
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/pwlib?op=log
-Package: libpt-1.11.1
+Package: libpt-1.11.0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.11.1-plugins-alsa|libpt-1.11.1-plugins-oss, libpt-1.11.1-plugins-v4l|libpt-1.11.1-plugins-v4l2|libpt-1.11.1-plugins-avc|libpt-1.11.1-plugins-dc
-Conflicts: libpt-1.11.1-ptrace, libpt-1.11.1-develop
+Depends: ${shlibs:Depends}, libpt-1.11.0-plugins-alsa|libpt-1.11.0-plugins-oss, libpt-1.11.0-plugins-v4l|libpt-1.11.0-plugins-v4l2|libpt-1.11.0-plugins-avc|libpt-1.11.0-plugins-dc
+Conflicts: libpt-1.11.0-ptrace, libpt-1.11.0-develop
Description: Portable Windows Library
This package contains the shared version of the library PWLib, which is
a moderately large class library that has its genesis many years ago as
@@ -24,11 +24,11 @@
For more information on PWLib visit the development homepage
http://www.voxgratia.org/
-Package: libpt-1.11.1-ptrace
+Package: libpt-1.11.0-ptrace
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libpt-1.11.1, libpt-1.11.1-develop, libpt-1.11.1-plugins-v4l, libpt-1.11.1-plugins-v4l2, libpt-1.11.1-plugins-avc, libpt-1.11.1-plugins-dc, libpt-1.11.1-plugins-oss, libpt-1.11.1-plugins-alsa
+Conflicts: libpt-1.11.0, libpt-1.11.0-develop, libpt-1.11.0-plugins-v4l, libpt-1.11.0-plugins-v4l2, libpt-1.11.0-plugins-avc, libpt-1.11.0-plugins-dc, libpt-1.11.0-plugins-oss, libpt-1.11.0-plugins-alsa
Description: Portable Windows Library - optimized version with extra ptrace code
This package contains the shared version of the library PWLib, which is
a moderately large class library that has its genesis many years ago as
@@ -44,11 +44,11 @@
For more information on PWLib visit the development homepage
http://www.voxgratia.org/
-Package: libpt-1.11.1-develop
+Package: libpt-1.11.0-develop
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libpt-1.11.1, libpt-1.11.1-ptrace, libpt-1.11.1-plugins-v4l, libpt-1.11.1-plugins-v4l2, libpt-1.11.1-plugins-avc, libpt-1.11.1-plugins-dc, libpt-1.11.1-plugins-oss, libpt-1.11.1-plugins-alsa
+Conflicts: libpt-1.11.0, libpt-1.11.0-ptrace, libpt-1.11.0-plugins-v4l, libpt-1.11.0-plugins-v4l2, libpt-1.11.0-plugins-avc, libpt-1.11.0-plugins-dc, libpt-1.11.0-plugins-oss, libpt-1.11.0-plugins-alsa
Description: Portable Windows Library - binary developer version
This package contains the shared version of the library PWLib, which is
a moderately large class library that has its genesis many years ago as
@@ -65,10 +65,10 @@
For more information on PWLib visit the development homepage
http://www.voxgratia.org/
-Package: libpt-1.11.1-dev
+Package: libpt-1.11.0-dev
Section: libdevel
Architecture: any
-Depends: libpt-1.11.1 (= ${binary:Version})|libpt-1.11.1-ptrace (= ${binary:Version})|libpt-1.11.1-develop (= ${binary:Version}), libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev
+Depends: libpt-1.11.0 (= ${binary:Version})|libpt-1.11.0-ptrace (= ${binary:Version})|libpt-1.11.0-develop (= ${binary:Version}), libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev
Description: Portable Windows Library development files
This package contains the headers and a static version of the library
PWLib, which is a moderately large class library that has its genesis
@@ -83,11 +83,11 @@
For more information on PWLib visit the development homepage
http://www.voxgratia.org/
-Package: libpt-1.11.1-dbg
+Package: libpt-1.11.0-dbg
Section: libdevel
Priority: extra
Architecture: any
-Depends: libpt-1.11.1 (= ${binary:Version})
+Depends: libpt-1.11.0 (= ${binary:Version})
Description: Portable Windows Library development debug files
This package contains the shared and static debug symbols of the library
PWLib, which is a moderately large class library that has its genesis
@@ -99,7 +99,7 @@
For more information on PWLib visit the development homepage
http://www.voxgratia.org/
-Package: libpt-1.11.1-doc
+Package: libpt-1.11.0-doc
Section: doc
Priority: extra
Architecture: all
@@ -112,7 +112,7 @@
For more information on PWLib visit the development homepage
http://www.voxgratia.org/
-Package: libpt-1.11.1-plugins-v4l
+Package: libpt-1.11.0-plugins-v4l
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
@@ -121,7 +121,7 @@
devices. Install this package, if you want to use a video device
that is not attached to FireWire.
-Package: libpt-1.11.1-plugins-v4l2
+Package: libpt-1.11.0-plugins-v4l2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
@@ -131,7 +131,7 @@
that is not attached to FireWire.
-Package: libpt-1.11.1-plugins-avc
+Package: libpt-1.11.0-plugins-avc
Architecture: any
Depends: ${shlibs:Depends}
Description: PWLib Video Plugin for IEEE1394 (FireWire) AVC devices
@@ -139,7 +139,7 @@
on FireWire. Install this package, if you want to use such a video
device.
-Package: libpt-1.11.1-plugins-dc
+Package: libpt-1.11.0-plugins-dc
Architecture: any
Depends: ${shlibs:Depends}
Description: PWLib Video Plugin for IEEE1394 (Firewire) DC Devices
@@ -147,7 +147,7 @@
on Firewire. Install this package, if you want to use such a video
device.
-Package: libpt-1.11.1-plugins-oss
+Package: libpt-1.11.0-plugins-oss
Architecture: any
Depends: ${shlibs:Depends}
Description: Portable Windows Library Audio Plugins for the OSS Interface
@@ -155,7 +155,7 @@
System interface. Install this package, if you are utilising this
interface..
-Package: libpt-1.11.1-plugins-alsa
+Package: libpt-1.11.0-plugins-alsa
Architecture: any
Depends: ${shlibs:Depends}
Recommends: alsa-base
Modified: pwlib-titan/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib-titan/trunk/debian/rules?rev=4421&op=diff
==============================================================================
--- pwlib-titan/trunk/debian/rules (original)
+++ pwlib-titan/trunk/debian/rules Thu Sep 6 11:33:23 2007
@@ -1,14 +1,8 @@
#!/usr/bin/make -f
-export DH_COMPAT=5
-
-# Change this on API breakage
-
-#PACKAGE=libpt-$(LIBPTCOMPAT)
-
# excludes for the -ptrace and -develop version
-STRIP_EXCLUDES = -N$(PACKAGE) -Nlibpt-1.11.1-dbg -Nlibpt-1.11.1-dev -Nlibpt-1.11.1-plugins-alsa -Nlibpt-1.11.1-plugins-oss
-STRIP_EXCLUDES += -Nlibpt-1.11.1-plugins-v4l -Nlibpt-1.11.1-plugins-v4l2 -Nlibpt-1.11.1-plugins-avc -Nlibpt-1.11.1-plugins-dc
+STRIP_EXCLUDES = -N$(PACKAGE) -N$(PACKAGE)-dbg -N$(PACKAGE)-dev -N$(PACKAGE)-plugins-alsa -N$(PACKAGE)-plugins-oss
+STRIP_EXCLUDES += -N$(PACKAGE)-plugins-v4l -N$(PACKAGE)-plugins-v4l2 -N$(PACKAGE)-plugins-avc -N$(PACKAGE)-plugins-dc
ifneq (,$(shell test -f version.h&&grep MAJOR_VERSION version.h))
VER_MAJOR := $(shell awk '/MAJOR_VERSION/ { print $$3 }' version.h 2>/dev/null)
@@ -45,7 +39,7 @@
DEBVERSION := $(shell head -n 1 debian/changelog \
| sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
UPVERSION := $(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg[0-9]*$$//')
-URLVERSION := $(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//' -e 's/\./_/g')
+URLVERSION := $(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg[0-9]*$$//' -e 's/\./_/g')
FILENAME := pwlib-titan_$(UPVERSION)~dfsg1.orig.tar.gz
UPFILENAME := pwlib-titan_$(UPVERSION).orig.tar.gz
@@ -311,7 +305,7 @@
dh_installman
if [ ! -f ChangeLog ];then \
dh_installchangelogs ;\
- else; \
+ else \
dh_installchangelogs ChangeLog; \
fi
More information about the Pkg-voip-commits
mailing list