[Pkg-voip-commits] r10160 - in /openh323/trunk/debian: changelog patches/01_libname.patch patches/03_Makefile.in.patch patches/10_openh323u.mak.patch patches/fix_autoconf patches/ixjuser.h.patch patches/notrace.patch patches/printon_with_notrace.patch
msp at alioth.debian.org
msp at alioth.debian.org
Sat May 11 00:49:11 UTC 2013
Author: msp
Date: Sat May 11 00:49:11 2013
New Revision: 10160
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10160
Log:
* New Upstream Release
* quilt refresh debian/patches
Modified:
openh323/trunk/debian/changelog
openh323/trunk/debian/patches/01_libname.patch
openh323/trunk/debian/patches/03_Makefile.in.patch
openh323/trunk/debian/patches/10_openh323u.mak.patch
openh323/trunk/debian/patches/fix_autoconf
openh323/trunk/debian/patches/ixjuser.h.patch
openh323/trunk/debian/patches/notrace.patch
openh323/trunk/debian/patches/printon_with_notrace.patch
Modified: openh323/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/changelog?rev=10160&op=diff
==============================================================================
--- openh323/trunk/debian/changelog (original)
+++ openh323/trunk/debian/changelog Sat May 11 00:49:11 2013
@@ -1,3 +1,10 @@
+h323plus (1.25.0~dfsg-1) UNRELEASED; urgency=low
+
+ * New Upstream Release
+ * quilt refresh debian/patches
+
+ -- Mark Purcell <msp at debian.org> Sat, 02 Feb 2013 16:50:00 +1100
+
h323plus (1.24.0~dfsg2-1) unstable; urgency=low
* Fix "Source package contains non-free IETF RFC/I-D" Strip iLBC
Modified: openh323/trunk/debian/patches/01_libname.patch
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/01_libname.patch?rev=10160&op=diff
==============================================================================
--- openh323/trunk/debian/patches/01_libname.patch (original)
+++ openh323/trunk/debian/patches/01_libname.patch Sat May 11 00:49:11 2013
@@ -1,8 +1,10 @@
Author: Kilian Krause <kilian at debian.org>
Description: Fixes the libraries' file names
---- a/openh323u.mak.in
-+++ b/openh323u.mak.in
-@@ -256,7 +256,7 @@ RCFLAGS += -DPTRACING
+Index: h323plus-1.25.0~dfsg/openh323u.mak.in
+===================================================================
+--- h323plus-1.25.0~dfsg.orig/openh323u.mak.in 2013-02-02 16:52:45.000000000 +1100
++++ h323plus-1.25.0~dfsg/openh323u.mak.in 2013-02-02 16:52:45.000000000 +1100
+@@ -91,7 +91,7 @@
OH323_SUFFIX = $(OBJ_SUFFIX)
endif # NOTRACE
Modified: openh323/trunk/debian/patches/03_Makefile.in.patch
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/03_Makefile.in.patch?rev=10160&op=diff
==============================================================================
--- openh323/trunk/debian/patches/03_Makefile.in.patch (original)
+++ openh323/trunk/debian/patches/03_Makefile.in.patch Sat May 11 00:49:11 2013
@@ -1,8 +1,10 @@
Author: Jose Carlos Garcia Sogo <jsogo at debian.org>
Description: This patch removes the "samples/simple" subdir from the Makefile.in.
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -305,7 +305,7 @@ include $(OPENH323DIR)/openh323u.mak
+Index: h323plus-1.25.0~dfsg/Makefile.in
+===================================================================
+--- h323plus-1.25.0~dfsg.orig/Makefile.in 2013-02-02 16:53:02.000000000 +1100
++++ h323plus-1.25.0~dfsg/Makefile.in 2013-02-02 16:53:02.000000000 +1100
+@@ -41,7 +41,7 @@
# export NOAUDIOCODECS=true
# export NOVIDEO=true
Modified: openh323/trunk/debian/patches/10_openh323u.mak.patch
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/10_openh323u.mak.patch?rev=10160&op=diff
==============================================================================
--- openh323/trunk/debian/patches/10_openh323u.mak.patch (original)
+++ openh323/trunk/debian/patches/10_openh323u.mak.patch Sat May 11 00:49:11 2013
@@ -1,8 +1,10 @@
Author: Jose Carlos Garcia Sogo <jsogo at debian.org>
Description: No description.
---- a/openh323u.mak.in
-+++ b/openh323u.mak.in
-@@ -268,8 +268,8 @@ ifdef OH323_SUPPRESS_H235
+Index: h323plus-1.25.0~dfsg/openh323u.mak.in
+===================================================================
+--- h323plus-1.25.0~dfsg.orig/openh323u.mak.in 2013-02-02 16:53:06.000000000 +1100
++++ h323plus-1.25.0~dfsg/openh323u.mak.in 2013-02-02 16:53:06.000000000 +1100
+@@ -103,8 +103,8 @@
STDCCFLAGS += -DOH323_SUPPRESS_H235
endif
@@ -12,7 +14,7 @@
ifndef LIBRARY_MAKEFILE
ifdef DEBUG
$(OH323_LIBDIR)/$(OH323_FILE):
-@@ -279,6 +279,7 @@ $(OH323_LIBDIR)/$(OH323_FILE):
+@@ -114,6 +114,7 @@
$(MAKE) -C $(OH323_SRCDIR) opt
endif # DEBUG
endif # LIBRARY_MAKEFILE
Modified: openh323/trunk/debian/patches/fix_autoconf
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/fix_autoconf?rev=10160&op=diff
==============================================================================
--- openh323/trunk/debian/patches/fix_autoconf (original)
+++ openh323/trunk/debian/patches/fix_autoconf Sat May 11 00:49:11 2013
@@ -1,9 +1,9 @@
Author: Tzafrir Cohen <tzafrir at debian.org>
Description: minor fixes to fix newer versions of autoconf
-Index: h323plus-1.24.0~dfsg/plugins/configure.ac
+Index: h323plus-1.25.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
+--- h323plus-1.25.0~dfsg.orig/plugins/configure.ac 2013-02-02 16:53:42.000000000 +1100
++++ h323plus-1.25.0~dfsg/plugins/configure.ac 2013-02-02 16:53:42.000000000 +1100
@@ -474,7 +474,7 @@
)
],
@@ -13,10 +13,10 @@
AC_MSG_RESULT(no)
)
AC_LANG_POP([C++])
-Index: h323plus-1.24.0~dfsg/configure.ac
+Index: h323plus-1.25.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
+--- h323plus-1.25.0~dfsg.orig/configure.ac 2013-02-02 16:53:42.000000000 +1100
++++ h323plus-1.25.0~dfsg/configure.ac 2013-02-02 16:53:42.000000000 +1100
@@ -56,10 +56,10 @@
echo "OpenH323 version is ${OPENH323_VERSION}"
@@ -32,7 +32,7 @@
dnl ########################################################################
dnl look for ptlib, use a preference order of explicit PTLIBDIR, directory
-@@ -247,7 +247,7 @@
+@@ -255,7 +255,7 @@
AC_MSG_NOTICE(Disabling audio functions)
AC_SUBST(NOAUDIOCODECS, 1)
else
@@ -41,7 +41,7 @@
AC_ARG_ENABLE(embeddedgsm,
[ --enable-embeddedgsm embed GSM codec via static linking],
-@@ -260,7 +260,7 @@
+@@ -268,7 +268,7 @@
if test "x$GSM" != "x"; then
ENDLDLIBS="$ENDLDLIBS -lgsm"
fi
@@ -50,7 +50,7 @@
fi
fi
-@@ -281,7 +281,7 @@
+@@ -289,7 +289,7 @@
AC_MSG_NOTICE(Disabling video functions)
AC_SUBST(NOVIDEO, 1)
else
@@ -59,7 +59,7 @@
fi
dnl ########################################################################
-@@ -297,7 +297,7 @@
+@@ -305,7 +305,7 @@
fi
if test "$enable_h224" = "yes" ; then
H323_H224=1
@@ -68,7 +68,7 @@
else
H323_H224=
AC_MSG_NOTICE(Disabling H.224)
-@@ -317,7 +317,7 @@
+@@ -325,7 +325,7 @@
fi
if test "$enable_h230" = "yes" ; then
H323_H230=1
@@ -77,7 +77,7 @@
else
H323_H230=
AC_MSG_NOTICE(Disabling H.230)
-@@ -337,7 +337,7 @@
+@@ -345,7 +345,7 @@
fi
if test "$enable_h235" = "yes" ; then
H323_H235=1
@@ -86,7 +86,7 @@
else
H323_H235=
AC_MSG_NOTICE(Disabling H.235.6)
-@@ -357,7 +357,7 @@
+@@ -389,7 +389,7 @@
fi
if test "$enable_h239" = "yes" ; then
H323_H239=1
@@ -95,7 +95,7 @@
else
H323_H239=
AC_MSG_NOTICE(Disabling H.239)
-@@ -377,7 +377,7 @@
+@@ -409,7 +409,7 @@
fi
if test "$enable_h248" = "yes" ; then
H323_H248=1
@@ -104,7 +104,7 @@
else
H323_H248=
AC_MSG_NOTICE(Disabling H.248)
-@@ -397,7 +397,7 @@
+@@ -429,7 +429,7 @@
fi
if test "$enable_h249" = "yes" ; then
H323_H249=1
@@ -113,7 +113,7 @@
else
H323_H249=
AC_MSG_NOTICE(Disabling H.249)
-@@ -417,7 +417,7 @@
+@@ -449,7 +449,7 @@
fi
if test "$enable_h341" = "yes" ; then
H323_H341=1
@@ -122,7 +122,7 @@
else
H323_H341=
AC_MSG_NOTICE(Disabling H.341)
-@@ -437,7 +437,7 @@
+@@ -469,7 +469,7 @@
fi
if test "$enable_h350" = "yes" ; then
H323_H350=1
@@ -131,7 +131,7 @@
else
H323_H350=
AC_MSG_NOTICE(Disabling H.350)
-@@ -457,7 +457,7 @@
+@@ -489,7 +489,7 @@
fi
if test "$enable_h450" = "yes" ; then
H323_H450=1
@@ -140,7 +140,7 @@
else
H323_H450=
AC_MSG_NOTICE(Disabling H.450)
-@@ -477,7 +477,7 @@
+@@ -509,7 +509,7 @@
fi
if test "$enable_h460" = "yes" ; then
H323_H460=1
@@ -149,7 +149,7 @@
else
H323_H460=
AC_MSG_NOTICE(Disabling H.460)
-@@ -497,7 +497,7 @@
+@@ -529,7 +529,7 @@
fi
if test "$enable_h4609" = "yes" ; then
H323_h4609=1
@@ -158,7 +158,7 @@
else
H323_h4609=
AC_MSG_NOTICE(Disabling H.460.9)
-@@ -517,7 +517,7 @@
+@@ -549,7 +549,7 @@
fi
if test "$enable_h46017" = "yes" ; then
H323_H46017=1
@@ -167,7 +167,7 @@
else
H323_H46017=
AC_MSG_NOTICE(Disabling H.460.17)
-@@ -537,7 +537,7 @@
+@@ -569,7 +569,7 @@
fi
if test "$enable_h46018" = "yes" ; then
H323_H46018=1
@@ -176,7 +176,7 @@
else
H323_H46018=
AC_MSG_NOTICE(Disabling H.460.18/.19)
-@@ -557,7 +557,7 @@
+@@ -589,7 +589,7 @@
fi
if test "$enable_h46019m" = "yes" ; then
H323_H46019M=1
@@ -185,7 +185,7 @@
else
H323_H46019M=
AC_MSG_NOTICE(Disabling H.460.19 RTP multiplexing)
-@@ -577,7 +577,7 @@
+@@ -609,7 +609,7 @@
fi
if test "$enable_h46023" = "yes" ; then
H323_H46023=1
@@ -194,7 +194,7 @@
else
H323_H46023=
AC_MSG_NOTICE(Disabling H.460.23/.24)
-@@ -597,7 +597,7 @@
+@@ -649,7 +649,7 @@
fi
if test "$enable_h460p" = "yes" ; then
H323_H460P=1
@@ -203,7 +203,7 @@
else
H323_H460P=
AC_MSG_NOTICE(Disabling H.460 Presence)
-@@ -617,7 +617,7 @@
+@@ -709,7 +709,7 @@
fi
if test "$enable_h501" = "yes" ; then
H323_H501=1
@@ -212,7 +212,7 @@
else
H323_H501=
AC_MSG_NOTICE(Disabling H.501)
-@@ -638,7 +638,7 @@
+@@ -730,7 +730,7 @@
if test "$enable_t38" = "yes" ; then
AC_MSG_NOTICE(Enabling T.38)
H323_T38=1
@@ -221,7 +221,7 @@
else
H323_T38=
AC_MSG_NOTICE(Disabling T.38)
-@@ -661,7 +661,7 @@
+@@ -753,7 +753,7 @@
AC_MSG_NOTICE(Disabling T.120)
else
H323_T20=1
@@ -230,7 +230,7 @@
fi
AC_SUBST(H323_T120)
-@@ -678,7 +678,7 @@
+@@ -770,7 +770,7 @@
fi
if test "$enable_gnugk" = "yes" ; then
H323_GNUGK=1
@@ -239,7 +239,7 @@
else
H323_GNUGK=
AC_MSG_NOTICE(Disabling GnuGk NAT)
-@@ -698,7 +698,7 @@
+@@ -790,7 +790,7 @@
fi
if test "$enable_file" = "yes" ; then
H323_FILE=1
@@ -248,12 +248,3 @@
else
H323_FILE=
AC_MSG_NOTICE(Disabling File Transfer)
-@@ -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)
-- AC_DEFINE(P_HAS_UPAD128_T)
-+ AC_DEFINE(P_HAS_UPAD128_T, ,[type upad128_t available])
- else
- AC_MSG_RESULT(no)
- fi
Modified: openh323/trunk/debian/patches/ixjuser.h.patch
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/ixjuser.h.patch?rev=10160&op=diff
==============================================================================
--- openh323/trunk/debian/patches/ixjuser.h.patch (original)
+++ openh323/trunk/debian/patches/ixjuser.h.patch Sat May 11 00:49:11 2013
@@ -1,7 +1,9 @@
Author: Kilian Krause <kilian at debian.org>
Description: Fix compilation of IXJ
---- /dev/null
-+++ b/include/linux/ixjuser.h
+Index: h323plus-1.25.0~dfsg/include/linux/ixjuser.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ h323plus-1.25.0~dfsg/include/linux/ixjuser.h 2013-02-02 16:53:27.000000000 +1100
@@ -0,0 +1,719 @@
+#ifndef __LINUX_IXJUSER_H
+#define __LINUX_IXJUSER_H
Modified: openh323/trunk/debian/patches/notrace.patch
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/notrace.patch?rev=10160&op=diff
==============================================================================
--- openh323/trunk/debian/patches/notrace.patch (original)
+++ openh323/trunk/debian/patches/notrace.patch Sat May 11 00:49:11 2013
@@ -1,8 +1,10 @@
Author: Kilian Krause <kilian at debian.org>
Description: Fix directory naming of notrace OBJDIR to have just one 'n'
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -109,10 +109,6 @@ include $(OPENH323DIR)/openh323u.mak
+Index: h323plus-1.25.0~dfsg/src/Makefile
+===================================================================
+--- h323plus-1.25.0~dfsg.orig/src/Makefile 2013-02-02 16:53:14.000000000 +1100
++++ h323plus-1.25.0~dfsg/src/Makefile 2013-02-02 16:53:14.000000000 +1100
+@@ -37,10 +37,6 @@
STDCCFLAGS += -fno-strict-aliasing
OH323_OBJDIR = $(OH323_LIBDIR)/$(PT_OBJBASE)
Modified: openh323/trunk/debian/patches/printon_with_notrace.patch
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/printon_with_notrace.patch?rev=10160&op=diff
==============================================================================
--- openh323/trunk/debian/patches/printon_with_notrace.patch (original)
+++ openh323/trunk/debian/patches/printon_with_notrace.patch Sat May 11 00:49:11 2013
@@ -1,8 +1,10 @@
Author: Kilian Krause <kilian at debian.org>
Description: Remove -DPASN_NOPRINTON from the CCFLAGS.
---- a/openh323u.mak.in
-+++ b/openh323u.mak.in
-@@ -248,7 +248,7 @@ OH323_LIBDIR = $(OPENH323DIR)/lib
+Index: h323plus-1.25.0~dfsg/openh323u.mak.in
+===================================================================
+--- h323plus-1.25.0~dfsg.orig/openh323u.mak.in 2013-02-02 16:53:21.000000000 +1100
++++ h323plus-1.25.0~dfsg/openh323u.mak.in 2013-02-02 16:53:21.000000000 +1100
+@@ -81,7 +81,7 @@
endif # OH323_LIBDIR
ifeq ($(NOTRACE), 1)
More information about the Pkg-voip-commits
mailing list