[Pkg-voip-commits] r8004 - in /opal/trunk/debian: changelog control

[msp at alioth.debian.org]

Author: msp
Date: Mon Feb  1 17:09:33 2010
New Revision: 8004

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8004
Log:
Build-Conflicts: libcelt-dev

Modified:
    opal/trunk/debian/changelog
    opal/trunk/debian/control

Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=8004&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Mon Feb  1 17:09:33 2010
@@ -1,6 +1,5 @@
-opal (3.6.6~dfsg-4) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
+opal (3.6.6~dfsg-4) unstable; urgency=low
+
   [ Eugen Dedu ]
   * Disable celt codec, since celt is changing its API and upstream
     source does not compile with the new 0.7.0 celt release (Closes: #556832)
@@ -8,7 +7,10 @@
   * Remove unuseful libavcodec-dev from Build-Depends (it does not bring
     any new encoder and hurts non-official packages).
 
- -- Mark Purcell <msp at debian.org>  Mon, 12 Oct 2009 08:22:40 +1100
+  [ Mark Purcell ]
+  * Build-Conflicts: libcelt-dev
+
+ -- Mark Purcell <msp at debian.org>  Mon, 01 Feb 2010 17:30:21 +0100
 
 opal (3.6.6~dfsg-3) unstable; urgency=low
 

Modified: opal/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/control?rev=8004&op=diff
==============================================================================
--- opal/trunk/debian/control (original)
+++ opal/trunk/debian/control Mon Feb  1 17:09:33 2010
@@ -5,10 +5,10 @@
 Uploaders: Mark Purcell <msp at debian.org>, Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
 Build-Depends: debhelper (>= 7), cdbs, dpatch, doxygen, autotools-dev, pkg-config,
  libpt-dev (>= 2.6.5),
- libtheora-dev, libgsm1-dev, libspeex-dev, libspeexdsp-dev, libcelt-dev,
+ libtheora-dev, libgsm1-dev, libspeex-dev, libspeexdsp-dev,
  libcapi20-dev
 Build-Conflicts: libopal3.6.6, libopal3.6.4, libopal3.6.3, libopal3.6.1, libopal3.4.2, libopal3.4.1, libopal3.3-beta1, libopal-snapshot-dev, libopal-dev, libopal-2.2, libopal-2.2.0, libopal-2.2-ptrace, libopal-2.2-develop,
- libx264-dev
+ libx264-dev, libcelt-dev
 Standards-Version: 3.8.3
 Homepage: http://www.opalvoip.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/opal/trunk/