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

Thu Mar 24 23:23:37 UTC 2016

The following commit has been merged in the master branch:
commit 0e4f29cb0ed12d665a96e13a9e17a01ff0935af1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Mar 25 00:22:50 2016 +0100

    Prepare for release: Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index 45d643c..4ee1eef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,32 @@
+ices2 (2.0.2-2) unstable; urgency=medium
+
+  * Update watch file:
+    + Bump file format to version 4.
+    + Simplify version regex.
+    + Use uupdate.
+  * Drop CDBS get-orig-source target: Use "gbp import-orig --uscan"
+    instead.
+  * Use unversioned autotools.
+    Build-depend on automake (not automake1.11.
+    Tighten to build-depend versioned on cdbs.
+  * Remove debian/source/local-options: abort-on-upstream-changes and
+    unapply-patches are default in dpkg-source since 1.16.1.
+  * Update copyright info:
+    + Use License-Grant and License-Reference fields.
+      Thanks to Ben Finney.
+    + Use license shortnames FSFUL FSFULLR FSFULLR~Makefile.in.
+    + Extend copyright of packaging to cover recent years.
+  * Add lintian override regarding license in License-Reference field.
+    See bug#786450.
+  * Bump debhelper compatibility level to 9.
+  * Add lintian override regarding debhelper 9.
+  * Fix (re)create autotools files from scratch during build.
+    Closes: Bug#818420. Thanks to Martin Michlmayr.
+  * Declare compliance with Debian Policy 3.9.7.
+  * Modernize Vcs-* field URLs.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Fri, 25 Mar 2016 00:21:07 +0100
+
 ices2 (2.0.2-1) unstable; urgency=medium
 
   * ACK NMU from Eric Dorland, thanks.
diff --git a/debian/control b/debian/control
index 90e0bfd..e47eb75 100644
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,13 @@ Uploaders: Guillaume Pellerin <yomguy at altern.org>,
  Ying-Chun Liu <grandpaul at gmail.com>,
  Jonas Smedegaard <dr at jones.dk>,
  Unit 193 <unit193 at ubuntu.com>
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.123~),
  autotools-dev,
+ devscripts,
  libtool,
- automake1.11,
+ automake,
  autoconf,
- debhelper (>= 8),
+ debhelper,
  dh-buildinfo,
  libogg-dev,
  libvorbis-dev,
@@ -20,9 +21,9 @@ Build-Depends: cdbs,
  libxml2-dev,
  libasound2-dev [linux-any],
  pkg-config
-Vcs-Git: git://anonscm.debian.org/pkg-multimedia/ices2.git
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-multimedia/ices2.git
-Standards-Version: 3.9.6
+Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/ices2.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/ices2.git
+Standards-Version: 3.9.7
 Homepage: http://www.icecast.org/ices.php
 
 Package: ices2
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 567b728..305e9f1 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -31,7 +31,7 @@ Files: AUTHORS
  debian/patches/README
  debian/patches/series
  debian/source/format
- debian/source/local-options
+ debian/source/lintian-overrides
  debian/watch
  doc/Makefile.am
  doc/basic.html
@@ -77,6 +77,7 @@ Files: src/audio.c
  src/encode.c
  src/encode.h
  src/event.h
+ src/ices.c
  src/im_alsa.c
  src/im_alsa.h
  src/im_oss.c
@@ -105,6 +106,7 @@ Files: src/audio.c
  src/stream_shared.c
  src/stream_shared.h
 Copyright: 2001, Michael Smith <msmith at xiph.org>
+  2001-2002, Michael Smith <msmith at xiph.org>
 License: GPL-2
  FIXME
 
@@ -116,18 +118,18 @@ Files: Makefile.in
  src/log/Makefile.in
  src/thread/Makefile.in
  src/timing/Makefile.in
-Copyright: 1994-2002
+Copyright: 1994-2002, 2003-2005, Free Software Foundation, Inc.
 License: UNKNOWN
  FIXME
 
-Files: config.guess
- config.sub
+Files: aclocal.m4
+ configure
+ ltmain.sh
  missing
-Copyright: 1992-1999
-  1992-1999,
-  1992-2005
-  1992-2005,
-  1996-1997, 1999-2000, 2002-2005
+Copyright: 1992-1996, 1998-2001, 2002-2006, Free Software Foundation, Inc.
+  1996-1997, 1999-2000, 2002-2005, Free Software Foundation, Inc.
+  1996-2001, 2003-2005, Free Software Foundation, Inc.
+  1996-2004, 2005 Free Software Foundation, Inc.
 License: GPL-2+
  FIXME
 
@@ -135,10 +137,6 @@ Files: src/avl/COPYING
  src/thread/COPYING
  src/timing/COPYING
 Copyright: 1991, Free Software Foundation, Inc
-  <year> <name of author>
-  disclaimer" for the library, if
-  interest in the
-  law: that is to say, a work containing the Library or a
 License: LGPL-ever
  FIXME
 
@@ -156,6 +154,12 @@ Copyright: 2001, Michael Smith <msmith at labyrinth.net.au>
 License: GPL-2
  FIXME
 
+Files: config.guess
+ config.sub
+Copyright: 1992-1999, 2000-2006, Free Software Foundation,
+License: GPL-2+
+ FIXME
+
 Files: compile
  depcomp
 Copyright: 1999-2000, 2003-2005, Free Software Foundation, Inc
@@ -177,63 +181,18 @@ License: UNKNOWN
 
 Files: install-sh
 Copyright: 1994, X Consortium
+  and license
 License: Expat
  FIXME
 
-Files: src/ices.c
-Copyright: 2001-2002, Michael Smith <msmith at xiph.org>
-  2001-2004, The IceS Development Team <team at icecast.org>\n"
-License: GPL-2
- FIXME
-
-Files: configure
-Copyright: (ISLOWER ? 'A' + ( - 'a') : )
-  (ISLOWER ? ( | 0x40) : )
-  1992-1996, 1998-2001,
-  1996-2001,
-  2006, Free Software Foundation, Inc
-License: GPL-2+
- FIXME
-
-Files: aclocal.m4
-Copyright: 1996, 1998, 2000-2005,
-  1996-1997, 2000-2001, 2003, 2005,
-  1996-2001,
-  1996-2004,
-  1996-2005,
-  1997, 1999-2001, 2003, 2005,
-  1997, 2000-2001, 2003-2005,
-  1999-2005,
-  2001, 2003, 2005, Free Software Foundation, Inc
-  2001-2003, 2005 Free Software Foundation, Inc
-  2002-2003, 2005 Free Software Foundation, Inc
-  2003, 2005 Free Software Foundation, Inc
-  2003-2005, Free Software Foundation, Inc
-  2004, Scott James Remnant <scott at netsplit.com>
-  2004-2005, Free Software Foundation, Inc
-License: GPL-2+
- FIXME
-
-Files: ltmain.sh
-Copyright: 1996-2001, 2003-2005
-  2005, Free Software Foundation, Inc."
-License: GPL-2+
- FIXME
-
 Files: debian/rules
 Copyright: 2003, Keegan Quinn <ice at thebasement.org>
-  2004-2008, 2011-2012, Jonas Smedegaard
+  2004-2008, 2011-2013, 2016 Jonas Smedegaard <dr at jones.dk>
 License: GPL-2+
  FIXME
 
 Files: COPYING
 Copyright: 1989, 1991 Free Software Foundation, Inc
-  <year> <name of author>
-  disclaimer" for the program, if
-  interest in the program
-  law:
-  the software, and
-  year name of author
 License: GPL-ever
  FIXME
 

-- 
ices2 packaging

