--- icecast2-2.3.2.orig/debian/NEWS
+++ icecast2-2.3.2/debian/NEWS
@@ -0,0 +1,8 @@
+icecast2 (2.0.0-1) unstable; urgency=low
+
+  * Icecast2 now uses username "icecast2" instead of the earlier
+    "icecast", to avoid problems with both icecast and icecast2
+    installed concurrently on the same machine.
+    Groupname is still "icecast".
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 26 Jan 2004 06:30:26 +0100
--- icecast2-2.3.2.orig/debian/cdbs/1/rules/copyright-check.mk
+++ icecast2-2.3.2/debian/cdbs/1/rules/copyright-check.mk
@@ -0,0 +1,97 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2005-2008 Jonas Smedegaard <dr@jones.dk>
+# Description: Check for changes to copyright notices in source
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_copyright-check
+_cdbs_rules_copyright-check := 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), devscripts (>= 2.10.7)
+
+# Set to yes to fail on changed/new hints are found
+#DEB_COPYRIGHT_CHECK_STRICT := yes
+
+# Single regular expression for files to include or ignore
+DEB_COPYRIGHT_CHECK_REGEX = .*
+DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(debian/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?)$
+
+pre-build:: debian/stamp-copyright-check
+
+debian/stamp-copyright-check:
+	@echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...'
+
+# Perl in shell in make requires extra care:
+#  * Single-quoting ('...') protects against shell expansion
+#  * Double-dollar ($$) expands to plain dollar ($) in make
+	licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
+		| LC_ALL=C perl -e \
+	'$$n=0; while (<>) {'\
+	'	s/[^[:print:]]//g;'\
+	'	if (/^([^:\s][^:]+):[\s]+(\S.*?)\s*$$/) {'\
+	'		$$files[$$n]{name}=$$1;'\
+	'		$$files[$$n]{license}=$$2;'\
+	'	};'\
+	'	if (/^\s*\[Copyright:\s*(\S.*?)\s*\]/) {'\
+	'		$$files[$$n]{copyright}=$$1;'\
+	'	};'\
+	'	/^$$/ and $$n++;'\
+	'};'\
+	'foreach $$file (@files) {'\
+	'	$$file->{license} =~ s/\s*\(with incorrect FSF address\)//;'\
+	'	$$file->{license} =~ s/\s+\(v([^)]+) or later\)/-$$1+/;'\
+	'	$$file->{copyright} =~ s/(?<=(\b\d{4}))(?{$$y=$$^N})\s*[,-]\s*((??{$$y+1}))\b/-$$2/g;'\
+	'	$$file->{copyright} =~ s/(?<=\b\d{4})\s*-\s*\d{4}(?=\s*-\s*(\d{4})\b)//g;'\
+	'	$$pattern = "$$file->{license} [$$file->{copyright}]";'\
+	'	push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\
+	'};'\
+	'foreach $$pattern ( sort {'\
+	'			@{$$patternfiles{$$b}} <=> @{$$patternfiles{$$a}}'\
+	'			||'\
+	'			$$a cmp $$b'\
+	'		} keys %patternfiles ) {'\
+	'	print "$$pattern: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\
+	'};'\
+		> debian/copyright_newhints
+	@patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C sort -u | grep . -c -`"; \
+		echo "Found $$patterncount different copyright and licensing combinations."
+	@if [ ! -f debian/copyright_hints ]; then touch debian/copyright_hints; fi
+	@newstrings=`diff -u debian/copyright_hints debian/copyright_newhints | sed '1,2d' | egrep '^\+' - | sed 's/^\+//'`; \
+		if [ -n "$$newstrings" ]; then \
+			echo "$(if $(DEB_COPYRIGHT_CHECK_STRICT),ERROR,WARNING): The following new or changed copyright notices discovered:"; \
+			echo; \
+			echo "$$newstrings"; \
+			echo; \
+			echo "To fix the situation please do the following:"; \
+			echo "  1) Investigate the above changes and update debian/copyright as needed"; \
+			echo "  2) Replace debian/copyright_hints with debian/copyright_newhints"; \
+			$(if $(DEB_COPYRIGHT_CHECK_STRICT),exit 1,:); \
+		else \
+			echo 'No new copyright notices found - assuming no news is good news...'; \
+			rm -f debian/copyright_newhints; \
+		fi
+	touch $@
+
+clean::
+	rm -f debian/stamp-copyright-check
+
+endif
--- icecast2-2.3.2.orig/debian/cdbs/1/rules/buildinfo.mk
+++ icecast2-2.3.2/debian/cdbs/1/rules/buildinfo.mk
@@ -0,0 +1,40 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2004-2006 Jonas Smedegaard <dr@jones.dk>
+# Description: Generate and include build information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_buildinfo
+_cdbs_rules_buildinfo = 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), dh-buildinfo
+
+common-install-arch common-install-indep:: debian/stamp-buildinfo
+
+debian/stamp-buildinfo:
+	dh_buildinfo
+	touch debian/stamp-buildinfo
+
+clean::
+	rm -f debian/stamp-buildinfo
+
+endif
--- icecast2-2.3.2.orig/debian/cdbs/1/rules/upstream-tarball.mk
+++ icecast2-2.3.2/debian/cdbs/1/rules/upstream-tarball.mk
@@ -0,0 +1,139 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2007-2008 Jonas Smedegaard <dr@jones.dk>
+# Description: Convenience rules for dealing with upstream tarballs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_upstream_tarball
+_cdbs_rules_upstream_tarball := 1
+
+include $(_cdbs_rules_path)/buildvars.mk$(_cdbs_makefile_suffix)
+
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.39)
+
+# Prefix for upstream location of all upstream tarballs (mandatory!)
+#DEB_UPSTREAM_URL = 
+
+DEB_UPSTREAM_PACKAGE = $(DEB_SOURCE_PACKAGE)
+DEB_UPSTREAM_TARBALL_VERSION = $(if $(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE)),$(DEB_UPSTREAM_VERSION:$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG)=),$(DEB_UPSTREAM_VERSION))
+DEB_UPSTREAM_TARBALL_EXTENSION = tar.gz
+# Checksum to ensure integrity of downloadeds using get-orig-source (optional)
+#DEB_UPSTREAM_TARBALL_MD5 = 
+
+DEB_UPSTREAM_WORKDIR = ../tarballs
+
+# Perl regexp to change locally used string into that in upstream URL and srcdir
+#DEB_UPSTREAM_TARBALL_VERSION_MANGLE
+cdbs_upstream_tarball_version_mangled = $(if $(strip $(DEB_UPSTREAM_TARBALL_VERSION_MANGLE)),$(shell echo '$(DEB_UPSTREAM_TARBALL_VERSION)' | perl -pe '$(DEB_UPSTREAM_TARBALL_VERSION_MANGLE)'),$(DEB_UPSTREAM_TARBALL_VERSION))
+
+# Base filename (without extension) as used in upstream URL
+DEB_UPSTREAM_TARBALL_BASENAME = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled)
+
+# Base directory within tarball
+DEB_UPSTREAM_TARBALL_SRCDIR = $(DEB_UPSTREAM_PACKAGE)-$(cdbs_upstream_tarball_version_mangled)
+
+# Space-delimited list of directories and files to strip (optional)
+#DEB_UPSTREAM_REPACKAGE_EXCLUDE = CVS .cvsignore doc/rfc*.txt doc/draft*.txt
+DEB_UPSTREAM_REPACKAGE_TAG = dfsg
+DEB_UPSTREAM_REPACKAGE_DELIMITER = ~
+
+cdbs_upstream_tarball = $(DEB_UPSTREAM_TARBALL_BASENAME).$(DEB_UPSTREAM_TARBALL_EXTENSION)
+cdbs_upstream_local_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.$(if $(findstring $(DEB_UPSTREAM_TARBALL_EXTENSION),tgz),tar.gz,$(DEB_UPSTREAM_TARBALL_EXTENSION))
+cdbs_upstream_repackaged_basename = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION)$(DEB_UPSTREAM_REPACKAGE_DELIMITER)$(DEB_UPSTREAM_REPACKAGE_TAG).orig
+cdbs_upstream_uncompressed_tarball = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_TARBALL_VERSION).orig.tar
+
+# # These variables are deprecated
+_cdbs_deprecated_vars += DEB_UPSTREAM_TARBALL DEB_UPSTREAM_LOCAL_TARBALL DEB_UPSTREAM_REPACKAGE_TARBALL
+_cdbs_deprecated_vars += DEB_UPSTREAM_REPACKAGE_EXCLUDES
+DEB_UPSTREAM_REPACKAGE_EXCLUDE += $(DEB_UPSTREAM_REPACKAGE_EXCLUDES)
+
+print-version:
+	@@echo "Debian version:          $(DEB_VERSION)"
+	@@echo "Upstream version:        $(DEB_UPSTREAM_TARBALL_VERSION)"
+
+get-orig-source:
+	@@dh_testdir
+	@@mkdir -p "$(DEB_UPSTREAM_WORKDIR)"
+
+	@if [ ! -s "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \
+		if [ -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ] ; then \
+			rm "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
+		fi ; \
+		echo "Downloading $(cdbs_upstream_local_tarball) from $(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball) ..." ; \
+		wget -nv -T10 -t3 -O "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" "$(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball)" ; \
+	else \
+		echo "Upstream source tarball have been already downloaded: $(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
+	fi
+
+	@md5current=`md5sum "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" | sed -e 's/ .*//'`; \
+	if [ -n "$(DEB_UPSTREAM_TARBALL_MD5)" ] ; then \
+		if [ "$$md5current" != "$(DEB_UPSTREAM_TARBALL_MD5)" ] ; then \
+			echo "Expecting upstream tarball md5sum $(DEB_UPSTREAM_TARBALL_MD5), but $$md5current found" ; \
+			echo "Upstream tarball md5sum is NOT trusted! Possible upstream tarball forge!" ; \
+			echo "Purging downloaded file. Try new download." ; \
+			rm -f "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
+			false ; \
+		else \
+			echo "Upstream tarball is trusted!" ; \
+		fi; \
+	else \
+		echo "Upstream tarball NOT trusted (current md5sum is $$md5current)!" ; \
+	fi
+
+# TODO: Rewrite using make variables like cdbs_upstream_unpack_cmd and
+# DEB_UPSTREAM_SUPPORTED_COMPRESSIONS (recent dpkg supports bz2)
+	@untar="tar -x -C"; \
+	case "$(cdbs_upstream_local_tarball)" in \
+	    *.tar.gz)  unpack="gunzip -c";; \
+	    *.tar.bz2) unpack="bunzip2 -c";    uncompress="bunzip2";; \
+	    *.tar.Z)   unpack="uncompress -c"; uncompress="uncompress";; \
+	    *.zip)     unpack="unzip -q";      uncompress="false";       untar="-d"; nopipe="true";; \
+	    *.tar)     unpack="cat";           uncompress="true";; \
+	    *) echo "Unknown extension for upstream tarball $(cdbs_upstream_local_tarball)"; false;; \
+	esac && \
+	if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ] || [ "$$uncompress" = "false" ]; then \
+		echo "Repackaging tarball ..." && \
+		mkdir -p "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" && \
+		if [ -n "$$nopipe" ]; then \
+			$$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" \
+				$$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \
+		else \
+			$$unpack "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" \
+				| $$untar "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" $(patsubst %,--exclude='%',$(DEB_UPSTREAM_REPACKAGE_EXCLUDE)); \
+		fi && \
+		if [ "$(DEB_UPSTREAM_TARBALL_SRCDIR)" != "$(cdbs_upstream_repackaged_basename)" ]; then \
+			mv -T "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(DEB_UPSTREAM_TARBALL_SRCDIR)" "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)/$(cdbs_upstream_repackaged_basename)"; \
+		fi && \
+		if [ -n "$(strip $(DEB_UPSTREAM_REPACKAGE_EXCLUDE))" ]; then \
+			GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_repackaged_basename).tar.gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_repackaged_basename)"; \
+		else \
+			GZIP=-9 tar -b1 -czf "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball).gz" -C "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)" "$(cdbs_upstream_repackaged_basename)"; \
+		fi && \
+		echo "Cleaning up" && \
+		rm -rf "$(DEB_UPSTREAM_WORKDIR)/$(DEB_UPSTREAM_REPACKAGE_TAG)"; \
+	elif [ -n "$$uncompress" ]; then \
+		echo "Recompressing tarball ..." && \
+		$$uncompress "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)"; \
+		gzip -9 "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_uncompressed_tarball)"; \
+	fi
+
+DEB_PHONY_RULES += print-version get-orig-source
+
+endif
--- icecast2-2.3.2.orig/debian/control
+++ icecast2-2.3.2/debian/control
@@ -0,0 +1,22 @@
+Source: icecast2
+Section: sound
+Priority: optional
+Maintainer: Debian Icecast team <pkg-icecast-devel@lists.alioth.debian.org>
+Uploaders: Guillaume Pellerin <yomguy@altern.org>, Romain Beauxis <toots@rastageeks.org>, Ying-Chun Liu <grandpaul@gmail.com>, Jonas Smedegaard <dr@jones.dk>
+Build-Depends: cdbs (>= 0.4.39), autotools-dev, devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), libtool, automake1.10, autoconf, dh-buildinfo, debhelper (>= 5.0.44), libogg-dev (>> 1.0.0), libvorbis-dev (>= 1.2.0.dfsg-3.1~bpo40+1), libxslt1-dev | libxslt-dev, libxml2-dev, libcurl3-gnutls-dev, libtheora-dev (>= 1.0~beta3-1~bpo40+1), libspeex-dev
+Vcs-Svn: svn://svn.debian.org/svn/pkg-icecast/icecast2/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-icecast/icecast2/trunk
+Standards-Version: 3.7.3
+Homepage: http://www.icecast.org/
+
+Package: icecast2
+Architecture: any
+Depends: adduser, ${shlibs:Depends}
+Recommends: ices2
+Description: Ogg Vorbis and MP3 streaming media server
+ Icecast is a streaming media server which currently supports Ogg 
+ Vorbis and MP3 audio streams. It can be used to create an Internet 
+ radio station or a privately running jukebox and many things in 
+ between. It is very versatile in that new formats can be added 
+ relatively easily and supports open standards for communication and 
+ interaction.
--- icecast2-2.3.2.orig/debian/README.cdbs-tweaks
+++ icecast2-2.3.2/debian/README.cdbs-tweaks
@@ -0,0 +1,111 @@
+CDBS tweak
+==========
+
+CDBS is great. In some corner cases, however, some parts of CDBS
+sometimes needs a few tweaks to work optimally.
+
+This is a collection of such tweaks. The goal is for these tweaks to be
+absorbed into upstream CDBS. We just haven't found time yet to discuss
+them at the CDBS developers' mailinglist. And possible we do not all
+agree that the tweaks are so great - therefore this "staging area".
+
+If you found this file below debian/ subdir in a source package, most
+probably only a subset of the below mentioned tweaks are relevant and
+have been shipped with the package. The repository of all these tweaks
+is here: svn://svn.debian.org/build-common/people/js/overlay/
+
+Web access: http://svn.debian.org/wsvn/build-common/people/js/overlay/
+
+
+
+New buildinfo rule
+------------------
+
+See package description for "buildinfo" for more info.
+
+
+
+Improved support for multiple compilations
+------------------------------------------
+
+Create and clean builddir _after_ resolving per-package DEB_BUILDDIR.
+
+Honour per-package DEB_BUILDDIR in makefile and autotools classes.
+
+Support multiple build flavors in makefile and autotools classes.
+
+
+
+Various improvements to python-distutils class
+----------------------------------------------
+
+Use full path to Python interpreter (Python Policy section 1.3.2).
+
+Add CDBS_BUILD_DEPENDS to old policy method.
+
+Fix CDBS_BUILD_DEPENDS in new policy methods to only depend on debhelper
+when actually used.
+
+Fix DEB_PYTHON_SIMPLE_PACKAGES sometimes installed twice (and only one
+of them honouring DEB_PYTHON_COMPILE_VERSION).
+
+Unify install path using new DEB_PYTHON_DESTDIR.
+
+Quote install path.
+
+
+
+New python-autotools class
+--------------------------
+
+Handle autotools-based Python packaging.
+
+
+
+New python-sugar class
+----------------------
+
+Handle packaging of Sugar activities.
+
+
+
+New copyright-check rule
+------------------------
+
+Refuse to build if the source is found to contain different copyright
+info than earlier builds.
+
+
+
+New kernelpatches rule
+----------------------
+
+Small wrapper around dh-kpatches, taking care of build-dependencies too.
+
+
+
+New routines for handling upstream tarball
+------------------------------------------
+
+Rules and variables to help downloading, validating and repackaging
+upstream tarball.
+
+Implements the rules print-version and get-orig-source commonly used
+for group-maintained packages with Debian-specific patches maintained in
+SVN or some other VCS, and automated fetching virgin upstream tarball
+(possibly massaged after download e.g. to strip non-DFSG material).
+
+
+
+Support for custom BTS info
+---------------------------
+
+Include BTS control info found in debian/*.bts files, or alternatively
+redirect bug reports to the email address defined in DEB_BTS_EMAIL.
+
+
+
+New dict class
+--------------
+
+Rules for packaging ispell, aspell, myspell and wordlist dictionaries.
--- icecast2-2.3.2.orig/debian/rules
+++ icecast2-2.3.2/debian/rules
@@ -0,0 +1,51 @@
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2004-2007 Jonas Smedegaard <dr@jones.dk>
+
+DEB_AUTO_UPDATE_LIBTOOL = pre
+DEB_AUTO_UPDATE_ACLOCAL = 1.10
+DEB_AUTO_UPDATE_AUTOMAKE = 1.10
+DEB_AUTO_UPDATE_AUTOCONF = 2.60
+
+ifneq ($(DEB_MAINTAINER_BUILD),)
+  # Maintainer mode build, enable optional operations
+  DEB_COPYRIGHT_CHECK_STRICT = yes
+  DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
+endif
+
+# See debian/README.cdbs-tweaks for info on local overrides
+include debian/cdbs/1/rules/upstream-tarball.mk
+include debian/cdbs/1/rules/copyright-check.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include debian/cdbs/1/rules/buildinfo.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+DEB_UPSTREAM_PACKAGE = icecast
+DEB_UPSTREAM_URL = http://downloads.xiph.org/releases/icecast/
+DEB_UPSTREAM_TARBALL_MD5 = ff516b3ccd2bcc31e68f460cd316093f
+
+DEB_CONFIGURE_SYSCONFDIR = /etc/icecast2
+DEB_CONFIGURE_EXTRA_FLAGS = --program-transform-name="s/icecast$$/icecast2/"
+DEB_MAKE_INVOKE += PACKAGE=icecast2 docdir=/usr/share/doc/icecast2 pkgdatadir=/usr/share/icecast2
+DEB_INSTALL_DIRS_icecast2 = var/log/icecast2
+DEB_INSTALL_MANPAGES_icecast2 = debian/icecast2.1
+
+# Debian has a central copy of the GPL, no need to distribute again
+common-binary-post-install-arch::
+	rm -f $(DEB_DESTDIR)/usr/share/doc/icecast2/COPYING
+
+# Move XSLT templates and CSS files to /etc and replace with symlinks
+common-binary-post-install-arch::
+	for file in `cd $(DEB_DESTDIR)/usr/share && find icecast2 -type f \( -name *.xsl -or -name *.css \)`; do \
+		mkdir -p $(DEB_DESTDIR)/etc/`dirname $$file`; \
+		mv $(DEB_DESTDIR)/usr/share/$$file $(DEB_DESTDIR)/etc/$$file; \
+		ln -s /etc/$$file $(DEB_DESTDIR)/usr/share/$$file; \
+	done
+
+# Upstream requirements
+#  Icecast is GPL so needs gnutls variant of CURL
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libogg-dev (>> 1.0.0), libvorbis-dev (>> 1.0.0), libxslt1-dev | libxslt-dev, libxml2-dev, libcurl4-gnutls-dev, libtheora-dev (>= 0.0.0.alpha7), libspeex-dev
+
+# Fix double cdbs build-dependencies
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')
--- icecast2-2.3.2.orig/debian/watch
+++ icecast2-2.3.2/debian/watch
@@ -0,0 +1,3 @@
+# Run the "uscan" command to check for upstream updates and more.
+version=3
+http://downloads.us.xiph.org/releases/icecast/icecast-([\d+\.]+|\d+)\.tar\.gz debian svn-upgrade
--- icecast2-2.3.2.orig/debian/icecast2.1
+++ icecast2-2.3.2/debian/icecast2.1
@@ -0,0 +1,24 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.TH ICECAST2 1 "July 28, 2003"
+.SH NAME
+icecast2 \- an MP3/Ogg Vorbis broadcast streaming media server
+.SH SYNOPSIS
+.B icecast2
+-c 
+.RI config.xml
+.SH DESCRIPTION
+\fBicecast2\fP is an audio broadcasting system that streams music in
+Ogg Vorbis and/or MPEG 1 Layer III format.  It accepts stream input
+from sources like ices0 and ices2, and broadcasts to clients like xmms.
+.SH OPTIONS
+\fBicecast2\fP has no command line options, except to specify the location
+of an XML configuration file.  All operational aspects of the software
+are controlled by this XML configuration file.
+.SH SEE ALSO
+The example configuration files, provided with the package documentation
+are the only reliable source of information on this software.
+It is still under very active development;
+documentation will be written when it is possible to do so.
+.SH AUTHOR
+icecast2 was created by the icecast team <team@icecast.org>.
+This manual page was written by Keegan Quinn <ice@thebasement.org>.
--- icecast2-2.3.2.orig/debian/shlibs.local
+++ icecast2-2.3.2/debian/shlibs.local
@@ -0,0 +1,2 @@
+libvorbis 0 libvorbis0a (>= 1.2.0.dfsg-3.1~bpo40+1)
+libtheora 0 libtheora0  (>= 1.0~beta3-1~bpo40+1)
--- icecast2-2.3.2.orig/debian/changelog
+++ icecast2-2.3.2/debian/changelog
@@ -0,0 +1,626 @@
+icecast2 (2.3.2-2~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for etch-backports.
+  * Forced build-dep on libtheora and libvorbis to backported version. 
+  * Build-dep on libcurl3-gnutls-dev instead of libcurl4-gnutls-dev
+  * Added debian/shlibs.local to enforce binary-dep on backported
+    libraries (libvorbis and libtheora)
+
+ -- Romain Beauxis <toots@rastageeks.org>  Mon, 21 Jul 2008 21:08:54 +0200
+
+icecast2 (2.3.2-2) unstable; urgency=low
+
+  * Update local cdbs snippets:
+    + Always do copyright-check, but only warn by default.
+    + Update dependency cleanup to strip cdbs 0.4.27 (not 0.4.27-1).
+  * Update debian/copyright-hints.
+  * Bump debhelper compatibility level to 6.
+  * Semi-auto-update debian/control to update build-dependencies:
+      DEB_MAINTAINER_BUILD=yes fakeroot debian/rules clean
+
+ -- Jonas Smedegaard <dr@jones.dk>  Tue, 24 Jun 2008 00:47:34 +0200
+
+icecast2 (2.3.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Dropped patches applied upstream
+  * Added Short-Description and $network dependency to 
+    init script
+  * Changed build dep from libcurl3-gnutls-dev to libcurl4-gnutls-dev
+  * Updated debian/copyright_hints
+
+ -- Romain Beauxis <toots@rastageeks.org>  Tue, 03 Jun 2008 10:16:43 -0400
+
+icecast2 (2.3.1-7) unstable; urgency=low
+
+  [ Romain Beauxis ]
+  * Acknowledge NMU
+  Closes: #460853
+  * Updated Uploaders field
+  * Made copyright check optional, add documentation
+  Closes: #442601
+  * Added a special variable to enable maintainer mode builds,
+    with, for now, copyright check and control file update. Use:
+      DEB_MAINTAINER_BUILD=yes (svn|dpkg)-buildpackage (...)
+    and similar..
+  * Bumped standards to 3.7.3 (no changes)
+
+  [ Jonas Smedegaard ]
+  * Update local cdbs snippets:
+    + Major improvements to update-tarball (but none of them affecting
+      this current packaging).
+    + Major improvements to copyright-check, including new versioned
+      build-dependency on devscripts.  Update debian/copyright_hints.
+    + Drop buildcore.mk override.  Set DEB_AUTO_UPDATE_DEBIAN_CONTROL
+      directly instead when needed.
+    + Update debian/README.cdbs-tweaks
+  * Drop leading XS- from Vcs-* fields in debian/control.
+  * Fix watch file to invoke svn-upgrade (not uupdate).
+  * Semi-auto-update debian/control to update build-dependencies:
+    DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
+
+ -- Jonas Smedegaard <dr@jones.dk>  Fri, 11 Apr 2008 02:07:38 +0200
+
+icecast2 (2.3.1-6.1) unstable; urgency=low
+
+  * Non-maintainer upload to solve release goal.
+  * Add LSB dependency header to init.d scripts (Closes: #460853).
+
+ -- Petter Reinholdtsen <pere@debian.org>  Sat, 29 Mar 2008 19:39:17 +0100
+
+icecast2 (2.3.1-6) unstable; urgency=low
+
+  * Acknowledge NMU. Closes: bug#416771, #423778, thanks to Luk Claes
+    and Michael Ablassmeier.
+  * Add patch 1002 to fix generating /admin/streamlist.txt with missing
+    mount tags. Closes: bug#405524, thanks to Yauhen Kharuzhy.
+  * Isolate CURL bugfix from -5.1 NMU as patch 1003.
+  * Update local cdbs tweaks:
+    + Add new local cdbs tweak upstream.tarball.mk to add a
+      get-orig-source target and more.
+    + Replace auto-update.mk with overloading buildcore.mk.
+    + Emit list of suspects if new copyrights are found.
+    + Check for copyrights at pre-build (at clean we might run before
+      actual cleanup has finished).
+    + Various improvements to update-tarball.
+    + document the tweaks in debian/README.cdbs-tweaks.
+  * Resolve all build-dependencies using cdbs, and cleanup duplicates.
+  * Bump up to using automake1.10 (from 1.7).
+  * Bump up to using debhelper compatibility level 5 (from 4).
+  * Build-depend on libxslt1-dev (and on virtual libxslt-dev only as
+    fallback).
+  * Add XS-Vcs-Svn and XS-Vcs-Browser fields to debian/control.
+  * Move Homepage to own field (from pseudo-field in long description).
+  * Semi-auto-update debian/control:
+      DEB_BUILD_OPTIONS=cdbs-autoupdate fakeroot debian/rules pre-build
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sat, 29 Sep 2007 15:27:17 +0200
+
+icecast2 (2.3.1-5.1) unstable; urgency=high
+
+  * Non-maintainer upload during BSP.
+  * Fix unconditional use of passwd package in postrm (Closes: #416771).
+  * Fix FTBFS due to use of obsolete curl API (Closes: #423778).
+
+ -- Luk Claes <luk@debian.org>  Sat, 19 May 2007 14:45:18 +0200
+
+icecast2 (2.3.1-5) unstable; urgency=low
+
+  * Add patch to syncronize with upstream SVN as of 20060620 (r11419).
+    Reasoning: No new upstream release for quite some time, and changes
+    in SVN seems to only be small tightenings, not new risky features.
+    + Safer use of ICECAST_VERSION_STRING.
+    + Fix (void) function prototypes.
+    + Fix various leaks.
+    + Fail on unrecognized codec, dropping source instead of looping.
+    + Improved slave handling.
+    + Prevent races by locking when modifying content.
+    + Fix possible bad pointer dereference when processing new clients.
+    + Consistently use compat.h (and drop os.h).
+  * Enable cdbs update of automake, as the above change Makefile.am's.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sat, 19 Aug 2006 21:57:36 +0200
+
+icecast2 (2.3.1-4) unstable; urgency=low
+
+  * Acknowledge NMU. Closes: bug#375253, #373855, #373818.
+  * Build-depend on libtheora-dev again (but at least alpha7), as later
+    suggested in the above bug#375253. Closes: bug#308939.
+  * Bump standards-version to 3.7.2 (no changes needed).
+  * Enable cdbs relibtoolization, fixing linkage problem causing FTBFS.
+    Closes: bug#346507 (thanks to "J.H.M. Dassen (Ray)"
+    <fsmla@xinara.org>).
+  * Add patch to avoid autotools messing with debian subdir.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sat, 19 Aug 2006 20:11:00 +0200
+
+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@debian.org>  Sat, 24 Jun 2006 21:06:52 +0200
+
+icecast2 (2.3.1-3) unstable; urgency=low
+
+  * Small adjustments to debian/copyright:
+    + Remove note on "FSF address adjusted" (it was stripped instead).
+    + Correct path to src/httpp (not src/httpd).
+    + Mention src/httpp licensing info only once.
+    + Info for src/httpp covers src/timing too.
+  * Update local cdbs snippet auto-update.mk:
+    + Drop unneeded buildcore.mk inclusion.
+    + Avoid problematic build-essential build-dependency.
+  * Update local cdbs snippet copyright-check.mk:
+    + Support changing the scope of files found.
+    + Treat all found files as non-binary.
+  * Bump to standards-version 3.7.1 (no changes needed).
+  * Semi-auto-update debian/rules.
+  * Tightening (build-)dependency on libtheora to avoid the crashing
+    bugs mentioned in (but unrelated to) bug#340175. This also for sure
+    closes: Bug#308939 (thanks to <j@v2v.cc>).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Fri,  5 May 2006 10:10:01 +0200
+
+icecast2 (2.3.1-2) unstable; urgency=low
+
+  * This package is now team-maintained!
+    + Debian Icecast team <pkg-icecast-devel@lists.alioth.debian.org>
+      maintains the package, with me as uploader.
+    + If you want to help improve the package or want other Icecast-
+      related packages maintained here then drop an email to the above
+      mailinglist!
+  * Move auto-update of debian/control out in reusable cdbs snippet.
+  * Minor update to other cdbs snippets (non-unique cdbs namespace).
+  * Auto-update debian/control, and manually strip build-essential from
+    build-dependencies to not upset ftp-masters.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sat, 17 Dec 2005 21:41:55 +0100
+
+icecast2 (2.3.1-1) unstable; urgency=low
+
+  * New upstream release. Closes: bug#343613 (thanks to Alexander
+    Schories <alexander@schories.com>).
+  * Debian subdir is again stripped from tarball.
+  * Mention homepage (not website) in long description.
+  * Depend on adduser (thanks to lintian).
+  * Add local cdbs snippet copyright-check.mk.
+  * Update debian/copyright to quote less of GPL licenses - to avoid
+    lintian complaining about wrong FSF address.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Fri, 16 Dec 2005 23:08:50 +0100
+
+icecast2 (2.3.0-2) unstable; urgency=low
+
+  * Build-depend on libcurl3-gnutls-dev (not libcurl-dev) to avoid
+    indirectly linking against GPL-unfriendly openssl. This also closes:
+    bug#335891 (thanks to Chris Murton <chris@areti.net>).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Thu, 27 Oct 2005 00:17:54 +0200
+
+icecast2 (2.3.0-1) unstable; urgency=low
+
+  * New upstream release. Closes: bug#332323 (thanks to  Jesus Climent
+    <jesus.climent@hispalinux.es>).
+  * Debian subdir is again stripped from tarball.
+  * Bump up watch file version.
+  * Build-depend on libspeex-dev.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Thu, 13 Oct 2005 09:54:54 +0200
+
+icecast2 (2.2.0-3) unstable; urgency=low
+
+  * Raise to standards version 3.6.2 (no changes needed).
+  * Use cdbs debian/control auto-build, but only when environment
+    includes DEB_BUILD_OPTIONS=update.
+  * Auto-update build-dependencies (and manually rip out build-essential
+    buggily sneaking in).
+  * Fix watch file by simplifying it (seems uscan wrongly parse it as a
+    newer version format).
+  * Build-depend only on virtual package libcurl-dev (not libcurl3-dev).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed, 13 Jul 2005 17:42:57 +0200
+
+icecast2 (2.2.0-2) unstable; urgency=high
+
+  * Depend on netbase (see bug#308401).
+  * Set urgency=high as package fails to install/remove with netbase not
+    present.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Thu,  2 Jun 2005 14:49:29 +0200
+
+icecast2 (2.2.0-1) unstable; urgency=low
+
+  * New upstream release. Closes: bug#286739 (thanks - again - to Andre
+    Tomt <andre@tomt.net>).
+  * Debian subdir is again stripped from tarball, but autotools patching
+    (to aboid complaints about the missing dir) is now in diff. Updated
+    note in debian/copyright.
+  * Build-depend on libtheora-dev (current version is too old but as
+    soon as libtheora is updated it will then get built in).
+  * Updated source location in debian/copyright and debian/watch.
+  * Correct typo in long description.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed, 29 Dec 2004 15:04:17 +0100
+
+icecast2 (2.1.0-1) unstable; urgency=medium
+
+  * New upstream release. Closes: bug#279869 (thanks to Andre Tomt
+    <andre@tomt.net>).
+  * Strip annoying debian subdir from upstream source.
+  * Update debian/copyright:
+    + License is included now (no need to refer to CVS).
+    + Remove stray repeated license above licensing section.
+    + Add note about tarball not being pristine (and explain why).
+    + Use capital "I" in initial introduction to upstream name.
+  * Use generic (but unofficial) buildinfo cdbs snippet.
+  * Drop cleaning up conf/icecast.xml.dist (handled properly upstream
+    now).
+  * Set urgency=medium to hopefully reach sarge.
+  * Correct README.Debian to mention user "icecast2" (not "icecast").
+  * Move and symlink stylesheet to /etc (similar to xslt files).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun,  7 Nov 2004 15:52:50 +0100
+
+icecast2 (2.0.2.debian-3) unstable; urgency=high
+
+  * Fix wrong space in build-depends.
+  * Set urgency=high to hopefully get this compiled (even for sparc)
+    in time for sarge release.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Tue, 26 Oct 2004 14:23:04 +0200
+
+icecast2 (2.0.2.debian-2) unstable; urgency=high
+
+  * Include "endscript" in logrotate rule. Closes: bug#274823 (thanks to
+    Jose Antonio <jose@shaolin.homeip.net>).
+  * Set urgency=high to still push earlier security fix.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon,  4 Oct 2004 11:00:31 +0200
+
+icecast2 (2.0.2.debian-1) unstable; urgency=high
+
+  * New upstream release.
+    + Fixes upstream announced security bug.
+    + Set urgency=high due to the above.
+    + Closes: bug#274320 (thanks to Jeroen Wolffelaar
+      <jeroen@wolffelaar.nl>).
+    + Again - strip non-free win32/ResizableDialog.* from source.
+    + While we are at it, move upstream debian subdirectory off to
+      dist/debian. Hack configure and configure.in to not mess around.
+  * Update location of upstream source in copyright and watch file.
+  * Use more flexible regexp in watch file.
+  * Rename Debian NEWS file in source to get recognized automativally.
+  * Devine man page within rules file.
+  * Drop unneeded preinst (from a time before official Debian where it
+    did not run properly as a daemon?).
+  * Build-depend on libcurl3-dev, and on the virtual package libcurl-dev
+    only as fallback (not mandatory, but aptitude chokes and so will the
+    build daemons as well, I suppose).
+  * Reload (which does a sighup) daemon after logrotate. Closes:
+    bug#265301 (thanks to David Pashley <david@davidpashley.com>).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sat,  2 Oct 2004 11:27:14 +0200
+
+icecast2 (2.0.1.debian-3) unstable; urgency=low
+
+  * Tolerate failure to remove icecast group on purge (it is used by
+    other packages as well, and was badly handled in older unstable
+    packages). This closes: Bug#246263 (thanks to Pete de Zwart
+    <dezwart@froob.net>).
+  * Fix logrotate script. Closes: Bug#249404, #255430 (thanks
+    to Julien Cristau <jcristau@ens-lyon.fr> and Mykola A. Nickishov
+    <mn@mn.com.ua>).
+  * Mention upstream website in long description.
+  * Build-depend on autotools-dev to let cdbs do clever autotools magic.
+  * Stylistic improvements to debian/rules:
+    + Add copyright notice and editor hints at top.
+    + Use only (cdbs-)generic make targets.
+  * Build-depend generically on libxslt-dev and libcurl-dev (instead of
+    libxslt1-dev and libcurl2-dev).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed,  7 Jul 2004 09:32:56 +0200
+
+icecast2 (2.0.1.debian-2) unstable; urgency=low
+
+  * Really add ChangeLog from 2.0.0.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Thu, 20 May 2004 23:03:22 +0200
+
+icecast2 (2.0.1.debian-1) unstable; urgency=medium
+
+  * New upstream release (thanks to Ian Kumlien <pomac@vapor.com>):
+    + According to announcement on website, it "fixes a overflow buffer
+      which can cause server crashes under certain circumstances" so set
+      urgency=medium (the code change is one line only).
+    + Again, remove the non-free win32/ResizableDialog.* as it is
+      still(!) distributed with official source.
+    + Add ChangeLog from 2.0.0 missing from current release.
+  * Register with (and recommend) logrotate. Closes: Bug#299404 (thanks
+    to Julien Cristau <jcristau@ens-lyon.fr>).
+  * Add note to README.Debian about chroots not working with symlinks
+    due to FHS requirements of configuration files located below /etc.
+    Closes: Bug#250056 (thanks to Ian Kumlien <pomac@vapor.com>).
+  * Standards-Version: 3.6.1 (no changes needed).
+  * Explicitly note version in watch file, and add it to TODO.Debian.
+  * Add comment to watch file hinting on how to use it.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Thu, 20 May 2004 21:40:03 +0200
+
+icecast2 (2.0.0.debian-1) unstable; urgency=low
+
+  * Re-release with non-free files (unused with Debian) stripped from
+    source:
+    + Remove non-free win32/ResizableDialog.* from source, and remove
+      its copyright and licensing info from debian/copyright.
+    + Add to debian/copyright GPL info taken from newer CVS, and email
+      from upstream to BTS permitting it to be used also with this
+      earlier release.
+    + This closes: Bug#229720, thanks to upstream and Steve Langasek
+      <vorlon@debian.org>.
+  * Add TODO.Debian with reminder to clean this mess later.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun, 28 Mar 2004 16:02:27 +0200
+
+icecast2 (2.0.0-2) unstable; urgency=low
+
+  * Add group if non-existing.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 26 Jan 2004 16:07:23 +0100
+
+icecast2 (2.0.0-1) unstable; urgency=low
+
+  * New upstream release. Closes: Bug#223645, thanks to Nicholas Humfrey
+    <njh@ecs.soton.ac.uk>.
+  * Use upstream long description, and rearrange short description a
+    bit.
+  * Rewrite debian/copyright:
+    + Note the upstream package name.
+    + Drop Debian-related info also in debian/changelog.
+    + Update location of upstream source.
+    + Replace general copyright and license info (where was it found?
+      See bug#229720) with that of individual files where provided.
+  * Update debian/watch with new location.
+  * Use username icecast2 (instead of icecast also used in the package
+    icecast-server). Add NEWS.Debian with info on the change. Closes:
+    bug#215671, #226807, thanks to Michael Deegan
+    <debbts@cnspc18.murdoch.edu.au> and Robin Lee Powell
+    <rlpowell@digitalkingdom.org>.
+  * Make sure /etc/icecast2 is owned by icecast2 and not world readable.
+    Closes: bug#210860, thanks to Frank Barknecht <fbar@footils.org>.
+  * Install NEWS again (now that NEWS and ChangeLog are different).
+  * Build-depend on libcurl2-dev (again, and hope it works now...).
+    Closes: Bug#222274 thanks to Nicholas Humfrey <njh@ecs.soton.ac.uk>.
+  * Let icecast2 go into background by itself (using -b). Closes:
+    Bug#204061 (and add the actual content of the bugreport - how to
+    bind to a priviledged port by starting as root - to README.Debian),
+    thanks to Jürgen A. Erhard <jae@jerhard.org>.
+  * Let "configure --program-transform-name" rename icecast to icecast2.
+  * Let debhelper create /var/log/icecast2/.
+  * Keep debian/rules comments from showing during build.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Mon, 26 Jan 2004 06:30:26 +0100
+
+icecast2 (1.9+2.0beta3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Taking over maintainership. When Keegan some day comes through the
+    NM process he can take over maintainance.
+  * ChangeLog is provided upstream now, so use that (in favor of NEWS).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Tue, 16 Dec 2003 22:02:25 +0100
+
+icecast2 (1.9+2.0alphasnap2+20030802-1.2) unstable; urgency=low
+
+  * Another sponsor-NMU (forgot to force including source).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun, 17 Aug 2003 10:25:16 +0200
+
+icecast2 (1.9+2.0alphasnap2+20030802-1.1) unstable; urgency=low
+
+  * NMU by sponsor.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun, 17 Aug 2003 01:25:22 +0200
+
+icecast2 (1.9+2.0alphasnap2+20030802-1) unstable; urgency=low
+
+  * Added a 'watch' file to automate tracking of updates.
+  * Now uses dh-buildinfo to store information about the package build
+    environment.  Added a Build-Dependancy to dh-buildinfo.
+  * Removed cdbs/autotools-vars.mk, from cdbs CVS, because a new release
+    was made.
+  * Enabled curl during configure stage, since --disable-curl was recently
+    broken upstream, and potentially broken YP support can be disabled at
+    runtime.
+  * Trimmed ancient upgrade nodes and other cruft, left over from
+    pre-Debian versions, from README.Debian.
+  * Removed some autotools build cruft, since bugs were fixed upstream.
+  * Normalized {preinst,postinst,postrm} filenames to
+    icecast2.{preinst,postinst,postrm}.  Thanks to Emmanuel le Chevoir
+    for this suggestion.
+  * Fixed preinst; was stopping /usr/bin/icecast instead of
+    /usr/bin/icecast2.  Thanks to Emmanuel le Chevoir for this suggestion.
+  * Removed prerm, since it was not serving any purpose.  Thanks to
+    Emmanuel le Chevoir for this suggestion.
+  * Cleaned up postinst: removed old comments, fixed a path typo in the
+    configuration file location change message.
+  * Cleaned up postrm: removed old comments, fixed a typo in the group
+    removal test.
+  * Thanks to Jonas Smedegaard for sponsoring this package, and
+    providing many good suggestions.
+
+ -- Keegan Quinn <ice@thebasement.org>  Sat,  2 Aug 2003 20:28:13 -0700
+
+icecast2 (1.9+2.0alphasnap2+20030720-1.1) unstable; urgency=low
+
+  * NMU by sponsor (still closes: Bug#178160).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Wed, 23 Jul 2003 06:03:42 +0200
+
+icecast2 (1.9+2.0alphasnap2+20030720-1) unstable; urgency=low
+
+  * New daily snapshot build.
+  * Added Build-Dependancy to cdbs, and increased debhelper version
+    requirement as recommended by cdbs README.
+  * Corrected Standards-Version to 3.6.0.  This package now generates
+    no lintian errors.
+  * Updated Recommends for ices to ices2; it was renamed.
+  * Added more information to the long description.
+  * Thanks to Jonas Smedegaard for sponsoring this package.
+  * This revision still closes: #178160 - the last was not uploaded.
+
+ -- Keegan Quinn <ice@thebasement.org>  Mon, 21 Jul 2003 08:55:27 -0700
+
+icecast2 (1.9+2.0alphasnap2+20030714-0.2) unstable; urgency=low
+
+  * Sponsored upload. Closes: Bug#178160.
+  * Switch to cdbs (agreed with maintainer).
+  * Use cdbs autotools-vars.mk from CVS to avoid cross-compiling on same
+    host.
+  * Add build-dependency on libxml2-dev.
+  * Explicitly configure without curl support to avoid building broken
+    YP stuff.
+  * Hack src/Makefile.am to use AM_CFLAGS instead of CFLAGS (which is
+    overridden by cdbs), and add clean rule to avoid invoking automake.
+  * Disable daemon by default and hint about changing passwords before
+    enabling.
+  * Avoid moving config files from pre-Debian times - instead just print
+    a warning if config exists in old location (better mess as little as
+    possible with files not ever claimed to be ours).
+  * Update README.Debian to reflect the above, include note about YP
+    support not compiled in, and remove note regarding adoption.
+  * Strip paths from packaging scripts (they may move around in the
+    future, and if PATH is wrong then something else broken anyway).
+  * Avoid removing unused /usr/share/icecast2 on purge.
+  * Remove icecast group on purge only if empty.
+  * Standards-version 3.6 (no changes needed).
+  * Fix wrong escaping of sed vars in conf/Makefile.
+  * Symlink public files from /usr/share/icecast2 to /etc/icecast2
+    (instead of pointing public root dirs below /etc).
+  * Use upstream config (paths are properly included now).
+
+ -- Jonas Smedegaard <dr@jones.dk>  Sun, 20 Jul 2003 20:19:30 +0200
+
+icecast2 (1.9+2.0alphasnap2+20030714-0.1) unstable; urgency=low
+
+  * New daily snapshot build.
+  * Updated versioning scheme to reflect (as well as possible) that the 
+    source is a daily snapshot now, not CVS.
+
+ -- Keegan Quinn <ice@thebasement.org>  Mon, 14 Jul 2003 19:39:58 -0700
+
+icecast2 (1.9+2.0alphacvs030704-0.1) unstable; urgency=low
+
+  * Constructed a build script to completely automate the construction
+    of the 'pristine' tarball from CVS.  This doesn't really effect the
+    contents of the package, just makes it easier for me to rebuild.
+  * New CVS source.
+  * Removed Build-Dependancy on libcurl2-dev; packages built without this
+    library present will not have YP functionality, which is okay for
+    now since it's badly broken.
+  * Updated the default configuration file, including some new options
+    recently added upstream.
+  * Added a number of tweaks to clean up and rearrange new configuration
+    and documentation added to upstream install target.
+  * Moved the configuration file from /etc/icecast.xml to
+    /etc/icecast2/icecast.xml.  See README.Debian.
+  * Nice ugly version number to reflect that upstream calls this the 2.0
+    alpha branch, without potentially introducing the need for an epoch.
+
+ -- Keegan Quinn <ice@thebasement.org>  Thu,  3 Jul 2003 23:46:56 -0700
+
+icecast2 (0.00.cvs030529-0.1) unstable; urgency=low
+
+  * New CVS source.
+  * Removed unnecessary debconf stuff.
+  * Added README.Debian.
+  * Path updates:
+    - /usr/share/icecast to /usr/share/icecast2,
+    - /var/log/icecast to /var/log/icecast2,
+    - /usr/bin/icecast to /usr/bin/icecast2,
+    - /usr/share/man/man8/icecast.8.gz to /usr/share/man/man8/icecast2.8.gz.
+
+ -- Keegan Quinn <ice@thebasement.org>  Wed, 29 May 2003 22:53:21 -0700
+
+icecast2 (0.00.cvs030403-0.2) unstable; urgency=low
+
+  * Tried to make the default configuration more understandable. 
+
+ -- Keegan Quinn <ice@thebasement.org>  Fri,  4 Apr 2003 10:55:27 -0800
+
+icecast2 (0.00.cvs030403-0.1) unstable; urgency=low
+
+  * New CVS source.
+  * Minor changes to postrm.
+
+ -- Keegan Quinn <ice@thebasement.org>  Thu,  3 Apr 2003 16:05:09 -0800
+
+icecast2 (0.00.cvs030401-0.7) unstable; urgency=low
+
+  * Minor changes to postinst.
+  * Added --background flag to initscript, since this version of icecast
+    does not yet run detached.
+
+ -- Keegan Quinn <ice@thebasement.org>  Thu,  3 Apr 2003 14:24:19 -0800
+
+icecast2 (0.00.cvs030401-0.6) unstable; urgency=low
+
+  * Added Debianized configuration file.
+  * Created and set ownership of /var/log/icecast and /usr/share/icecast.
+
+ -- Keegan Quinn <ice@thebasement.org>  Thu,  3 Apr 2003 14:15:11 -0800
+
+icecast2 (0.00.cvs030401-0.5) unstable; urgency=low
+
+  * Attempt at making debconf work properly.
+
+ -- Keegan Quinn <ice@thebasement.org>  Thu,  3 Apr 2003 12:07:16 -0800
+
+icecast2 (0.00.cvs030401-0.4) unstable; urgency=low
+
+  * Minor edits to init.d script.
+  * Added bits to create and remove system accounts appropriately.
+  * Typo fix in the manual page.
+
+ -- Keegan Quinn <ice@thebasement.org>  Thu,  3 Apr 2003 11:06:48 -0800
+
+icecast2 (0.00.cvs030401-0.3) unstable; urgency=low
+
+  * Finished init.d script and manual page.
+  * Updated postinst to handle rc*.d links.
+  * Package is now lintian/linda clean.
+
+ -- Keegan Quinn <ice@thebasement.org>  Wed,  2 Apr 2003 16:29:18 -0800
+
+icecast2 (0.00.cvs030401-0.2) unstable; urgency=low
+
+  * Updated copyright (replacing dh_make template).
+  * Fixed duplicate conffiles.
+
+ -- Keegan Quinn <ice@thebasement.org>  Wed,  2 Apr 2003 16:18:02 -0800
+
+icecast2 (0.00.cvs030401-0.1) unstable; urgency=low
+
+  * New CVS source.
+  * Lots of packaging cleanup.
+  * Initial stab at manual page and init.d script.
+
+ -- Keegan Quinn <ice@thebasement.org>  Wed,  2 Apr 2003 10:25:56 -0800
+
+icecast2 (0.00.cvs030320-0.1) unstable; urgency=low
+
+  * New CVS source.
+  * Automated CVS original source creation.
+
+ -- Keegan Quinn <ice@thebasement.org>  Thu, 20 Mar 2003 12:58:49 -0800
+
+icecast2 (0.00.cvs030315-0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Keegan Quinn <ice@thebasement.org>  Sun, 16 Mar 2003 13:45:23 -0800
--- icecast2-2.3.2.orig/debian/copyright_hints
+++ icecast2-2.3.2/debian/copyright_hints
@@ -0,0 +1,250 @@
+*No copyright* UNKNOWN []: AUTHORS
+	ChangeLog
+	HACKING
+	Makefile.am
+	NEWS
+	README
+	TODO
+	admin/Makefile.am
+	admin/listclients.xsl
+	admin/listmounts.xsl
+	admin/manageauth.xsl
+	admin/moveclients.xsl
+	admin/response.xsl
+	admin/stats.xsl
+	admin/updatemetadata.xsl
+	conf/Makefile.am
+	conf/icecast_minimal.xml.in
+	conf/icecast_urlauth.xml.in
+	config.h.in
+	configure.in
+	doc/Index.hhk
+	doc/Makefile.am
+	doc/icecast2.hhc
+	doc/icecast2.hhp
+	doc/icecast2_admin.html
+	doc/icecast2_basicsetup.html
+	doc/icecast2_changes.html
+	doc/icecast2_config_file.html
+	doc/icecast2_faq.html
+	doc/icecast2_glossary.html
+	doc/icecast2_introduction.html
+	doc/icecast2_listenerauth.html
+	doc/icecast2_relay.html
+	doc/icecast2_stats.html
+	doc/icecast2_win32.html
+	doc/icecast2_yp.html
+	doc/index.html
+	doc/index_win32.html
+	doc/listener_auth1.jpg
+	doc/listener_auth2.jpg
+	doc/listener_auth3.jpg
+	doc/relay.png
+	doc/stats1.jpg
+	doc/style.css
+	doc/win32_section1.html
+	doc/win32_section2.html
+	doc/win32_section3.html
+	doc/windowtitle.jpg
+	examples/Makefile.am
+	icecast.spec
+	m4/acx_pthread.m4
+	m4/ogg.m4
+	m4/speex.m4
+	m4/theora.m4
+	m4/vorbis.m4
+	m4/xiph_compiler.m4
+	m4/xiph_curl.m4
+	m4/xiph_net.m4
+	m4/xiph_openssl.m4
+	m4/xiph_types.m4
+	m4/xiph_xml2.m4
+	mkinstalldirs
+	src/Makefile.am
+	src/TODO
+	src/avl/BUILDING
+	src/avl/Makefile.am
+	src/avl/README
+	src/avl/TODO
+	src/avl/test.c
+	src/httpp/Makefile.am
+	src/httpp/README
+	src/httpp/TODO
+	src/httpp/httpp.c
+	src/httpp/httpp.h
+	src/log/Makefile.am
+	src/log/log.c
+	src/log/log.h
+	src/log/test.c
+	src/net/BUILDING
+	src/net/Makefile.am
+	src/net/README
+	src/net/TODO
+	src/net/resolver.h
+	src/net/test_resolver.c
+	src/thread/BUILDING
+	src/thread/Makefile.am
+	src/thread/README
+	src/thread/TODO
+	src/timing/BUILDING
+	src/timing/Makefile.am
+	src/timing/README
+	src/timing/TODO
+	src/timing/timing.c
+	src/timing/timing.h
+	web/Makefile.am
+	web/auth.xsl
+	web/corner_bottomleft.jpg
+	web/corner_bottomright.jpg
+	web/corner_topleft.jpg
+	web/corner_topright.jpg
+	web/icecast.png
+	web/key.gif
+	web/key.png
+	web/server_version.xsl
+	web/status.xsl
+	web/status2.xsl
+	web/style.css
+	web/tunein.png
+	win32/ConfigTab.cpp
+	win32/ConfigTab.h
+	win32/Icecast2win.clw
+	win32/Icecast2win.rc
+	win32/Icecast2winDlg.cpp
+	win32/Icecast2winDlg.h
+	win32/Makefile.am
+	win32/StatsTab.cpp
+	win32/StatsTab.h
+	win32/Status.cpp
+	win32/Status.h
+	win32/StdAfx.cpp
+	win32/StdAfx.h
+	win32/TRAYNOT.h
+	win32/TabCtrlSSL.cpp
+	win32/TabCtrlSSL.h
+	win32/TabPageSSL.cpp
+	win32/TabPageSSL.h
+	win32/Traynot.cpp
+	win32/black.bmp
+	win32/colors.h
+	win32/credits.bmp
+	win32/icecast.ico
+	win32/icecast2logo2.bmp
+	win32/icecast2title.bmp
+	win32/icecastService.cpp
+	win32/res/Icecast2win.rc2
+	win32/res/Makefile.am
+	win32/resource.h
+	win32/stopped.bmp
+UNKNOWN [2000-2004, Jack Moffitt <jack@xiph.org]: src/admin.c
+	src/admin.h
+	src/auth.c
+	src/auth.h
+	src/auth_htpasswd.c
+	src/auth_htpasswd.h
+	src/auth_url.h
+	src/cfgfile.c
+	src/cfgfile.h
+	src/client.c
+	src/client.h
+	src/compat.h
+	src/connection.c
+	src/connection.h
+	src/event.c
+	src/event.h
+	src/format.c
+	src/format.h
+	src/format_flac.c
+	src/format_flac.h
+	src/format_kate.c
+	src/format_kate.h
+	src/format_midi.c
+	src/format_midi.h
+	src/format_mp3.c
+	src/format_mp3.h
+	src/format_ogg.c
+	src/format_ogg.h
+	src/format_skeleton.c
+	src/format_skeleton.h
+	src/format_speex.h
+	src/format_theora.c
+	src/format_theora.h
+	src/format_vorbis.c
+	src/format_vorbis.h
+	src/fserve.c
+	src/fserve.h
+	src/global.c
+	src/global.h
+	src/logging.c
+	src/logging.h
+	src/main.c
+	src/md5.h
+	src/refbuf.c
+	src/refbuf.h
+	src/sighandler.c
+	src/sighandler.h
+	src/slave.c
+	src/slave.h
+	src/source.c
+	src/source.h
+	src/stats.c
+	src/stats.h
+	src/util.c
+	src/util.h
+	src/xslt.c
+	src/xslt.h
+	src/yp.c
+	src/yp.h
+GENERATED FILE [1994-2002]: Makefile.in
+	admin/Makefile.in
+	conf/Makefile.in
+	doc/Makefile.in
+	examples/Makefile.in
+	src/Makefile.in
+	src/avl/Makefile.in
+	src/httpp/Makefile.in
+	src/log/Makefile.in
+	src/net/Makefile.in
+	src/thread/Makefile.in
+	src/timing/Makefile.in
+	web/Makefile.in
+	win32/Makefile.in
+	win32/res/Makefile.in
+*No copyright* GENERATED FILE []: conf/icecast.xml.in
+	conf/icecast_shoutcast_compat.xml.in
+	src/avl/avl.dsp
+	win32/Icecast2win.cpp
+	win32/Icecast2win.dsp
+	win32/Icecast2win.dsw
+	win32/Icecast2win.h
+	win32/icecast.dsp
+	win32/icecast2.iss
+	win32/icecast2_console.dsp
+	win32/icecast2_console.dsw
+	win32/icecastService.dsp
+UNKNOWN [1991 Free Software Foundation, Inc]: src/avl/COPYING
+	src/httpp/COPYING
+	src/net/COPYING
+	src/thread/COPYING
+	src/timing/COPYING
+GPL GENERATED FILE [1999-2000 Free Software Foundation, Inc]: compile
+	depcomp
+LGPL-2+ [1999-2000 the icecast team <team@icecast.org>]: src/thread/thread.c
+	src/thread/thread.h
+UNKNOWN [2000-2004, Jack Moffitt <jack@xiph.org>]: src/auth_url.c
+	src/format_speex.c
+GENERATED FILE [1992-1996, 1998-2001]: configure
+GPL GENERATED FILE [1996-1997, 1999-2000, 2002 Free Software Foundation, Inc]: missing
+GPL-2+ GENERATED FILE [1996-2001, 2003-2006]: ltmain.sh
+GPL-2+ [1999 the icecast team]: src/net/sock.h
+LGPL-2+ [1999 the icecast team <team@icecast.org>]: src/net/resolver.c
+LGPL-2+ [1999 the icecast team]: src/net/sock.c
+Public domain [2000-2004, Jack Moffitt <jack@xiph.org / is claimed]: src/md5.c
+UNKNOWN [1989, 1991 Free Software Foundation, Inc / the software, and]: COPYING
+UNKNOWN [1991 by the Massachusetts Institute of Technology]: install-sh
+UNKNOWN [1995 by Sam Rushing <rushing@nightmare.com>]: src/avl/avl.h
+UNKNOWN [1995-1997 by Sam Rushing <rushing@nightmare.com>]: src/avl/avl.c
+UNKNOWN [1996-2004]: aclocal.m4
+UNKNOWN [=zO>u~9p]: doc/masterslave.png
+UNKNOWN [PE5 /  .'PEIV5 / W4PE5 / k IVBfIVPE kk 5]: win32/running.bmp
+UNKNOWN [cz9dwLUr>V51q[9[OOh4dK/M/+juxsE0YD*DsDnCj,G2h<K:W?TYTp*OT-r=[)@^sp=tuLt).G3=Z.?} / )E\.qc!G}SuH:>Xsc3pkH1k9!F$mm2(g|cmF]: examples/icecast_auth-1.0.tar.gz
--- icecast2-2.3.2.orig/debian/compat
+++ icecast2-2.3.2/debian/compat
@@ -0,0 +1 @@
+5
--- icecast2-2.3.2.orig/debian/icecast2.logrotate
+++ icecast2-2.3.2/debian/icecast2.logrotate
@@ -0,0 +1,10 @@
+/var/log/icecast2/*.log {
+	weekly
+	missingok
+	rotate 7
+	postrotate
+		invoke-rc.d --quiet icecast2 reload > /dev/null
+	endscript
+	compress
+	notifempty
+}
--- icecast2-2.3.2.orig/debian/TODO.Debian
+++ icecast2-2.3.2/debian/TODO.Debian
@@ -0,0 +1,4 @@
+  * Cleanup debian/copyright with newer release:
+    + Remove email note about use of CVS info
+    + Check if stripping non-free win32 stuff is still needed
+    + Change watch file back to automatic "debian" version
--- icecast2-2.3.2.orig/debian/README.Debian
+++ icecast2-2.3.2/debian/README.Debian
@@ -0,0 +1,30 @@
+icecast2 for Debian
+-------------------
+
+In the Debian packaging the configuration files have been symlinked from
+the upstream location below /usr/share to /etc. This is needed to
+satisfy FHS (/usr/share are for static content only).
+If running icecast2 in a chroot environment, beware that the symlinks to
+/etc will break. A possible (untestet!) solution might be to manually
+put the configuration files back below /usr/share - and revert the hack
+again before updating the package!
+
+ -- Jonas Smedegaard <dr@jones.dk>  Thu, 20 May 2004 21:04:27 +0200
+
+
+It is recommended to run icecast under a dedicated user account, which only
+has access to write the log files.  The Debian package creates such an
+account, named 'icecast2', and uses it by default, but you are free to
+reconfigure it and remove the account.
+
+Edit /etc/default/icecast2 to change the init-script configuration.
+
+It is possible (but discouraged for security reasons) to bind to a
+priviledged port (like standard web port 80). Edit /etc/init.d/icecast2
+to not change userid and instead set the correct userid and group in
+/etc/icecast2/icecast2.xml. Beware that this way you rely on the
+icecast2 binary to properly drop priviledges (instead of the much more
+thoroughly audited start-stop-daemon). Thanks to Jürgen A. Erhard
+<jae@jerhard.org> for the tip.
+
+ -- Keegan Quinn <ice@thebasement.org>
--- icecast2-2.3.2.orig/debian/control.in
+++ icecast2-2.3.2/debian/control.in
@@ -0,0 +1,22 @@
+Source: icecast2
+Section: sound
+Priority: optional
+Maintainer: Debian Icecast team <pkg-icecast-devel@lists.alioth.debian.org>
+Uploaders: Guillaume Pellerin <yomguy@altern.org>, Romain Beauxis <toots@rastageeks.org>, Ying-Chun Liu <grandpaul@gmail.com>, Jonas Smedegaard <dr@jones.dk>
+Build-Depends: @cdbs@
+Vcs-Svn: svn://svn.debian.org/svn/pkg-icecast/icecast2/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-icecast/icecast2/trunk
+Standards-Version: 3.7.3
+Homepage: http://www.icecast.org/
+
+Package: icecast2
+Architecture: any
+Depends: adduser, ${shlibs:Depends}
+Recommends: ices2
+Description: Ogg Vorbis and MP3 streaming media server
+ Icecast is a streaming media server which currently supports Ogg 
+ Vorbis and MP3 audio streams. It can be used to create an Internet 
+ radio station or a privately running jukebox and many things in 
+ between. It is very versatile in that new formats can be added 
+ relatively easily and supports open standards for communication and 
+ interaction.
--- icecast2-2.3.2.orig/debian/patches/1001_autotools_avoid_debian-subdir.patch
+++ icecast2-2.3.2/debian/patches/1001_autotools_avoid_debian-subdir.patch
@@ -0,0 +1,24 @@
+diff -ruN icecast2-2.3.1.orig/Makefile.am icecast2-2.3.1/Makefile.am
+--- icecast2-2.3.1.orig/Makefile.am	2005-09-23 23:17:44.000000000 +0200
++++ icecast2-2.3.1/Makefile.am	2006-08-19 21:29:12.000000000 +0200
+@@ -3,7 +3,7 @@
+ AUTOMAKE_OPTIONS = 1.6 foreign dist-zip
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = src conf debian doc web admin win32 examples
++SUBDIRS = src conf doc web admin win32 examples
+ 
+ EXTRA_DIST = HACKING m4/acx_pthread.m4 m4/ogg.m4 \
+     m4/theora.m4 m4/vorbis.m4 m4/speex.m4 \
+diff -ruN icecast2-2.3.1.orig/configure.in icecast2-2.3.1/configure.in
+--- icecast2-2.3.1.orig/configure.in.orig	2005-11-30 19:16:36.000000000 +0100
++++ icecast2-2.3.1/configure.in	2006-08-19 21:50:34.000000000 +0200
+@@ -146,7 +146,7 @@
+ AC_SUBST(PROFILE)
+ AC_SUBST(ICECAST_OPTIONAL)
+ 
+-AC_OUTPUT([Makefile conf/Makefile debian/Makefile src/Makefile src/avl/Makefile
++AC_OUTPUT([Makefile conf/Makefile src/Makefile src/avl/Makefile
+ src/httpp/Makefile src/thread/Makefile src/log/Makefile
+ src/net/Makefile src/timing/Makefile doc/Makefile web/Makefile
+ admin/Makefile win32/Makefile win32/res/Makefile examples/Makefile])
--- icecast2-2.3.2.orig/debian/patches/README
+++ icecast2-2.3.2/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
--- icecast2-2.3.2.orig/debian/patches/series
+++ icecast2-2.3.2/debian/patches/series
@@ -0,0 +1 @@
+1001_autotools_avoid_debian-subdir.patch
--- icecast2-2.3.2.orig/debian/icecast2.postinst
+++ icecast2-2.3.2/debian/icecast2.postinst
@@ -0,0 +1,48 @@
+#! /bin/sh
+# postinst script for icecast2
+
+set -e
+
+case "$1" in
+    configure)
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+	exit 0
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# Move configuration file to current location, if an old one exists
+# and the init.d script configuration file was updated
+if [ -f /etc/icecast.xml ] && grep -q /etc/icecast2/ /etc/default/icecast2; then
+    echo "It seems you have an old configuration lying around at"
+    echo "/etc/icecast.xml. You will need to manually merge with"
+    echo "the current configuration at /etc/icecast2/icecast.xml."
+    echo
+    echo "See /usr/share/doc/icecast2/examples for new configuration options."
+fi
+
+if ! getent group icecast >/dev/null 2>&1; then
+    addgroup --system icecast
+fi
+
+# Check for an account named 'icecast2'
+if ! id icecast2 >/dev/null 2>&1; then
+    # Create the new system account
+    adduser --system --disabled-password --disabled-login \
+	--home /usr/share/icecast2 --no-create-home --ingroup icecast icecast2
+fi
+
+chown -R icecast2: /var/log/icecast2 /etc/icecast2
+chmod -R ug=rw,o=,ug+X /etc/icecast2
+
+#DEBHELPER#
+
+exit 0
+
--- icecast2-2.3.2.orig/debian/copyright
+++ icecast2-2.3.2/debian/copyright
@@ -0,0 +1,72 @@
+This is Icecast 2.x packaged for Debian.
+
+Upstream source: http://downloads.us.xiph.org/releases/icecast/
+
+Note: Tarball distributed with Debian is currently not pristine: the
+subdir "debian" has been stripped to not clash with the official Debian
+packaging files.
+
+Upstream Authors: the icecast team <team@icecast.org>
+
+Copyright and license; src/avl/:
+
+ * Copyright (C) 1995-1997 by Sam Rushing <rushing@nightmare.com>
+ * 
+ *                         All Rights Reserved
+ * 
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby
+ * granted, provided that the above copyright notice appear in all
+ * copies and that both that copyright notice and this permission
+ * notice appear in supporting documentation, and that the name of Sam
+ * Rushing not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission.
+ * 
+ * SAM RUSHING DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL SAM RUSHING BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Copyright and license; src/thread/:
+
+ * Copyright (c) 1999, 2000 the icecast team <team@icecast.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+
+Copyright and license; src/net/:
+
+ * Copyright (C) 1999 the icecast team <team@icecast.org>
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+
+Copyright and license; src/httpp/ and src/timing:
+
+  lgpl
+  
+  by jack moffitt <jack@icecast.org>
+
+Copyright and license; other files (found in src/client.c):
+
+ * This program is distributed under the GNU General Public License, version 2.
+ * A copy of this license is included with this source.
+ *
+ * Copyright 2000-2004, Jack Moffitt <jack@xiph.org, 
+ *                      Michael Smith <msmith@xiph.org>,
+ *                      oddsock <oddsock@xiph.org>,
+ *                      Karl Heyes <karl@xiph.org>
+ *                      and others (see AUTHORS for details).
+
+
+On Debian systems, the complete text of both the GNU General Public
+License (GPL) and the GNU Library General Public License (LGPL) can be
+found below `/usr/share/common-licenses/'.
--- icecast2-2.3.2.orig/debian/icecast2.init
+++ icecast2-2.3.2/debian/icecast2.init
@@ -0,0 +1,75 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          icecast2
+# Required-Start:    $remote_fs $network
+# Required-Stop:     $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Starts the icecast audio streaming server daemon
+### END INIT INFO
+#
+# icecast2
+#
+#		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
+#		Modified for Debian 
+#		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
+#
+#		Further modified by Keegan Quinn <ice@thebasement.org>
+#		for use with Icecast 2
+#
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/icecast2
+NAME=icecast2
+DESC=icecast2
+
+test -x $DAEMON || exit 0
+
+# Defaults
+CONFIGFILE="/etc/icecast2/icecast.xml"
+CONFIGDEFAULTFILE="/etc/default/icecast2"
+USERID=icecast2
+GROUPID=icecast
+ENABLE="false"
+
+# Reads config file (will override defaults above)
+[ -r "$CONFIGDEFAULTFILE" ] && . $CONFIGDEFAULTFILE
+
+if [ "$ENABLE" != "true" ]; then
+	echo "$NAME daemon disabled - read $CONFIGDEFAULTFILE."
+	exit 0
+fi
+
+set -e
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \
+		--exec $DAEMON -- -b -c $CONFIGFILE
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --oknodo --quiet --exec $DAEMON
+	echo "$NAME."
+	;;
+  reload|force-reload)
+	echo "Reloading $DESC configuration files."
+	start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON
+	;;
+  restart)
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --oknodo --quiet --exec $DAEMON
+	sleep 1
+	start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \
+		--exec $DAEMON -- -b -c $CONFIGFILE
+	echo "$NAME."
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
--- icecast2-2.3.2.orig/debian/icecast2.postrm
+++ icecast2-2.3.2/debian/icecast2.postrm
@@ -0,0 +1,33 @@
+#! /bin/sh
+# postrm script for icecast2
+
+set -e
+
+case "$1" in
+    purge)
+	rm -rf /var/log/icecast2
+
+	if id icecast2 >/dev/null 2>&1; then
+		if [ -x /usr/sbin/deluser ]; then
+			/usr/sbin/deluser icecast2
+		fi
+	fi
+
+	# Remove group only if empty
+	if getent group icecast | awk -F: ' { print $4 } ' | egrep -cq '^$'; then
+		if [ -x /usr/sbin/groupdel ]; then
+			/usr/sbin/groupdel icecast || echo "Error occured removing group icecast, please do it manually."
+		fi
+	fi
+	;;
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+	;;
+    *)
+	echo "postrm called with unknown argument \`$1'" >&2
+	exit 1
+esac
+
+#DEBHELPER#
+
+exit 0
--- icecast2-2.3.2.orig/debian/icecast2.default
+++ icecast2-2.3.2/debian/icecast2.default
@@ -0,0 +1,19 @@
+# Defaults for icecast2 initscript
+# sourced by /etc/init.d/icecast2
+# installed at /etc/default/icecast2 by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Full path to the server configuration file
+CONFIGFILE="/etc/icecast2/icecast.xml"
+
+# Name or ID of the user and group the daemon should run under
+USERID=icecast2
+GROUPID=icecast
+
+# Edit /etc/icecast2/icecast.xml and change at least the passwords.
+# Change this to true when done to enable the init.d script
+ENABLE=false
+
