[Pkg-voip-commits] r9586 - in /openh323/trunk/debian: changelog patches/fix_autoconf patches/ptlib-pkgconfig rules
msp at alioth.debian.org
msp at alioth.debian.org
Fri Mar 16 21:32:24 UTC 2012
Author: msp
Date: Fri Mar 16 21:32:24 2012
New Revision: 9586
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9586
Log:
* New upstream release: 1.24.0
* Refresh ptlib-pkgconfig
Modified:
openh323/trunk/debian/changelog
openh323/trunk/debian/patches/fix_autoconf
openh323/trunk/debian/patches/ptlib-pkgconfig
openh323/trunk/debian/rules
Modified: openh323/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/changelog?rev=9586&op=diff
==============================================================================
--- openh323/trunk/debian/changelog (original)
+++ openh323/trunk/debian/changelog Fri Mar 16 21:32:24 2012
@@ -1,7 +1,7 @@
-h323plus (1.23.0~dfsg-1) UNRELEASED; urgency=low
-
- [ Kilian Krause ]
- * New upstream release: 1.23.0
+h323plus (1.24.0~dfsg-1) UNRELEASED; urgency=low
+
+ [ Kilian Krause ]
+ * New upstream release: 1.24.0
+ debian/rules: fix get-orig-source target
+ Patch 02_configure.ac.patch removed: applied upstream.
* Install h323plus_changes.txt as upstream changelog
@@ -14,7 +14,10 @@
* Patch fix_autoconf: fix broken syntax, allow autoreconf
* Patch ptlib-pkgconfig: Fixes building with ptlib, I believe
- -- Tzafrir Cohen <tzafrir at debian.org> Tue, 18 Oct 2011 18:58:55 +0200
+ [ Mark Purcell ]
+ * Refresh ptlib-pkgconfig
+
+ -- Mark Purcell <msp at debian.org> Sat, 17 Mar 2012 08:31:27 +1100
h323plus (1.22.0~dfsg-1) experimental; urgency=low
Modified: openh323/trunk/debian/patches/fix_autoconf
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/fix_autoconf?rev=9586&op=diff
==============================================================================
--- openh323/trunk/debian/patches/fix_autoconf (original)
+++ openh323/trunk/debian/patches/fix_autoconf Fri Mar 16 21:32:24 2012
@@ -1,8 +1,10 @@
Author: Tzafrir Cohen <tzafrir at debian.org>
Description: minor fixes to fix newer versions of autoconf
---- a/plugins/configure.ac
-+++ b/plugins/configure.ac
-@@ -474,7 +474,7 @@ AC_COMPILE_IFELSE([
+Index: h323plus-1.24.0~dfsg/plugins/configure.ac
+===================================================================
+--- h323plus-1.24.0~dfsg.orig/plugins/configure.ac 2010-09-20 19:04:24.000000000 +1000
++++ h323plus-1.24.0~dfsg/plugins/configure.ac 2012-03-17 08:09:03.000000000 +1100
+@@ -474,7 +474,7 @@
)
],
AC_MSG_RESULT(yes)
@@ -11,9 +13,11 @@
AC_MSG_RESULT(no)
)
AC_LANG_POP([C++])
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,10 +56,10 @@ AC_SUBST(BUILD_NUMBER, $BUILD_NUMBER)
+Index: h323plus-1.24.0~dfsg/configure.ac
+===================================================================
+--- h323plus-1.24.0~dfsg.orig/configure.ac 2012-02-01 00:02:29.000000000 +1100
++++ h323plus-1.24.0~dfsg/configure.ac 2012-03-17 08:24:18.000000000 +1100
+@@ -56,10 +56,10 @@
echo "OpenH323 version is ${OPENH323_VERSION}"
@@ -28,7 +32,7 @@
dnl ########################################################################
dnl look for ptlib, use a preference order of explicit PTLIBDIR, directory
-@@ -241,7 +241,7 @@ if test "$enable_audio" = "no" ; then
+@@ -247,7 +247,7 @@
AC_MSG_NOTICE(Disabling audio functions)
AC_SUBST(NOAUDIOCODECS, 1)
else
@@ -37,7 +41,7 @@
AC_ARG_ENABLE(embeddedgsm,
[ --enable-embeddedgsm embed GSM codec via static linking],
-@@ -254,7 +254,7 @@ else
+@@ -260,7 +260,7 @@
if test "x$GSM" != "x"; then
ENDLDLIBS="$ENDLDLIBS -lgsm"
fi
@@ -46,7 +50,7 @@
fi
fi
-@@ -275,7 +275,7 @@ if test "$enable_video" = "no" ; then
+@@ -281,7 +281,7 @@
AC_MSG_NOTICE(Disabling video functions)
AC_SUBST(NOVIDEO, 1)
else
@@ -55,7 +59,7 @@
fi
dnl ########################################################################
-@@ -291,7 +291,7 @@ if test "${enable_h224}x" = "x" ; then
+@@ -297,7 +297,7 @@
fi
if test "$enable_h224" = "yes" ; then
H323_H224=1
@@ -64,7 +68,7 @@
else
H323_H224=
AC_MSG_NOTICE(Disabling H.224)
-@@ -311,7 +311,7 @@ if test "${enable_h230}x" = "x" ; then
+@@ -317,7 +317,7 @@
fi
if test "$enable_h230" = "yes" ; then
H323_H230=1
@@ -73,7 +77,16 @@
else
H323_H230=
AC_MSG_NOTICE(Disabling H.230)
-@@ -331,7 +331,7 @@ if test "${enable_h239}x" = "x" ; then
+@@ -337,7 +337,7 @@
+ fi
+ if test "$enable_h235" = "yes" ; then
+ H323_H235=1
+- AC_DEFINE(H323_H235, 1)
++ AC_DEFINE(H323_H235, 1, [Enable H.235 support])
+ else
+ H323_H235=
+ AC_MSG_NOTICE(Disabling H.235.6)
+@@ -357,7 +357,7 @@
fi
if test "$enable_h239" = "yes" ; then
H323_H239=1
@@ -82,7 +95,7 @@
else
H323_H239=
AC_MSG_NOTICE(Disabling H.239)
-@@ -351,7 +351,7 @@ if test "${enable_h248}x" = "x" ; then
+@@ -377,7 +377,7 @@
fi
if test "$enable_h248" = "yes" ; then
H323_H248=1
@@ -91,7 +104,7 @@
else
H323_H248=
AC_MSG_NOTICE(Disabling H.248)
-@@ -371,7 +371,7 @@ if test "${enable_h249}x" = "x" ; then
+@@ -397,7 +397,7 @@
fi
if test "$enable_h249" = "yes" ; then
H323_H249=1
@@ -100,7 +113,7 @@
else
H323_H249=
AC_MSG_NOTICE(Disabling H.249)
-@@ -391,7 +391,7 @@ if test "${enable_h341}x" = "x" ; then
+@@ -417,7 +417,7 @@
fi
if test "$enable_h341" = "yes" ; then
H323_H341=1
@@ -109,7 +122,7 @@
else
H323_H341=
AC_MSG_NOTICE(Disabling H.341)
-@@ -411,7 +411,7 @@ if test "${enable_h350}x" = "x" ; then
+@@ -437,7 +437,7 @@
fi
if test "$enable_h350" = "yes" ; then
H323_H350=1
@@ -118,7 +131,7 @@
else
H323_H350=
AC_MSG_NOTICE(Disabling H.350)
-@@ -431,7 +431,7 @@ if test "${enable_h450}x" = "x" ; then
+@@ -457,7 +457,7 @@
fi
if test "$enable_h450" = "yes" ; then
H323_H450=1
@@ -127,7 +140,7 @@
else
H323_H450=
AC_MSG_NOTICE(Disabling H.450)
-@@ -451,7 +451,7 @@ if test "${enable_h460}x" = "x" ; then
+@@ -477,7 +477,7 @@
fi
if test "$enable_h460" = "yes" ; then
H323_H460=1
@@ -136,7 +149,7 @@
else
H323_H460=
AC_MSG_NOTICE(Disabling H.460)
-@@ -471,7 +471,7 @@ if test "${enable_h4609}x" = "x" ; then
+@@ -497,7 +497,7 @@
fi
if test "$enable_h4609" = "yes" ; then
H323_h4609=1
@@ -145,7 +158,16 @@
else
H323_h4609=
AC_MSG_NOTICE(Disabling H.460.9)
-@@ -491,7 +491,7 @@ if test "${enable_h46018}x" = "x" ; then
+@@ -517,7 +517,7 @@
+ fi
+ if test "$enable_h46017" = "yes" ; then
+ H323_H46017=1
+- AC_DEFINE(H323_H46017, 1)
++ AC_DEFINE(H323_H46017, 1, [Enable H.460.17 support])
+ else
+ H323_H46017=
+ AC_MSG_NOTICE(Disabling H.460.17)
+@@ -537,7 +537,7 @@
fi
if test "$enable_h46018" = "yes" ; then
H323_H46018=1
@@ -154,7 +176,16 @@
else
H323_H46018=
AC_MSG_NOTICE(Disabling H.460.18/.19)
-@@ -511,7 +511,7 @@ if test "${enable_h46023}x" = "x" ; then
+@@ -557,7 +557,7 @@
+ fi
+ if test "$enable_h46019m" = "yes" ; then
+ H323_H46019M=1
+- AC_DEFINE(H323_H46019M, 1)
++ AC_DEFINE(H323_H46019M, 1, [Enable H.460.19 support])
+ else
+ H323_H46019M=
+ AC_MSG_NOTICE(Disabling H.460.19 RTP multiplexing)
+@@ -577,7 +577,7 @@
fi
if test "$enable_h46023" = "yes" ; then
H323_H46023=1
@@ -163,7 +194,7 @@
else
H323_H46023=
AC_MSG_NOTICE(Disabling H.460.23/.24)
-@@ -531,7 +531,7 @@ if test "${enable_h460p}x" = "x" ; then
+@@ -597,7 +597,7 @@
fi
if test "$enable_h460p" = "yes" ; then
H323_H460P=1
@@ -172,7 +203,7 @@
else
H323_H460P=
AC_MSG_NOTICE(Disabling H.460 Presence)
-@@ -551,7 +551,7 @@ if test "${enable_h501}x" = "x" ; then
+@@ -617,7 +617,7 @@
fi
if test "$enable_h501" = "yes" ; then
H323_H501=1
@@ -181,7 +212,7 @@
else
H323_H501=
AC_MSG_NOTICE(Disabling H.501)
-@@ -572,7 +572,7 @@ fi
+@@ -638,7 +638,7 @@
if test "$enable_t38" = "yes" ; then
AC_MSG_NOTICE(Enabling T.38)
H323_T38=1
@@ -190,7 +221,7 @@
else
H323_T38=
AC_MSG_NOTICE(Disabling T.38)
-@@ -595,7 +595,7 @@ if test "$enable_t120" = "no" ; then
+@@ -661,7 +661,7 @@
AC_MSG_NOTICE(Disabling T.120)
else
H323_T20=1
@@ -199,7 +230,7 @@
fi
AC_SUBST(H323_T120)
-@@ -612,7 +612,7 @@ if test "${enable_gnugk}x" = "x" ; then
+@@ -678,7 +678,7 @@
fi
if test "$enable_gnugk" = "yes" ; then
H323_GNUGK=1
@@ -208,7 +239,7 @@
else
H323_GNUGK=
AC_MSG_NOTICE(Disabling GnuGk NAT)
-@@ -632,7 +632,7 @@ if test "${enable_file}x" = "x" ; then
+@@ -698,7 +698,7 @@
fi
if test "$enable_file" = "yes" ; then
H323_FILE=1
@@ -217,7 +248,7 @@
else
H323_FILE=
AC_MSG_NOTICE(Disabling File Transfer)
-@@ -675,7 +675,7 @@ if test "${OSTYPE:-unknown}" = "solaris"
+@@ -741,7 +741,7 @@
[upad128_t upad; upad._q = 0.0;], has_upad128_t=y)
if test ${has_upad128_t} == "y"; then
AC_MSG_RESULT(yes)
Modified: openh323/trunk/debian/patches/ptlib-pkgconfig
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/ptlib-pkgconfig?rev=9586&op=diff
==============================================================================
--- openh323/trunk/debian/patches/ptlib-pkgconfig (original)
+++ openh323/trunk/debian/patches/ptlib-pkgconfig Fri Mar 16 21:32:24 2012
@@ -1,14 +1,16 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -69,6 +69,7 @@ if test "${PTLIBDIR:-unset}" != "unset"
- AC_CHECK_FILE(${PTLIBDIR}/version.h, HAS_PTLIB=1)
+Index: h323plus-1.24.0~dfsg/configure.ac
+===================================================================
+--- h323plus-1.24.0~dfsg.orig/configure.ac 2012-02-25 18:28:32.000000000 +1100
++++ h323plus-1.24.0~dfsg/configure.ac 2012-02-25 18:28:32.000000000 +1100
+@@ -69,6 +69,7 @@
+ AC_CHECK_HEADER(${PTLIBDIR}/version.h, HAS_PTLIB=1)
fi
+set -x
if test "${HAS_PTLIB:-unset}" = "unset" ; then
- AC_CHECK_FILE(${OPENH323DIR}/../ptlib/version.h, HAS_PTLIB=1)
+ AC_CHECK_HEADER(${OPENH323DIR}/../ptlib/version.h, HAS_PTLIB=1)
if test "${HAS_PTLIB:-unset}" != "unset" ; then
-@@ -79,19 +80,13 @@ if test "${HAS_PTLIB:-unset}" = "unset"
+@@ -79,19 +80,13 @@
PTLIBDIR="${HOME}/ptlib"
else
if test "${HAS_PTLIB:-unset}" = "unset" ; then
Modified: openh323/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/rules?rev=9586&op=diff
==============================================================================
--- openh323/trunk/debian/rules (original)
+++ openh323/trunk/debian/rules Fri Mar 16 21:32:24 2012
@@ -12,7 +12,7 @@
URL := http://www.h323plus.org/source/download/h323plus-v$(URLVERSION).tar.gz
%:
- dh $@ --parallel --with=pkgkde-symbolshelper --with autoreconf
+ dh $@ --parallel --with autoreconf
override_dh_auto_configure:
dh_auto_configure -- --enable-plugins
More information about the Pkg-voip-commits
mailing list