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

Sat Mar 3 14:23:08 UTC 2012

The following commit has been merged in the master branch:
commit 0c94c99a847d1e2ae86244bc376651f7a9fb3a62
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Mar 3 15:22:58 2012 +0100

    Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index c242fe3..69ce8cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,24 @@
 ices2 (2.0.1-10) UNRELEASED; urgency=low
 
+  [ Jonas Smedegaard ]
   * Add description hint to header of rules file.
   * Fix properly quote licensing section GPL-2+ in copyright file (not
     bogusly repeat GPL-2).
+  * Bump debhelper compat level to 7.
+  * Bump standards-version to 3.9.3.
+  * Update copyright file:
+    + Rewrite using copyright format 1.0.
+    + Fix add verbatim MIT license for install.sh.
+    + Shorten GPL and LGPL comments, and quote license names.
+  * Update package relations:
+    + Relax build-depend unversioned on debhelper (needed version
+      satisfied even in oldstable).
+
+  [ Alessio Treglia ]
+  * Replace hardcoded list of non-Linux archs with linux-any.
+    Closes: bug#634702. Thanks to Robert Millan.
 
- -- Jonas Smedegaard <dr at jones.dk>  Mon, 03 Jan 2011 06:06:42 +0100
+ -- Jonas Smedegaard <dr at jones.dk>  Sat, 03 Mar 2012 15:18:59 +0100
 
 ices2 (2.0.1-9) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index db5e9a5..c7a3be2 100644
--- a/debian/control
+++ b/debian/control
@@ -11,18 +11,18 @@ Build-Depends: cdbs,
  libtool,
  automake1.10,
  autoconf,
- debhelper (>= 6),
+ debhelper,
  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],
+ libasound2-dev [linux-any],
  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
+Standards-Version: 3.9.3
 Homepage: http://www.icecast.org/ices.php
 
 Package: ices2
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 59b6a9f..f725a43 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,10 +1,8 @@
-Format: http://bzr.debian.org/scm/loggerhead/dep/dep5/trunk/annotate/137/dep5.mdwn
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: FIXME
 Upstream-Contact: FIXME
 Source: FIXME
-Copyright: FIXME
-License: FIXME
-Disclaimer: Autogenerated by CDBS snippet copyright-check.mk
+Disclaimer: Autogenerated by CDBS
 
 Files: AUTHORS
  Makefile.am
@@ -22,6 +20,7 @@ Files: AUTHORS
  debian/control.in
  debian/doc/ices.init.example
  debian/gbp.conf
+ debian/ices2.1
  debian/ices2.doc-base
  debian/ices2.docs
  debian/patches/1001_allow_repeat.patch
@@ -126,23 +125,23 @@ Files: compile
  depcomp
  missing
 Copyright: 1996-1997, 1999-2000, 2002 Free Software Foundation, Inc
- 1999-2000, Free Software Foundation, Inc
-License: GPL
+  1999-2000, Free Software Foundation, Inc
+License: GPL-2+
  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
+  <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
 
@@ -150,14 +149,14 @@ 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>
+  2009, Philipp Schafft <lion at lion.leolix.org>
 License: UNKNOWN
  FIXME
 
 Files: config.guess
  config.sub
 Copyright: 1992-1999,
- 1992-2001
+  1992-2001
 License: GPL-2+
  FIXME
 
@@ -170,64 +169,64 @@ License: LGPL-2+
 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>
+  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
+  (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
+  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."
+  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
+  <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: debian/rules
+Copyright: 2003, Keegan Quinn <ice at thebasement.org>
+  2004-2008, 2011, Jonas Smedegaard <dr at jones.dk>
 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"
+  2001-2004, The IceS Development Team <team at icecast.org>\n"
 License: UNKNOWN
  FIXME
 

-- 
ices2 packaging

