[SCM] ices2/master: Update changelog, control file and copyright hints.

Sat Jun 2 23:03:18 UTC 2012

The following commit has been merged in the master branch:
commit b632f482b959a6cdb4a50d4ecd069a82f7f500de
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 3 01:02:54 2012 +0200

    Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index bed6453..8c0b802 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ices2 (2.0.1-12) UNRELEASED; urgency=low
+
+  * Use anonscm.debian.org for Vcs-Browser field.
+  * Extend copyright of Debian packaging to cover recent years.
+  * Stop build-depending on libroar-dev or suggesting roaraudio-server.
+    Requested by Ron Lee.
+  * Really build-depend unversioned on libogg-dev, libvorbis-dev and
+    libshout3-dev, as intended for 2.0.1-11.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Sun, 03 Jun 2012 01:02:39 +0200
+
 ices2 (2.0.1-11) unstable; urgency=low
 
   * Update patch 0001 to newer snapshot of upstream development: r18199
diff --git a/debian/control b/debian/control
index c7a3be2..018fc96 100644
--- a/debian/control
+++ b/debian/control
@@ -13,22 +13,21 @@ Build-Depends: cdbs,
  autoconf,
  debhelper,
  dh-buildinfo,
- libogg-dev (>> 1.0.0),
- libvorbis-dev (>> 1.0.0),
- libshout3-dev (>> 2.0),
+ libogg-dev,
+ libvorbis-dev,
+ libshout3-dev,
  libxml2-dev,
  libasound2-dev [linux-any],
- pkg-config,
- libroar-dev (>= 0.3)
+ pkg-config
 Vcs-Git: git://git.debian.org/pkg-multimedia/ices2.git
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ices2.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/ices2.git
 Standards-Version: 3.9.3
 Homepage: http://www.icecast.org/ices.php
 
 Package: ices2
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, netbase
-Suggests: icecast2, roaraudio-server
+Suggests: icecast2
 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 290081e..db3759d 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -108,7 +108,7 @@ Files: src/audio.c
  src/stream_shared.c
  src/stream_shared.h
 Copyright: 2001, Michael Smith <msmith at labyrinth.net.au>
-License: UNKNOWN
+License: GPL-2
  FIXME
 
 Files: Makefile.in
@@ -131,7 +131,7 @@ Files: src/output.c
  src/stream_rewrite.c
 Copyright: 2001, Michael Smith <msmith at xiph.org>
   2001-2002, Michael Smith <msmith at xiph.org>
-License: UNKNOWN
+License: GPL-2
  FIXME
 
 Files: compile
@@ -155,7 +155,15 @@ Copyright: 1991, Free Software Foundation, Inc
   interest in the
   law: that is to say, a work containing the Library or a
   notices, you must include the
-License: LGPL-2+
+License: LGPL-ever
+ FIXME
+
+Files: 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>
+  2009-2012, Philipp Schafft <lion at lion.leolix.org>
+License: GPL-2
  FIXME
 
 Files: config.guess
@@ -171,14 +179,6 @@ Copyright: 1999-2000, the icecast team <team at icecast.org>
 License: LGPL-2+
  FIXME
 
-Files: 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>
-  2009-2012, Philipp Schafft <lion at lion.leolix.org>
-License: UNKNOWN
- FIXME
-
 Files: src/avl/avl.c
  src/avl/avl.h
 Copyright: 1995, Sam Rushing <rushing at nightmare.com>
@@ -186,6 +186,21 @@ Copyright: 1995, Sam Rushing <rushing at nightmare.com>
 License: UNKNOWN
  FIXME
 
+Files: debian/patches/0001_sync_upstream_VCS.patch
+Copyright: 2001, Michael Smith <msmith at labyrinth.net.au>
+  2001, Michael Smith <msmith at xiph.org>
+  2001-2002, Michael Smith <msmith at xiph.org>
+  2009, Philipp Schafft <lion at lion.leolix.org>
+  2009-2012, Philipp Schafft <lion at lion.leolix.org>
+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: GPL-2
+ FIXME
+
 Files: configure
 Copyright: (ISLOWER ? 'A' + ( - 'a') : )
   (ISLOWER ? ( | 0x40) : )
@@ -216,6 +231,12 @@ Copyright: 1996-2001, 2003-2004
 License: GPL-2+
  FIXME
 
+Files: debian/rules
+Copyright: 2003, Keegan Quinn <ice at thebasement.org>
+  2004-2008, 2011-2012, Jonas Smedegaard
+License: GPL-2+
+ FIXME
+
 Files: COPYING
 Copyright: 1989, 1991 Free Software Foundation, Inc
   <year> <name of author>
@@ -228,28 +249,7 @@ Copyright: 1989, 1991 Free Software Foundation, Inc
   law:
   the software, and
   year name of author
-License: GPL-2+
- FIXME
-
-Files: debian/rules
-Copyright: 2003, Keegan Quinn <ice at thebasement.org>
-  2004-2008, 2011, Jonas Smedegaard <dr at jones.dk>
-License: GPL-2+
- FIXME
-
-Files: debian/patches/0001_sync_upstream_VCS.patch
-Copyright: 2001, Michael Smith <msmith at labyrinth.net.au>
-  2001, Michael Smith <msmith at xiph.org>
-  2001-2002, Michael Smith <msmith at xiph.org>
-  2009, Philipp Schafft <lion at lion.leolix.org>
-  2009-2012, Philipp Schafft <lion at lion.leolix.org>
-License: UNKNOWN
- 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
+License: GPL-ever
  FIXME
 
 Files: src/resample.h

-- 
ices2 packaging

