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

js at users.alioth.debian.org js at users.alioth.debian.org
Sun Mar 25 19:39:07 UTC 2012 

The following commit has been merged in the master branch:
commit ea5d42ebb89d09880ed6ad90b069243f2524a219
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Mar 25 16:42:04 2012 +0200

    Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index 787def9..8646170 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
 libshout (2.3.0-1) UNRELEASED; urgency=low
 
-  * Dummy changelog entry
+  * New upstream release.
 
- -- Alessio Treglia <alessio at debian.org>  Fri, 02 Mar 2012 02:41:12 +0100
+  [ Jonas Smedegaard ]
+  * Bump standards-version to 3.9.3.
+  * Use anonscm.debian.org URL in Vcs-Browser field.
+  * Simplify install path, thanks to debhelper compatibility level 7.
+  * Update copyright file:
+    + Bump format to 1.0.
+    + Fix double-indent in Copyright fields as per Policy §5.6.13.
+    + Extend copyright years.
+    + Include disclaimers in GAP licenses.
+  * Update package relations:
+    + Relax build-depend unversioned on debhelper: Needed version
+      satisfied even in oldstable.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Sun, 25 Mar 2012 16:31:55 +0200
 
 libshout (2.2.2-8) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ee3dba8..ec0f14b 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Jonas Smedegaard <dr at jones.dk>,
  Romain Beauxis <toots at rastageeks.org>,
  Ying-Chun Liu <grandpaul at gmail.com>
 Build-Depends: autotools-dev,
- debhelper (>= 7.0.1),
+ debhelper,
  libogg-dev,
  libvorbis-dev,
  pkg-config,
@@ -16,8 +16,8 @@ Build-Depends: autotools-dev,
  d-shlibs (>= 0.48),
  cdbs (>= 0.4.93~)
 Vcs-Git: git://git.debian.org/pkg-multimedia/libshout.git
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libshout.git
-Standards-Version: 3.9.2
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/libshout.git
+Standards-Version: 3.9.3
 Homepage: http://www.icecast.org/
 
 Package: libshout3-dev
diff --git a/debian/copyright_hints b/debian/copyright_hints
index b901c96..4c217c7 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: FIXME
 Upstream-Contact: FIXME
 Source: FIXME
@@ -32,7 +32,6 @@ Files: INSTALL
  include/Makefile.am
  include/os.h
  include/shout/Makefile.am
- m4/ac_config_libconfig_in.m4
  m4/acx_pthread.m4
  m4/ogg.m4
  m4/shout.m4
@@ -42,7 +41,6 @@ Files: INSTALL
  m4/xiph_compiler.m4
  m4/xiph_net.m4
  m4/xiph_types.m4
- shout-config.in
  shout.pc.in
  src/Makefile.am
  src/avl/BUILDING
@@ -105,10 +103,12 @@ Files: include/shout/shout.h.in
  src/theora.c
  src/util.c
  src/vorbis.c
+ src/webm.c
 Copyright: 2002-2003, the Icecast team <team at icecast.org>
- 2002-2004, the Icecast team <team at icecast.org>
- 2004, the Icecast team <team at icecast.org>
- 2005, the Icecast team <team at icecast.org>
+  2002-2004, the Icecast team <team at icecast.org>
+  2002-2012, the Icecast team <team at icecast.org>
+  2004, the Icecast team <team at icecast.org>
+  2005, the Icecast team <team at icecast.org>
 License: LGPL-2+
  FIXME
 
@@ -119,87 +119,102 @@ Files: 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
 
+Files: config.guess
+ config.sub
+ missing
+Copyright: 1992-1999,
+  1992-2001
+  1996-1997, 1999-2000, 2002-2006
+License: GPL-2+
+ FIXME
+
 Files: src/net/resolver.c
  src/thread/thread.c
  src/thread/thread.h
 Copyright: 1999, the icecast team <team at icecast.org>
- 1999-2000, the icecast team <team at icecast.org>
+  1999-2000, the icecast team <team at icecast.org>
 License: LGPL-2+
  FIXME
 
-Files: compile
- depcomp
-Copyright: 1999-2000, 2003-2005, Free Software Foundation, Inc
-License: GPL
- FIXME
-
-Files: config.guess
- config.sub
-Copyright: 1992-1999
- 1992-2005,
-License: GPL-2+
+Files: m4/ltsugar.m4
+ m4/ltversion.m4
+ m4/lt~obsolete.m4
+Copyright: 2004, Free Software Foundation, Inc
+  2004-2005, 2007, 2009, Free Software Foundation, Inc
+  2004-2005, 2007-2008, Free Software Foundation, Inc
+License: UNKNOWN
  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>
+  1995-1997, Sam Rushing <rushing at nightmare.com>
 License: UNKNOWN
  FIXME
 
-Files: missing
-Copyright: 1996-1997, 1999-2000, 2002-2005
-License: GPL
- 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) : )
+  1992-1996, 1998-2001,
+  1996-2001, 2003-2005
+  2010, Free Software Foundation, Inc
+License: GPL-2+
+ FIXME
+
+Files: m4/libtool.m4
+Copyright: 1996-2001, 2003-2005
+  2010, 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
+Copyright: 1996, 1998, 2000-2005, 2008
+  1996-1997, 2000-2001, 2003, 2005,
+  1996-1997, 2000-2001, 2003, 2005, 2008
+  1996-2004,
+  1997, 1999-2001, 2003-2005, 2008
+  1997, 2000-2001, 2003-2006, 2008
+  1999-2005, 2008
+  1999-2006, 2009
+  2001, 2003, 2005, 2008 Free Software Foundation, Inc
+  2001, 2003, 2005, Free Software Foundation, Inc
+  2001-2003, 2005, 2008, Free Software Foundation, Inc
+  2001-2003, 2005, 2009, Free Software Foundation, Inc
+  2002-2003, 2005-2008, Free Software Foundation, Inc
+  2003, 2005 Free Software Foundation, Inc
+  2003-2006, Free Software Foundation, Inc
+  2004, Scott James Remnant <scott at netsplit.com>
+  2004-2005, Free Software Foundation, Inc
+  2006, 2008 Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
 Files: ltmain.sh
-Copyright: 1996-2001, 2003-2005
- 2005, Free Software Foundation, Inc."
+Copyright: 1996-2001, 2003-2006
+  all begin with the string "--lt-"
+License: GPL-2+
+ FIXME
+
+Files: depcomp
+Copyright: 1999-2000, 2003-2007, 2009 Free
+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
 
@@ -210,7 +225,7 @@ License: GPL-2+
 
 Files: src/mp3.c
 Copyright: 2002-2003, the Icecast team <team at icecast.org>
- = (header >> 3) & 0x01;
+  = (header >> 3) & 0x01;
 License: LGPL-2+
  FIXME
 
@@ -224,3 +239,8 @@ Copyright: 1994, X Consortium
 License: MIT/X11 (BSD like)
  FIXME
 
+Files: m4/ltoptions.m4
+Copyright: 2004-2005, 2007-2009, Free Software Foundation
+License: UNKNOWN
+ FIXME
+

-- 
libshout packaging

More information about the pkg-multimedia-commits mailing list