[Pkg-voip-commits] r1039 - asterisk/trunk/debian

[Mark Purcell]

Author: msp
Date: 2005-12-01 17:38:02 +0000 (Thu, 01 Dec 2005)
New Revision: 1039

Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/control
Log:
* asterisk-sounds-main Replaces: asterisk-sounds-extra
  - asterisk-sounds-{main,extra}: file conflict (Closes: #339791)
* Add Build-Depends: libcurl3-dev | libcurl-dev
  - Should build-depend on libcurl3-dev (Closes: #341363)

Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2005-12-01 09:53:39 UTC (rev 1038)
+++ asterisk/trunk/debian/changelog	2005-12-01 17:38:02 UTC (rev 1039)
@@ -1,9 +1,16 @@
 asterisk (1:1.2.0.dfsg-5) unstable; urgency=low
 
+  [ Tzafrir Cohen ]
   * Added bristuff 0.3.0-PRE1
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed, 23 Nov 2005 06:57:22 +0200
+  [ Mark Purcell ]
+  * asterisk-sounds-main Replaces: asterisk-sounds-extra
+    - asterisk-sounds-{main,extra}: file conflict (Closes: #339791)
+  * Add Build-Depends: libcurl3-dev | libcurl-dev
+    - Should build-depend on libcurl3-dev (Closes: #341363)
 
+ -- Mark Purcell <msp at debian.org>  Thu,  1 Dec 2005 17:37:13 +0000
+
 asterisk (1:1.2.0.dfsg-4) unstable; urgency=low
 
   * Fix 50_debian-libgsm.dpatch to apply correctly

Modified: asterisk/trunk/debian/control
===================================================================
--- asterisk/trunk/debian/control	2005-12-01 09:53:39 UTC (rev 1038)
+++ asterisk/trunk/debian/control	2005-12-01 17:38:02 UTC (rev 1039)
@@ -4,7 +4,7 @@
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libgtk1.2-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.2.0-2), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.2.0-release-2), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.0-2), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz
+Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libgtk1.2-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.2.0-2), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.2.0-release-2), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.0-2), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl3-dev | libcurl-dev
 
 Package: asterisk
 Architecture: any
@@ -76,7 +76,7 @@
 Architecture: all
 Recommends: asterisk
 Conflicts: asterisk (<=0.1.12-3), asterisk-sounds (<= 1:1.0.2-1)
-Replaces: asterisk (<=0.4.0-5), asterisk-sounds (<= 1:1.0.2-1)
+Replaces: asterisk (<=0.4.0-5), asterisk-sounds (<= 1:1.0.2-1), asterisk-sounds-extra
 Section: comm
 Description: sound files for asterisk
  Asterisk is an Open Source PBX and telephony toolkit.