[SCM] ices2/master: Prepare for release: Update changelog, control file and copyright hints.
js at users.alioth.debian.org
js at users.alioth.debian.org
Sat Jan 1 21:26:21 UTC 2011
The following commit has been merged in the master branch:
commit 83b358fc6b73e74a368ca5891fcbf69321dea950
Author: Jonas Smedegaard <dr at jones.dk>
Date: Sat Jan 1 21:59:40 2011 +0100
Prepare for release: Update changelog, control file and copyright hints.
diff --git a/debian/changelog b/debian/changelog
index 60c2e44..df1fe23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+ices2 (2.0.1-9) unstable; urgency=low
+
+ [ Alessio Treglia ]
+ * Change Maintainer since the Debian Icecast team is merging with
+ Multimedia Maintainers.
+ * Add git-buildpackage config file.
+
+ [ Jonas Smedegaard ]
+ * Drop local CDBS snippets: All included in CDBS now.
+ * Avoid use of svn-upgrade in watch file.
+ * Ease building with git-buildpackage:
+ + Git-ignore quilt .pc dir.
+ + Add dpkg-source local-options hints.
+ * Extend copyright years in rules file, and add licensing header.
+ * Drop now unneeded README.cdbs-tweaks.
+ * Bump standards-version to 3.9.1.
+ * Tighten build-dependency handling.
+ * Rewrite copyright file using Bazaar rev. 137 draft of DEP5 format.
+ * Update email address of Michael Smith in copyright file.
+ * Add patch 0001 to sync with most recent upstream snapshot.
+ * Build-depend on libroar-dev, and suggest roaraudio-server.
+ Closes: bug#591636. Thanks to Philipp Schafft.
+ * Add patch 1001 to allow 'allow-repeats' setting when checking ogg
+ serial.
+ Closes: bug#463351. Thanks to C. Chad Wallace.
+ * Add patch 1002 to fix bogus mentions of OSS in comment lines of ALSA
+ config.
+ Closes: bug#514489. Thanks to Kingsley G. Morse Jr.
+ * Add patch 1003 to avoid automake'ing stripped Makefile in debian
+ subdir.
+ * Add back ices2 manpage from debian subdir of upstream tarball
+ (otherwise stripped by our change to source format 3.0).
+ * Depend on ${misc:Depends}. Thanks to lintian.
+
+ -- Jonas Smedegaard <dr at jones.dk> Sat, 01 Jan 2011 21:59:19 +0100
+
ices2 (2.0.1-8) unstable; urgency=low
* Update local cdbs snippets:
diff --git a/debian/control b/debian/control
index fd46128..db5e9a5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,34 @@
Source: ices2
Section: sound
Priority: optional
-Maintainer: Debian Icecast team <pkg-icecast-devel at lists.alioth.debian.org>
-Uploaders: Guillaume Pellerin <yomguy at altern.org>, Romain Beauxis <toots at rastageeks.org>, Ying-Chun Liu <grandpaul at gmail.com>, Jonas Smedegaard <dr at jones.dk>
-Build-Depends: cdbs (>= 0.4.39), autotools-dev, devscripts (>= 2.10.7), libtool, automake1.10, autoconf, dh-buildinfo, debhelper (>= 5.0.44), libogg-dev (>> 1.0.0), libvorbis-dev (>> 1.0.0), libshout3-dev (>> 2.0), libxml2-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], pkg-config
-Vcs-Svn: svn://svn.debian.org/svn/pkg-icecast/ices2/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-icecast/ices2/trunk
-Standards-Version: 3.7.2
+Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+Uploaders: Guillaume Pellerin <yomguy at altern.org>,
+ Romain Beauxis <toots at rastageeks.org>,
+ Ying-Chun Liu <grandpaul at gmail.com>,
+ Jonas Smedegaard <dr at jones.dk>
+Build-Depends: cdbs,
+ autotools-dev,
+ libtool,
+ automake1.10,
+ autoconf,
+ debhelper (>= 6),
+ dh-buildinfo,
+ libogg-dev (>> 1.0.0),
+ libvorbis-dev (>> 1.0.0),
+ libshout3-dev (>> 2.0),
+ libxml2-dev,
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ pkg-config,
+ libroar-dev (>= 0.3)
+Vcs-Git: git://git.debian.org/pkg-multimedia/ices2.git
+Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ices2.git
+Standards-Version: 3.9.1
Homepage: http://www.icecast.org/ices.php
Package: ices2
Architecture: any
-Depends: ${shlibs:Depends}, netbase
-Suggests: icecast2
+Depends: ${misc:Depends}, ${shlibs:Depends}, netbase
+Suggests: icecast2, roaraudio-server
Description: Ogg Vorbis streaming source for Icecast 2
IceS 2.x is used to source Icecast 2 streaming audio
servers with Ogg Vorbis audio streams. It supports both
diff --git a/debian/copyright_hints b/debian/copyright_hints
index cbe9fb1..59b6a9f 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,105 +1,243 @@
-*No copyright* UNKNOWN []: AUTHORS
- Makefile.am
- README
- TODO
- conf/Makefile.am
- conf/ices-alsa.xml
- conf/ices-oss.xml
- conf/ices-playlist.xml
- config.h.in
- configure.in
- doc/Makefile.am
- doc/basic.html
- doc/config.html
- doc/faq.html
- doc/index.html
- doc/inputs.html
- doc/intro.html
- doc/style.css
- m4/ogg.m4
- m4/shout.m4
- m4/vorbis.m4
- m4/xiph_compiler.m4
- m4/xiph_xml2.m4
- mkinstalldirs
- src/Makefile.am
- src/avl/BUILDING
- src/avl/Makefile.am
- src/avl/README
- src/avl/TODO
- src/avl/test.c
- src/log/Makefile.am
- src/log/log.c
- src/log/log.h
- src/log/test.c
- src/resample.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
-UNKNOWN [2001 Michael Smith <msmith at labyrinth.net.au>]: src/audio.c
- src/audio.h
- src/cfgparse.c
- src/cfgparse.h
- src/encode.c
- src/encode.h
- src/event.h
- src/im_alsa.c
- src/im_alsa.h
- src/im_oss.c
- src/im_oss.h
- src/im_playlist.c
- src/im_playlist.h
- src/im_stdinpcm.c
- src/im_stdinpcm.h
- src/im_sun.c
- src/im_sun.h
- src/input.c
- src/input.h
- src/inputmodule.h
- src/logging.h
- src/metadata.c
- src/metadata.h
- src/playlist_basic.c
- src/playlist_basic.h
- src/playlist_script.c
- src/reencode.c
- src/reencode.h
- src/signals.c
- src/signals.h
- src/stream.c
- src/stream.h
- src/stream_shared.c
- src/stream_shared.h
-GENERATED FILE [1994-2002]: Makefile.in
- conf/Makefile.in
- doc/Makefile.in
- src/Makefile.in
- src/avl/Makefile.in
- src/log/Makefile.in
- src/thread/Makefile.in
- src/timing/Makefile.in
-UNKNOWN [1991 Free Software Foundation, Inc]: src/avl/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 at icecast.org>]: src/thread/thread.c
- src/thread/thread.h
-*No copyright* GENERATED FILE []: src/avl/avl.dsp
-GENERATED FILE [2003 Free Software Foundation, Inc]: configure
-GPL GENERATED FILE [1996-1997, 1999-2000, 2002 Free Software Foundation, Inc]: missing
-GPL [1996-2002]: aclocal.m4
-GPL-2+ GENERATED FILE [1996-2001, 2003-2004]: ltmain.sh
-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 at nightmare.com>]: src/avl/avl.h
-UNKNOWN [1995-1997 by Sam Rushing <rushing at nightmare.com>]: src/avl/avl.c
-UNKNOWN [2001-2002 Michael Smith <msmith at labyrinth.net.au> / 2001-2004 The IceS Development Team <team at icecast.org>\n"]: src/ices.c
-UNKNOWN [2002 Simon Hosie <gumboot at clear.net.nz>]: src/resample.h
+Format: http://bzr.debian.org/scm/loggerhead/dep/dep5/trunk/annotate/137/dep5.mdwn
+Upstream-Name: FIXME
+Upstream-Contact: FIXME
+Source: FIXME
+Copyright: FIXME
+License: FIXME
+Disclaimer: Autogenerated by CDBS snippet copyright-check.mk
+
+Files: AUTHORS
+ Makefile.am
+ README
+ TODO
+ conf/Makefile.am
+ conf/ices-alsa.xml
+ conf/ices-oss.xml
+ conf/ices-playlist.xml
+ config.h.in
+ configure.in
+ debian/README.Debian
+ debian/compat
+ debian/control
+ debian/control.in
+ debian/doc/ices.init.example
+ debian/gbp.conf
+ debian/ices2.doc-base
+ debian/ices2.docs
+ debian/patches/1001_allow_repeat.patch
+ debian/patches/1002_fix_OSS-ALSA_confusion_in_comments.patch
+ debian/patches/1003_no_Makefile_in_debian_subdir.patch
+ debian/patches/README
+ debian/patches/series
+ debian/source/format
+ debian/source/local-options
+ debian/watch
+ doc/Makefile.am
+ doc/basic.html
+ doc/config.html
+ doc/faq.html
+ doc/index.html
+ doc/inputs.html
+ doc/intro.html
+ doc/style.css
+ m4/ogg.m4
+ m4/shout.m4
+ m4/vorbis.m4
+ m4/xiph_compiler.m4
+ m4/xiph_xml2.m4
+ mkinstalldirs
+ src/Makefile.am
+ src/avl/BUILDING
+ src/avl/Makefile.am
+ src/avl/README
+ src/avl/TODO
+ src/avl/avl.dsp
+ src/avl/test.c
+ src/log/Makefile.am
+ src/log/log.c
+ src/log/log.h
+ src/log/test.c
+ src/resample.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
+Copyright: *No copyright*
+License: UNKNOWN
+ FIXME
+
+Files: src/audio.c
+ src/audio.h
+ src/cfgparse.c
+ src/cfgparse.h
+ src/encode.c
+ src/encode.h
+ src/event.h
+ src/im_alsa.c
+ src/im_alsa.h
+ src/im_oss.c
+ src/im_oss.h
+ src/im_playlist.c
+ src/im_playlist.h
+ src/im_stdinpcm.c
+ src/im_stdinpcm.h
+ src/im_sun.c
+ src/im_sun.h
+ src/input.c
+ src/input.h
+ src/inputmodule.h
+ src/logging.h
+ src/metadata.c
+ src/metadata.h
+ src/playlist_basic.c
+ src/playlist_basic.h
+ src/playlist_script.c
+ src/reencode.c
+ src/reencode.h
+ src/signals.c
+ src/signals.h
+ src/stream.c
+ src/stream.h
+ src/stream_shared.c
+ src/stream_shared.h
+Copyright: 2001, Michael Smith <msmith at labyrinth.net.au>
+License: UNKNOWN
+ FIXME
+
+Files: Makefile.in
+ conf/Makefile.in
+ doc/Makefile.in
+ src/Makefile.in
+ src/avl/Makefile.in
+ src/log/Makefile.in
+ src/thread/Makefile.in
+ src/timing/Makefile.in
+Copyright: 1994-2002
+License: UNKNOWN
+ FIXME
+
+Files: compile
+ depcomp
+ missing
+Copyright: 1996-1997, 1999-2000, 2002 Free Software Foundation, Inc
+ 1999-2000, Free Software Foundation, Inc
+License: GPL
+ FIXME
+
+Files: src/avl/COPYING
+ src/thread/COPYING
+ src/timing/COPYING
+Copyright: 1991, Free Software Foundation, Inc
+ <year> <name of author>
+ HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+ HOLDERS AND/OR
+ disclaimer" for the library, if
+ holder or other authorized
+ holder who places the Library under this License may add
+ interest in the
+ law: that is to say, a work containing the Library or a
+ notices, you must include the
+License: LGPL-2+
+ FIXME
+
+Files: debian/patches/0001_sync_20090819.patch
+ src/im_roar.c
+ src/im_roar.h
+Copyright: 2001, Michael Smith <msmith at labyrinth.net.au>
+ 2009, Philipp Schafft <lion at lion.leolix.org>
+License: UNKNOWN
+ FIXME
+
+Files: config.guess
+ config.sub
+Copyright: 1992-1999,
+ 1992-2001
+License: GPL-2+
+ FIXME
+
+Files: src/thread/thread.c
+ src/thread/thread.h
+Copyright: 1999-2000, the icecast team <team at icecast.org>
+License: LGPL-2+
+ FIXME
+
+Files: src/avl/avl.c
+ src/avl/avl.h
+Copyright: 1995, Sam Rushing <rushing at nightmare.com>
+ 1995-1997, Sam Rushing <rushing at nightmare.com>
+License: UNKNOWN
+ FIXME
+
+Files: debian/rules
+Copyright: 2003, Keegan Quinn <ice at thebasement.org>
+ 2004-2008, 2011, Jonas Smedegaard <dr at jones.dk>
+License: GPL
+ FIXME
+
+Files: configure
+Copyright: (ISLOWER ? 'A' + ( - 'a') : )
+ (ISLOWER ? ( | 0x40) : )
+ 1996-2001,
+ 2003, Free Software Foundation, Inc
+License: GPL-2+
+ FIXME
+
+Files: aclocal.m4
+Copyright: 1996, 1998, 2000-2001, Free Software Foundation, Inc
+ 1996-1997, 2000-2001, Free Software Foundation, Inc
+ 1996-2001,
+ 1996-2002,
+ 1997, 1999-2001, Free Software Foundation, Inc
+ 1997, 2000-2001, Free Software Foundation, Inc
+ 1999-2001, Free Software Foundation, Inc
+ 1999-2002, Free Software Foundation, Inc
+ 2001, Free Software Foundation, Inc
+ 2001, Free Software Foundation, Inc. -*- Autoconf -*-
+ 2001-2002, Free Software Foundation, Inc
+ 2002, Free Software Foundation, Inc
+License: GPL-2+
+ FIXME
+
+Files: ltmain.sh
+Copyright: 1996-2001, 2003-2004
+ 2003, Free Software Foundation, Inc."
+License: GPL-2+
+ FIXME
+
+Files: COPYING
+Copyright: 1989, 1991 Free Software Foundation, Inc
+ <year> <name of author>
+ HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+ HOLDERS AND/OR OTHER PARTIES
+ disclaimer" for the program, if
+ holder saying it may be distributed
+ holder who places the Program under this License
+ interest in the program
+ law:
+ the software, and
+ year name of author
+License: GPL-2+
+ FIXME
+
+Files: src/ices.c
+Copyright: 2001-2002, Michael Smith <msmith at labyrinth.net.au>
+ 2001-2004, The IceS Development Team <team at icecast.org>\n"
+License: UNKNOWN
+ FIXME
+
+Files: src/resample.h
+Copyright: 2002, Simon Hosie <gumboot at clear.net.nz>
+License: UNKNOWN
+ FIXME
+
+Files: install-sh
+Copyright: 1991, the Massachusetts Institute of Technology
+License: UNKNOWN
+ FIXME
+
--
ices2 packaging
More information about the pkg-multimedia-commits
mailing list