[Pkg-voip-commits] r10216 - in /openh323/trunk/debian: changelog control libh323-1.24.0.install libh323-1.25.0.install patches/IsH46019Multiplexed.patch patches/fix_autoconf patches/ptlib-pkgconfig patches/series

msp at alioth.debian.org msp at alioth.debian.org
Sat Jun 1 13:16:43 UTC 2013 

Author: msp
Date: Sat Jun  1 13:16:42 2013
New Revision: 10216

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10216
Log:
* NEW package libh323-1.25.0 - match-soname 
* Refreshed patch fix_autoconf
* Update Standards-Version: 3.9.4 - no further changes

Added:
    openh323/trunk/debian/libh323-1.25.0.install
      - copied unchanged from r10159, openh323/trunk/debian/libh323-1.24.0.install
    openh323/trunk/debian/patches/IsH46019Multiplexed.patch
Removed:
    openh323/trunk/debian/libh323-1.24.0.install
Modified:
    openh323/trunk/debian/changelog
    openh323/trunk/debian/control
    openh323/trunk/debian/patches/fix_autoconf
    openh323/trunk/debian/patches/ptlib-pkgconfig
    openh323/trunk/debian/patches/series

Modified: openh323/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/changelog?rev=10216&op=diff
==============================================================================
--- openh323/trunk/debian/changelog (original)
+++ openh323/trunk/debian/changelog Sat Jun  1 13:16:42 2013
@@ -1,9 +1,12 @@
-h323plus (1.25.0~dfsg-1) UNRELEASED; urgency=low
+h323plus (1.25.0~dfsg-1) experimental; urgency=low
 
   * New Upstream Release 
+  * NEW package libh323-1.25.0 - match-soname 
   * quilt refresh debian/patches
-
- -- Mark Purcell <msp at debian.org>  Sat, 02 Feb 2013 16:50:00 +1100
+  * Refreshed patch fix_autoconf
+  * Update Standards-Version: 3.9.4 - no further changes
+
+ -- Mark Purcell <msp at debian.org>  Sat, 01 Jun 2013 23:16:21 +1000
 
 h323plus (1.24.0~dfsg2-1) unstable; urgency=low
 

Modified: openh323/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/control?rev=10216&op=diff
==============================================================================
--- openh323/trunk/debian/control (original)
+++ openh323/trunk/debian/control Sat Jun  1 13:16:42 2013
@@ -7,12 +7,12 @@
  dpkg-dev (>= 1.13.19), libpt-dev (>= 2.10.1), 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
+Standards-Version: 3.9.4
 Homepage: http://www.h323plus.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-voip/openh323/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/openh323/trunk/
 
-Package: libh323-1.24.0
+Package: libh323-1.25.0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: H.323 aka VoIP library
@@ -26,7 +26,7 @@
 Package: libh323plus-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libh323-1.24.0 (= ${binary:Version}), libssl-dev, libpt-dev
+Depends: ${misc:Depends}, libh323-1.25.0 (= ${binary:Version}), libssl-dev, libpt-dev
 Conflicts: libopenh323-dev
 Replaces: libopenh323-dev
 Description: H.323 aka VoIP library development files
@@ -42,7 +42,7 @@
 Section: debug
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends}, libh323-1.24.0 (= ${binary:Version})
+Depends: ${misc:Depends}, libh323-1.25.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.

Added: openh323/trunk/debian/patches/IsH46019Multiplexed.patch
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/IsH46019Multiplexed.patch?rev=10216&op=file
==============================================================================
--- openh323/trunk/debian/patches/IsH46019Multiplexed.patch (added)
+++ openh323/trunk/debian/patches/IsH46019Multiplexed.patch Sat Jun  1 13:16:42 2013
@@ -1,0 +1,14 @@
+Description: h323.cxx:2625: error: 'IsH46019Multiplexed' was not declared in this scope
+URL: http://ftp.openbsd.org/ports/net/h323plus/patches/patch-src_h323_cxx 
+
+--- a/src/h323.cxx.orig	Wed Jan 16 08:57:50 2013
++++ b/src/h323.cxx	Wed Jan 16 08:57:40 2013
+@@ -2621,7 +2621,7 @@ PBoolean H323Connection::OnNatDetected()
+ }
+ 
+ void H323Connection::DisableNATSupport() { 
+-#if H323_H460
++#ifdef H323_H46018
+     if (!IsH46019Multiplexed())
+ #endif
+         NATsupport = false;

Modified: openh323/trunk/debian/patches/fix_autoconf
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/fix_autoconf?rev=10216&op=diff
==============================================================================
--- openh323/trunk/debian/patches/fix_autoconf (original)
+++ openh323/trunk/debian/patches/fix_autoconf Sat Jun  1 13:16:42 2013
@@ -2,8 +2,8 @@
 Description: minor fixes to fix newer versions of autoconf
 Index: h323plus-1.25.0~dfsg/plugins/configure.ac
 ===================================================================
---- 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
+--- h323plus-1.25.0~dfsg.orig/plugins/configure.ac	2013-06-01 22:18:42.000000000 +1000
++++ h323plus-1.25.0~dfsg/plugins/configure.ac	2013-06-01 22:18:42.000000000 +1000
 @@ -474,7 +474,7 @@
                    )
                    ],
@@ -15,8 +15,8 @@
  AC_LANG_POP([C++])
 Index: h323plus-1.25.0~dfsg/configure.ac
 ===================================================================
---- 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
+--- h323plus-1.25.0~dfsg.orig/configure.ac	2013-06-01 22:18:42.000000000 +1000
++++ h323plus-1.25.0~dfsg/configure.ac	2013-06-01 22:20:10.000000000 +1000
 @@ -56,10 +56,10 @@
  
  echo "OpenH323 version is ${OPENH323_VERSION}"
@@ -86,6 +86,15 @@
  else
    H323_H235=
    AC_MSG_NOTICE(Disabling H.235.6)
+@@ -369,7 +369,7 @@
+ fi
+ if test "$enable_h235_256" = "yes" ; then
+   H323_H235_AES256=1
+-  AC_DEFINE(H323_H235_AES256, 1)
++  AC_DEFINE(H323_H235_AES256, 1, [Enable H.235 AES256 support])
+ else
+   H323_H235_AES256=
+   AC_MSG_NOTICE(Disabling H.235.6 (256 bit))
 @@ -389,7 +389,7 @@
  fi
  if test "$enable_h239" = "yes" ; then
@@ -194,6 +203,15 @@
  else
    H323_H46023=
    AC_MSG_NOTICE(Disabling H.460.23/.24)
+@@ -629,7 +629,7 @@
+ fi
+ if test "$enable_h46026" = "yes" ; then
+   H323_H46026=1
+-  AC_DEFINE(H323_H46026, 1)
++  AC_DEFINE(H323_H46026, 1, [Enable H.460.26 support])
+ else
+   H323_H46026=
+   AC_MSG_NOTICE(Disabling H.460.26)
 @@ -649,7 +649,7 @@
  fi
  if test "$enable_h460p" = "yes" ; then
@@ -203,6 +221,24 @@
  else
    H323_H460P=
    AC_MSG_NOTICE(Disabling H.460 Presence)
+@@ -669,7 +669,7 @@
+ fi
+ if test "$enable_h460pre" = "yes" ; then
+   H323_H460PRE=1
+-  AC_DEFINE(H323_H460PRE, 1)
++  AC_DEFINE(H323_H460PRE, 1, [Enable H.460PRE support])
+ else
+   H323_H460PRE=
+   AC_MSG_NOTICE(Disabling H.460 PreEmption)
+@@ -689,7 +689,7 @@
+ fi
+ if test "$enable_h460com" = "yes" ; then
+   H323_H460COM=1
+-  AC_DEFINE(H323_H460COM, 1)
++  AC_DEFINE(H323_H460COM, 1, [Enable H.460COM support])
+ else
+   H323_H460COM=
+   AC_MSG_NOTICE(Disabling H.460 Compat Feature)
 @@ -709,7 +709,7 @@
  fi
  if test "$enable_h501" = "yes" ; then

Modified: openh323/trunk/debian/patches/ptlib-pkgconfig
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/ptlib-pkgconfig?rev=10216&op=diff
==============================================================================
--- openh323/trunk/debian/patches/ptlib-pkgconfig (original)
+++ openh323/trunk/debian/patches/ptlib-pkgconfig Sat Jun  1 13:16:42 2013
@@ -24,7 +24,7 @@
 -          fi
 -        fi
 +        AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, ,
-+		     $PATH:/usr/share/ptlib/make)
++		     $PATH:/usr/share/ptlib/make/)
        fi
      fi
    fi

Modified: openh323/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/openh323/trunk/debian/patches/series?rev=10216&op=diff
==============================================================================
--- openh323/trunk/debian/patches/series (original)
+++ openh323/trunk/debian/patches/series Sat Jun  1 13:16:42 2013
@@ -1,8 +1,9 @@
+IsH46019Multiplexed.patch
+fix_autoconf
 01_libname.patch
 03_Makefile.in.patch
 10_openh323u.mak.patch
 notrace.patch
 printon_with_notrace.patch
 ixjuser.h.patch
-fix_autoconf
 ptlib-pkgconfig

More information about the Pkg-voip-commits mailing list