[Pkg-voip-commits] r8386 - in /opal/branches/opal-3.6/debian: changelog control rules

[dedu-guest at alioth.debian.org]

Author: dedu-guest
Date: Fri May 14 20:00:34 2010
New Revision: 8386

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8386
Log:
* New upstream release
  - add back celt building

Modified:
    opal/branches/opal-3.6/debian/changelog
    opal/branches/opal-3.6/debian/control
    opal/branches/opal-3.6/debian/rules

Modified: opal/branches/opal-3.6/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/opal-3.6/debian/changelog?rev=8386&op=diff
==============================================================================
--- opal/branches/opal-3.6/debian/changelog (original)
+++ opal/branches/opal-3.6/debian/changelog Fri May 14 20:00:34 2010
@@ -2,6 +2,8 @@
 
   [Eugen Dedu]
   * Remove Build-Conflict with its own runtime
+  * New upstream release
+    - add back celt building
 
  -- Mark Purcell <msp at debian.org>  Sat, 01 May 2010 07:37:48 +1000
 

Modified: opal/branches/opal-3.6/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/opal-3.6/debian/control?rev=8386&op=diff
==============================================================================
--- opal/branches/opal-3.6/debian/control (original)
+++ opal/branches/opal-3.6/debian/control Fri May 14 20:00:34 2010
@@ -6,8 +6,7 @@
 Build-Depends: debhelper (>= 7.0.50~), doxygen, autotools-dev, pkg-config,
  libpt-dev (>= 2.6.5),
  libtheora-dev, libgsm1-dev, libspeex-dev, libspeexdsp-dev,
- libcapi20-dev
-Build-Conflicts: libx264-dev, libcelt-dev
+ libcapi20-dev, libcelt-dev
 Standards-Version: 3.8.3
 Homepage: http://www.opalvoip.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/opal/branches/opal-3.6/

Modified: opal/branches/opal-3.6/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/opal-3.6/debian/rules?rev=8386&op=diff
==============================================================================
--- opal/branches/opal-3.6/debian/rules (original)
+++ opal/branches/opal-3.6/debian/rules Fri May 14 20:00:34 2010
@@ -16,8 +16,7 @@
 	if [ -d plugins/audio/iLBC ];then \
 	   echo "ERROR: iLBC code must be removed from upstream sources" ; false ; \
 	fi
-# celt changes its API too fast, so upstream does not keep track with them
-	dh_auto_configure -- --disable-celt
+	dh_auto_configure
 
 override_dh_auto_build:
 	dh_auto_build -- opt docs