[Pkg-voip-commits] r1243 - in opal/trunk/debian: . patches

[Kilian Krause]

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

Removed:
   opal/trunk/debian/patches/00list
   opal/trunk/debian/patches/01_speex.dpatch
   opal/trunk/debian/patches/beta-version.dpatch
Modified:
   opal/trunk/debian/changelog
   opal/trunk/debian/rules
Log:
more testing for next Phobos release.


Modified: opal/trunk/debian/changelog
===================================================================
--- opal/trunk/debian/changelog	2006-02-06 19:39:04 UTC (rev 1242)
+++ opal/trunk/debian/changelog	2006-02-06 19:44:39 UTC (rev 1243)
@@ -1,5 +1,5 @@
-opal (2.1.2-1) experimental; urgency=low
+opal (2.1.3-1) UNRELEASED; urgency=low
 
   * Initial release.
 
- -- Kilian Krause <kilian at debian.org>  Sat, 21 Jan 2006 23:59:50 +0000
+ -- Kilian Krause <kilian at debian.org>  Mon,  6 Feb 2006 20:44:26 +0100

Deleted: opal/trunk/debian/patches/00list
===================================================================
--- opal/trunk/debian/patches/00list	2006-02-06 19:39:04 UTC (rev 1242)
+++ opal/trunk/debian/patches/00list	2006-02-06 19:44:39 UTC (rev 1243)
@@ -1,2 +0,0 @@
-beta-version
-01_speex

Deleted: opal/trunk/debian/patches/01_speex.dpatch
===================================================================
--- opal/trunk/debian/patches/01_speex.dpatch	2006-02-06 19:39:04 UTC (rev 1242)
+++ opal/trunk/debian/patches/01_speex.dpatch	2006-02-06 19:44:39 UTC (rev 1243)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_speex.dpatch by Kilian Krause <kilian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad opal-2.1.2~/src/codec/speexcodec.cxx opal-2.1.2/src/codec/speexcodec.cxx
---- opal-2.1.2~/src/codec/speexcodec.cxx	2006-01-14 10:40:16.000000000 +0000
-+++ opal-2.1.2/src/codec/speexcodec.cxx	2006-01-29 18:27:41.000000000 +0000
-@@ -162,7 +162,7 @@
- 
- extern "C" {
- #if OPAL_SYSTEM_SPEEX
--#include <speex.h>
-+#include <speex/speex.h>
- #else
- #include "speex/libspeex/speex.h"
- #endif

Deleted: opal/trunk/debian/patches/beta-version.dpatch
===================================================================
--- opal/trunk/debian/patches/beta-version.dpatch	2006-02-06 19:39:04 UTC (rev 1242)
+++ opal/trunk/debian/patches/beta-version.dpatch	2006-02-06 19:44:39 UTC (rev 1243)
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## beta-version.dpatch by Kilian Krause <kilian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Minor cleanup to get around version foo until we have a final release.
-
- at DPATCH@
-diff -urNad opal-2.1.2~/opal_inc.mak.in opal-2.1.2/opal_inc.mak.in
---- opal-2.1.2~/opal_inc.mak.in	2005-12-06 06:34:10.000000000 +0000
-+++ opal-2.1.2/opal_inc.mak.in	2006-01-23 22:31:37.000000000 +0000
-@@ -97,10 +97,10 @@
- 
- 
--OPAL_BASE  = opal_$(PLATFORM_TYPE)_$(OPAL_SUFFIX)
-+OPAL_BASE  = opal
--OPAL_FILE  = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
-+OPAL_FILE  = lib$(OPAL_BASE).$(LIB_SUFFIX)
- 
- LDFLAGS	    += -L$(OPAL_LIBDIR)
--LDLIBS	    := -l$(OPAL_BASE)$(LIB_TYPE) $(LDLIBS)
-+LDLIBS	    := -l$(OPAL_BASE) $(LDLIBS)
- 
- STDCCFLAGS  += -I$(OPAL_INCDIR)
- 
-diff -urNad opal-2.1.2~/version.h opal-2.1.2/version.h
---- opal-2.1.2~/version.h	2006-01-23 22:31:08.000000000 +0000
-+++ opal-2.1.2/version.h	2006-01-23 22:31:14.000000000 +0000
-@@ -36,7 +36,7 @@
- 
- #define MAJOR_VERSION 2
- #define MINOR_VERSION 1
--#define BUILD_TYPE    BetaCode
-+#define BUILD_TYPE    ReleaseCode
- #define BUILD_NUMBER 2
- 
- 

Modified: opal/trunk/debian/rules
===================================================================
--- opal/trunk/debian/rules	2006-02-06 19:39:04 UTC (rev 1242)
+++ opal/trunk/debian/rules	2006-02-06 19:44:39 UTC (rev 1243)
@@ -27,12 +27,12 @@
 endif
 
 
-build: build-arch #build-indep
+build: build-arch build-indep
 
 build-arch: build-arch-stamp
 
 Makefile: patch-stamp autotools configure
-	./configure $(confflags) --prefix=/usr --enable-localspeex=no
+	./configure $(confflags) --prefix=/usr 
 
 autotools:
 	-if [ -f config.sub.old ]; then \