[Pkg-voip-commits] r1210 - in openh323/trunk/debian: . patches

Kilian Krause kilian at costa.debian.org
Sun Jan 29 18:15:22 UTC 2006 

Author: kilian
Date: 2006-01-29 18:15:20 +0000 (Sun, 29 Jan 2006)
New Revision: 1210

Removed:
   openh323/trunk/debian/patches/04_vic_p64.dpatch
   openh323/trunk/debian/patches/07_amd64.dpatch
Modified:
   openh323/trunk/debian/changelog
   openh323/trunk/debian/control
   openh323/trunk/debian/patches/00list
   openh323/trunk/debian/patches/10_openh323u.mak.dpatch
   openh323/trunk/debian/rules
Log:
prepare new openh323 for experimental


Modified: openh323/trunk/debian/changelog
===================================================================
--- openh323/trunk/debian/changelog	2006-01-29 16:53:28 UTC (rev 1209)
+++ openh323/trunk/debian/changelog	2006-01-29 18:15:20 UTC (rev 1210)
@@ -1,4 +1,4 @@
-openh323 (1.17.4-1) UNRELEASED; urgency=low
+openh323 (1.17.3-1) UNRELEASED; urgency=low
 
   * New upstream version (Atlas) to match with Phobos release of PWLib.
   * debian/rules: fix OPENH323DIR preset in openh323u.mak.

Modified: openh323/trunk/debian/control
===================================================================
--- openh323/trunk/debian/control	2006-01-29 16:53:28 UTC (rev 1209)
+++ openh323/trunk/debian/control	2006-01-29 18:15:20 UTC (rev 1210)
@@ -8,7 +8,7 @@
 Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14), libopenh323-dev, libopenh323-1.15.3c2, libopenh323-1.15.6
 Standards-Version: 3.6.2
 
-Package: libopenh323-1.15.6
+Package: libopenh323-1.18.0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -29,7 +29,7 @@
 Package: libopenh323-dev
 Section: libdevel
 Architecture: any
-Depends: libopenh323-1.15.6 (= ${Source-Version}), libssl-dev, libpt-dev (>= 1.8.7-2)
+Depends: libopenh323-1.18.0 (= ${Source-Version}), libssl-dev, libpt-dev (>= 1.9.2-1)
 Conflicts: liboh323-dev, libopenh323-dev
 Replaces: liboh323-dev
 Description: H.323 aka VoIP library development files
@@ -64,7 +64,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libopenh323-1.15.6 (= ${Source-Version})
+Depends: libopenh323-1.18.0 (= ${Source-Version})
 Replaces: liboh323-dbg
 Description: H.323 aka VoIP library development debug files
  This package contains the shared and static debug version of the

Modified: openh323/trunk/debian/patches/00list
===================================================================
--- openh323/trunk/debian/patches/00list	2006-01-29 16:53:28 UTC (rev 1209)
+++ openh323/trunk/debian/patches/00list	2006-01-29 18:15:20 UTC (rev 1210)
@@ -1,5 +1,3 @@
 01_openh323u.mak.in
 03_Makefile.in
-04_vic_p64
-07_amd64
 10_openh323u.mak

Deleted: openh323/trunk/debian/patches/04_vic_p64.dpatch
===================================================================
--- openh323/trunk/debian/patches/04_vic_p64.dpatch	2006-01-29 16:53:28 UTC (rev 1209)
+++ openh323/trunk/debian/patches/04_vic_p64.dpatch	2006-01-29 18:15:20 UTC (rev 1210)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## vic_p64.dpatch by Kilian Krause <kk at verfaction.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixed compilation on amd64 caused by int size on 64bit.
-
- at DPATCH@
-diff -urNad openh323-1.15.3/src/vic/p64.cxx /tmp/dpep.Crr7d2/openh323-1.15.3/src/vic/p64.cxx
---- openh323-1.15.3/src/vic/p64.cxx	2003-03-14 08:25:55.000000000 +0100
-+++ /tmp/dpep.Crr7d2/openh323-1.15.3/src/vic/p64.cxx	2005-02-25 02:10:52.000000000 +0100
-@@ -1125,7 +1125,7 @@
- 	 * If input buffer not aligned, prime bit-buffer
- 	 * with 8 bits; otherwise, prime it with a 16.
- 	 */
--	if ((int)bp & 1) {
-+	if ((long)bp & 1) {
- 		bs_ = (u_short*)(bp + 1);
- 		bb_ = *bp;
- 		nbb_ = 8 - sbit;

Deleted: openh323/trunk/debian/patches/07_amd64.dpatch
===================================================================
--- openh323/trunk/debian/patches/07_amd64.dpatch	2006-01-29 16:53:28 UTC (rev 1209)
+++ openh323/trunk/debian/patches/07_amd64.dpatch	2006-01-29 18:15:20 UTC (rev 1210)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_amd64.dpatch by  <kk at nyx.verfaction.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad openh323-1.15.3/plugins/audio/Speex/speexcodec.cxx /tmp/dpep.C9iG68/openh323-1.15.3/plugins/audio/Speex/speexcodec.cxx
---- openh323-1.15.3/plugins/audio/Speex/speexcodec.cxx	2005-02-07 01:41:32.000000000 +0100
-+++ /tmp/dpep.C9iG68/openh323-1.15.3/plugins/audio/Speex/speexcodec.cxx	2005-03-04 17:00:11.174757856 +0100
-@@ -103,7 +103,7 @@
- 
- static void * create_encoder(const struct PluginCodec_Definition * codec)
- {
--  int mode = (int)(codec->userData);
-+  int mode = (long)(codec->userData);
- 
-   struct PluginSpeexContext * context = new PluginSpeexContext;
-   context->bits = new SpeexBits;

Modified: openh323/trunk/debian/patches/10_openh323u.mak.dpatch
===================================================================
--- openh323/trunk/debian/patches/10_openh323u.mak.dpatch	2006-01-29 16:53:28 UTC (rev 1209)
+++ openh323/trunk/debian/patches/10_openh323u.mak.dpatch	2006-01-29 18:15:20 UTC (rev 1210)
@@ -23,10 +23,10 @@
 exit 0
 
 @DPATCH@
-diff -urNad openh323-1.15.3/openh323u.mak.in /tmp/dpep.mEfK44/openh323-1.15.3/openh323u.mak.in
---- openh323-1.15.3/openh323u.mak.in	2005-03-05 00:03:34.277632720 +0100
-+++ /tmp/dpep.mEfK44/openh323-1.15.3/openh323u.mak.in	2005-03-05 00:04:44.049624364 +0100
-@@ -180,6 +181,10 @@
+diff -urNad openh323-1.17.3~/openh323u.mak.in openh323-1.17.3/openh323u.mak.in
+--- openh323-1.17.3~/openh323u.mak.in	2006-01-29 17:51:48.000000000 +0000
++++ openh323-1.17.3/openh323u.mak.in	2006-01-29 17:52:16.000000000 +0000
+@@ -194,6 +194,10 @@
  
  LIBDIRS += $(OPENH323DIR)
  
@@ -37,9 +37,9 @@
  #OH323_SUPPRESS_H235	= 1
  
  OH323_SRCDIR = $(OPENH323DIR)/src
-@@ -317,8 +322,8 @@
+@@ -286,8 +290,8 @@
  LDLIBS     += -lvich263
- endif
+ endif # H323_VICH263
  
 +ifndef RELATED_PKG_MAKEFILE
  $(TARGET) :	$(OH323_LIBDIR)/$(OH323_FILE)
@@ -47,10 +47,10 @@
  ifndef LIBRARY_MAKEFILE
  ifdef DEBUG
  $(OH323_LIBDIR)/$(OH323_FILE):
-@@ -328,6 +333,7 @@
+@@ -297,6 +301,7 @@
  	$(MAKE) -C $(OH323_SRCDIR) opt
- endif
- endif
+ endif # DEBUG
+ endif # LIBRARY_MAKEFILE
 +endif
  
  # End of file

Modified: openh323/trunk/debian/rules
===================================================================
--- openh323/trunk/debian/rules	2006-01-29 16:53:28 UTC (rev 1209)
+++ openh323/trunk/debian/rules	2006-01-29 18:15:20 UTC (rev 1210)
@@ -3,7 +3,7 @@
 export DH_COMPAT=4
 
 # Change this on API breakage
-export LIBH323COMPAT=1.15.6
+export LIBH323COMPAT=1.18.0
 
 PACKAGE=libopenh323-$(LIBH323COMPAT)
 
@@ -32,7 +32,7 @@
 build-arch: build-arch-stamp
 
 Makefile: patch-stamp autotools configure
-	./configure $(confflags) --prefix=/usr --enable-plugins
+	./configure $(confflags) --prefix=/usr --enable-plugins --enable-localspeex=no
 
 autotools:
 	-if [ -f config.sub.old ]; then \

More information about the Pkg-voip-commits mailing list