[Pkg-icecast-devel] Bug#375253: diff for 2.3.1-3.1 NMU

[Steinar H. Gunderson]

Package: icecast2
Version: 2.3.1-3
Severity: normal
Tags: patch

Hi,

Attached is the diff for my icecast2 2.3.1-3.1 NMU.
-------------- next part --------------
diff -u icecast2-2.3.1/debian/control icecast2-2.3.1/debian/control
--- icecast2-2.3.1/debian/control
+++ icecast2-2.3.1/debian/control
@@ -3,12 +3,13 @@
 Priority: optional
 Maintainer: Debian Icecast team <pkg-icecast-devel at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), dh-buildinfo, libogg-dev (>> 1.0.0), libvorbis-dev (>> 1.0.0), libxslt-dev, libxml2-dev, libcurl3-gnutls-dev, libtheora-dev (>= 0.0.0.alpha5), libtheora-dev (<< 0.0.0.alpha6), libspeex-dev
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0), dh-buildinfo, libogg-dev (>> 1.0.0), libvorbis-dev (>> 1.0.0), libxslt-dev, libxml2-dev, libcurl3-gnutls-dev, libspeex-dev
+Build-Conflicts: libtheora-dev
 Standards-Version: 3.7.1
 
 Package: icecast2
 Architecture: any
-Depends: adduser, ${shlibs:Depends}, libtheora0 (>= 0.0.0.alpha5), libtheora0 (<< 0.0.0.alpha6)
+Depends: adduser, ${shlibs:Depends}
 Recommends: ices2
 Description: Ogg Vorbis and MP3 streaming media server
  Icecast is a streaming media server which currently supports Ogg 
diff -u icecast2-2.3.1/debian/changelog icecast2-2.3.1/debian/changelog
--- icecast2-2.3.1/debian/changelog
+++ icecast2-2.3.1/debian/changelog
@@ -1,3 +1,15 @@
+icecast2 (2.3.1-3.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Disable Theora support (by removing Depends and Build-Depends on
+    libtheora0 and libtheora-dev, adding a Build-Conflicts on libtheora-dev
+    instead); the 0.0.0.alpha6 version is currently too unstable (see
+    #340175), and 0.0.0.alpha5 is no longer in the archive. This fixes both
+    FTBFS (Closes: #373855) and missing dependency (Closes: #373818) problems,
+    but it reopens #308939.
+
+ -- Steinar H. Gunderson <sesse at debian.org>  Sat, 24 Jun 2006 21:06:52 +0200
+
 icecast2 (2.3.1-3) unstable; urgency=low
 
   * Small adjustments to debian/copyright: