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

[Kilian Krause]

Author: kilian
Date: 2006-02-06 19:39:04 +0000 (Mon, 06 Feb 2006)
New Revision: 1242

Modified:
   openh323/trunk/debian/changelog
   openh323/trunk/debian/patches/01_openh323u.mak.in.dpatch
   openh323/trunk/debian/rules
Log:
prepare update for next Atlas release. We should get rid of forcing libs and push this upstream.


Modified: openh323/trunk/debian/changelog
===================================================================
--- openh323/trunk/debian/changelog	2006-02-05 11:05:04 UTC (rev 1241)
+++ openh323/trunk/debian/changelog	2006-02-06 19:39:04 UTC (rev 1242)
@@ -1,9 +1,9 @@
-openh323 (1.17.3-1) UNRELEASED; urgency=low
+openh323 (1.17.4-1) UNRELEASED; urgency=low
 
   * New upstream version (Atlas) to match with Phobos release of PWLib.
   * debian/rules: fix OPENH323DIR preset in openh323u.mak.
 
- -- Kilian Krause <kilian at debian.org>  Sun, 29 Jan 2006 13:58:42 +0100
+ -- Kilian Krause <kilian at debian.org>  Mon,  6 Feb 2006 20:30:38 +0100
 
 openh323 (1.15.6-3) unstable; urgency=high
 

Modified: openh323/trunk/debian/patches/01_openh323u.mak.in.dpatch
===================================================================
--- openh323/trunk/debian/patches/01_openh323u.mak.in.dpatch	2006-02-05 11:05:04 UTC (rev 1241)
+++ openh323/trunk/debian/patches/01_openh323u.mak.in.dpatch	2006-02-06 19:39:04 UTC (rev 1242)
@@ -39,23 +39,3 @@
  OH323_FILE  = lib$(OH323_BASE).$(LIB_SUFFIX)
  
  LDFLAGS	    += -L$(OH323_LIBDIR)
-@@ -257,9 +263,20 @@
- endif
- endif
- 
-+ifeq ($(P_SHAREDLIB),0)
-+LDLIBS += -lgsm
-+endif
-+
-+EXTLIBS += -lgsm
-+
- #Allow disabling of speex codec
- ifdef NO_SPEEX
- STDCCFLAGS += -DNO_SPEEX
-+else
-+EXTLIBS += -lspeex
-+ifeq ($(P_SHAREDLIB),0)
-+LDLIBS     += -lspeex
-+endif
- endif
- endif # !Nucleus

Modified: openh323/trunk/debian/rules
===================================================================
--- openh323/trunk/debian/rules	2006-02-05 11:05:04 UTC (rev 1241)
+++ openh323/trunk/debian/rules	2006-02-06 19:39:04 UTC (rev 1242)
@@ -32,7 +32,7 @@
 build-arch: build-arch-stamp
 
 Makefile: patch-stamp autotools configure
-	CFLAGS=-I$(PWD)/include ./configure $(confflags) --prefix=/usr --enable-plugins --enable-localspeex=no
+	./configure $(confflags) --prefix=/usr --enable-plugins
 
 autotools:
 	-if [ -f config.sub.old ]; then \