[Pkg-voip-commits] r9153 - in /openh323/trunk/debian: changelog control patches/02_configure.ac.patch patches/series rules
kilian at alioth.debian.org
kilian at alioth.debian.org
Sun Jul 17 20:18:43 UTC 2011
Author: kilian
Date: Sun Jul 17 20:18:42 2011
New Revision: 9153
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9153
Log:
* Install h323plus_changes.txt as upstream changelog
* Add configure.ac patch from upstream to find installed ptlib, too.
(Requires dh-autoreconf for now)
* Remove unneccessary ptlibdir hack from debian/rules
* Include symbols-check as default now
Added:
openh323/trunk/debian/patches/02_configure.ac.patch
Modified:
openh323/trunk/debian/changelog
openh323/trunk/debian/control
openh323/trunk/debian/patches/series
openh323/trunk/debian/rules
Modified: openh323/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/changelog?rev=9153&op=diff
==============================================================================
--- openh323/trunk/debian/changelog (original)
+++ openh323/trunk/debian/changelog Sun Jul 17 20:18:42 2011
@@ -1,3 +1,13 @@
+h323plus (1.22.0~dfsg-2) UNRELEASED; urgency=low
+
+ * Install h323plus_changes.txt as upstream changelog
+ * Add configure.ac patch from upstream to find installed ptlib, too.
+ (Requires dh-autoreconf for now)
+ * Remove unneccessary ptlibdir hack from debian/rules
+ * Include symbols-check as default now
+
+ -- Kilian Krause <kilian at debian.org> Sun, 17 Jul 2011 22:17:13 +0200
+
h323plus (1.22.0~dfsg-1) experimental; urgency=low
* New upstream release
Modified: openh323/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/control?rev=9153&op=diff
==============================================================================
--- openh323/trunk/debian/control (original)
+++ openh323/trunk/debian/control Sun Jul 17 20:18:42 2011
@@ -3,8 +3,9 @@
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Kilian Krause <kilian at debian.org>, Mark Purcell <msp at debian.org>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 8), libsasl2-dev, autotools-dev, binutils (>= 2.17), dpkg-dev (>= 1.13.19),
- libpt-dev (>= 2.6.7), libldap2-dev, libssl-dev, libexpat1-dev, libsdl1.2-dev, unixodbc-dev, pkg-kde-tools
+Build-Depends: debhelper (>= 8), libsasl2-dev, autotools-dev, binutils (>= 2.17),
+ dpkg-dev (>= 1.13.19), libpt-dev (>= 2.6.7), libldap2-dev, libssl-dev, libexpat1-dev,
+ libsdl1.2-dev, unixodbc-dev, pkg-kde-tools, dh-autoreconf
Build-Conflicts: libopenh323-dev, libopenh323-1.18.0
Standards-Version: 3.9.2
Homepage: http://www.h323plus.org/
Added: openh323/trunk/debian/patches/02_configure.ac.patch
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/02_configure.ac.patch?rev=9153&op=file
==============================================================================
--- openh323/trunk/debian/patches/02_configure.ac.patch (added)
+++ openh323/trunk/debian/patches/02_configure.ac.patch Sun Jul 17 20:18:42 2011
@@ -1,0 +1,72 @@
+Origin: upstream
+Description: Backported upstream fix to find installed PTLib
+ (taken from CVS of 1.22.2)
+--- configure.ac 2009-12-08 08:49:53.000000000 +0100
++++ /home/kk/src/h323plus//configure.ac 2011-07-17 16:14:47.000000000 +0200
+@@ -66,44 +66,42 @@
+ dnl at same level, home directory, /usr/local or /usr.
+
+ if test "${PTLIBDIR:-unset}" != "unset" ; then
+- AC_CHECK_FILE(${PTLIBDIR}/version.h, HAS_PTLIB=1)
++ AC_CHECK_FILE(${PTLIBDIR}/version.h, HAS_PTLIB=1)
+ fi
+
+ if test "${HAS_PTLIB:-unset}" = "unset" ; then
++ AC_CHECK_FILE(${OPENH323DIR}/../ptlib/version.h, HAS_PTLIB=1)
+ if test "${HAS_PTLIB:-unset}" != "unset" ; then
+ PTLIBDIR="${OPENH323DIR}/../ptlib"
+ else
++ AC_CHECK_FILE(${HOME}/ptlib/version.h, HAS_PTLIB=1)
+ if test "${HAS_PTLIB:-unset}" != "unset" ; then
+ PTLIBDIR="${HOME}/ptlib"
+ else
+- if test "${HAS_PTLIB:-unset}" != "unset" ; then
++ if test "${HAS_PTLIB:-unset}" = "unset" ; then
+ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin)
+ else
+- if test "${HAS_PTLIB:-unset}" != "unset" ; then
++ if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
+ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/ptlib/make/)
+ else
+- if test "${HAS_PTLIB:-unset}" != "unset" ; then
+- AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/ptlib/make/)
+- fi
++ if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
++ AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/share/ptlib/make/)
++ fi
+ fi
+ fi
+ fi
+ fi
+ fi
++if test "${PTLIB_CONFIG:-unset}" != "unset" ; then
++ PTLIBDIR=`$PTLIB_CONFIG --prefix`
++ HAS_PTLIB=1
++fi
+
+ if test "${HAS_PTLIB:-unset}" = "unset" ; then
+ echo "Cannot find ptlib - please install or set PTLIBDIR and try again"
+ exit
+ fi
+
+-if test "${PTLIBDIR:-unset}" = "unset" ; then
+- if test "${PTLIB_CONFIG:-unset}" = "unset" ; then
+- echo "Cannot find ptlib-config - please install and try again"
+- exit
+- fi
+- PTLIBDIR=`$PTLIB_CONFIG --prefix`
+-fi
+-
+ if test "x$PTLIBDIR" = "x/usr" -o "x$PTLIBDIR" = "x/usr/"; then
+ PTLIBDIR="/usr/share/ptlib/"
+ fi
+@@ -113,7 +111,7 @@
+
+ echo "PTLib prefix set to.... $PTLIBDIR"
+
+-if test "${PTLIBDIR:-unset}" = "unset" ; then
++if test "${PTLIB_CONFIG:-unset}" != "unset" ; then
+ PTVERSION=`$PTLIB_CONFIG --version`
+ PT_MAJOR_VERSION=`echo $PTVERSION | cut -d'.' -f1`
+ PT_MINOR_VERSION=`echo $PTVERSION | cut -d'.' -f2`
+
Modified: openh323/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/series?rev=9153&op=diff
==============================================================================
--- openh323/trunk/debian/patches/series (original)
+++ openh323/trunk/debian/patches/series Sun Jul 17 20:18:42 2011
@@ -1,4 +1,5 @@
01_libname.patch
+02_configure.ac.patch
03_Makefile.in.patch
10_openh323u.mak.patch
notrace.patch
Modified: openh323/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/rules?rev=9153&op=diff
==============================================================================
--- openh323/trunk/debian/rules (original)
+++ openh323/trunk/debian/rules Sun Jul 17 20:18:42 2011
@@ -10,23 +10,19 @@
UPFILENAME := h323plus_$(UPVERSION).orig.tar.gz
URL := http://www.h323plus.org/source/download/h323plus-$(UPVERSION).tar.gz
-export PTLIBDIR = $(CURDIR)/debian/ptlibdir
-
-# to collect all symbols on all archs in experimental
-# and set this to 1 or higher once we move to unstable
-export DPKG_GENSYMBOLS_CHECK_LEVEL=0
-
%:
- dh $@ --parallel --with autotools_dev --with=pkgkde-symbolshelper
+ dh $@ --parallel --with autotools_dev --with=pkgkde-symbolshelper \
+ --with-dh-autoreconf
override_dh_auto_configure:
- rm -rf debian/ptlibdir;mkdir debian/ptlibdir;for file in /usr/include/ptlib/* /usr/share/ptlib/*;do ln -sf $$file debian/ptlibdir;done
dh_auto_configure -- --enable-plugins
+
+override_dh_installchangelogs:
+ dh_installchangelogs h323plus_changes.txt
override_dh_clean:
dh_clean
rm -fR lib/
- rm -rf debian/ptlibdir
override_dh_strip:
dh_strip -a --dbg-package=libh323-dbg
More information about the Pkg-voip-commits
mailing list