[SCM] libshout/master: Prepare for release: Update changelog, control file and copyright hints.
js at users.alioth.debian.org
js at users.alioth.debian.org
Mon Dec 19 07:46:18 UTC 2011
The following commit has been merged in the master branch:
commit e92524e583a8575b7c3126f1678553161b2ace05
Author: Jonas Smedegaard <dr at jones.dk>
Date: Mon Dec 19 14:40:54 2011 +0700
Prepare for release: Update changelog, control file and copyright hints.
diff --git a/debian/changelog b/debian/changelog
index 14393c9..121e5b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libshout (2.2.2-7) UNRELEASED; urgency=low
+libshout (2.2.2-7) unstable; urgency=low
* Modernize CDBS:
+ Drop local snippets: Now upstream.
@@ -28,9 +28,14 @@ libshout (2.2.2-7) UNRELEASED; urgency=low
d-shlibmove).
+ Tighten rules to ensure invoked only once.
* Bump debhelper compatilibity level to 7.
+ * Bump Policy compliance to standards-version 3.9.2.
* Drop dpkg local-options hints from packaging source: now defaults.
+ * Add proper licensing header to debian/rules, and extend coverage.
+ * Update copyright file:
+ + Rewrite using draft DEP-5 format.
+ * Stop installing obsolete *.la file (not only strip dependency_libs).
- -- Jonas Smedegaard <dr at jones.dk> Thu, 08 Dec 2011 09:25:08 +0700
+ -- Jonas Smedegaard <dr at jones.dk> Mon, 19 Dec 2011 14:39:35 +0700
libshout (2.2.2-6) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f1b69db..28b7592 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: cdbs,
d-shlibs
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.1
+Standards-Version: 3.9.2
Homepage: http://www.icecast.org/
Package: libshout3-dev
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 515ff87..7725e3f 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,101 +1,226 @@
-*No copyright* UNKNOWN []: INSTALL
- Makefile.am
- NEWS
- README
- config.h.in
- configure.ac
- doc/Makefile.am
- doc/libshout.xml
- doc/spec-html.xsl
- examples/Makefile.am
- examples/example.c
- examples/nonblocking.c
- include/Makefile.am
- include/os.h
- include/shout/Makefile.am
- m4/acx_pthread.m4
- m4/ogg.m4
- m4/shout.m4
- m4/speex.m4
- m4/theora.m4
- m4/vorbis.m4
- m4/xiph_compiler.m4
- m4/xiph_net.m4
- m4/xiph_types.m4
- shout.pc.in
- src/Makefile.am
- src/avl/BUILDING
- src/avl/Makefile.am
- src/avl/README
- src/avl/TODO
- src/avl/test.c
- src/httpp/Makefile.am
- src/httpp/README
- src/httpp/TODO
- src/httpp/httpp.c
- src/httpp/httpp.h
- src/net/BUILDING
- src/net/Makefile.am
- src/net/README
- src/net/TODO
- src/net/resolver.h
- src/net/test_resolver.c
- src/shout_private.h
- 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
- src/util.h
- win32/Makefile.am
-GENERATED FILE [1994-2002]: Makefile.in
- doc/Makefile.in
- examples/Makefile.in
- include/Makefile.in
- include/shout/Makefile.in
- src/Makefile.in
- src/avl/Makefile.in
- src/httpp/Makefile.in
- src/net/Makefile.in
- src/thread/Makefile.in
- src/timing/Makefile.in
- win32/Makefile.in
-UNKNOWN [1991 Free Software Foundation, Inc]: COPYING
- src/avl/COPYING
- src/httpp/COPYING
- src/net/COPYING
- src/thread/COPYING
- src/timing/COPYING
-*No copyright* GENERATED FILE []: m4/ac_config_libconfig_in.m4
- shout-config.in
- src/avl/avl.dsp
- win32/libshout.dsp
- win32/libshout.dsw
-LGPL-2+ [2002-2003 the Icecast team <team at icecast.org>]: include/shout/shout.h.in
- src/mp3.c
- src/util.c
-LGPL-2+ [2002-2004 the Icecast team <team at icecast.org>]: src/ogg.c
- src/shout.c
- src/vorbis.c
-GPL GENERATED FILE [1999-2000, 2003-2005 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
-LGPL-2+ [2004 the Icecast team <team at icecast.org>]: src/shout_ogg.h
- src/theora.c
-GENERATED FILE [2003 Free Software Foundation, Inc]: configure
-GPL GENERATED FILE [1996-1997, 1999-2000, 2002-2005]: missing
-GPL-2+ GENERATED FILE [1996-2001, 2003-2005]: ltmain.sh
-GPL-2+ [1999 the icecast team]: src/net/sock.h
-LGPL-2+ [1999 the icecast team <team at icecast.org>]: src/net/resolver.c
-LGPL-2+ [1999 the icecast team]: src/net/sock.c
-LGPL-2+ [2005 the Icecast team <team at icecast.org>]: src/speex.c
-MIT/X11 (BSD like) [1994 X Consortium]: 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 [1996-2004]: aclocal.m4
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Upstream-Name: FIXME
+Upstream-Contact: FIXME
+Source: FIXME
+Disclaimer: Autogenerated by CDBS
+
+Files: INSTALL
+ Makefile.am
+ NEWS
+ README
+ config.h.in
+ configure.ac
+ debian/README.cdbs-tweaks
+ debian/compat
+ debian/control
+ debian/control.in
+ debian/gbp.conf
+ debian/libshout3-dev.install
+ debian/patches/1001_upstream_is_not_debian.patch
+ debian/patches/1002_link_against_libspeex.patch
+ debian/patches/1003_fix_pkg-config_requires.patch
+ debian/patches/README
+ debian/patches/series
+ debian/source/format
+ debian/watch
+ doc/Makefile.am
+ doc/libshout.xml
+ doc/spec-html.xsl
+ examples/Makefile.am
+ examples/example.c
+ examples/nonblocking.c
+ 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
+ m4/speex.m4
+ m4/theora.m4
+ m4/vorbis.m4
+ m4/xiph_compiler.m4
+ m4/xiph_net.m4
+ m4/xiph_types.m4
+ shout-config.in
+ shout.pc.in
+ 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/httpp/Makefile.am
+ src/httpp/README
+ src/httpp/TODO
+ src/httpp/httpp.c
+ src/httpp/httpp.h
+ src/net/BUILDING
+ src/net/Makefile.am
+ src/net/README
+ src/net/TODO
+ src/net/resolver.h
+ src/net/test_resolver.c
+ src/shout_private.h
+ 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
+ src/util.h
+ win32/Makefile.am
+ win32/libshout.dsp
+ win32/libshout.dsw
+Copyright: *No copyright*
+License: UNKNOWN
+ FIXME
+
+Files: Makefile.in
+ doc/Makefile.in
+ examples/Makefile.in
+ include/Makefile.in
+ include/shout/Makefile.in
+ src/Makefile.in
+ src/avl/Makefile.in
+ src/httpp/Makefile.in
+ src/net/Makefile.in
+ src/thread/Makefile.in
+ src/timing/Makefile.in
+ win32/Makefile.in
+Copyright: 1994-2002
+License: UNKNOWN
+ FIXME
+
+Files: include/shout/shout.h.in
+ src/ogg.c
+ src/shout.c
+ src/shout_ogg.h
+ src/speex.c
+ src/theora.c
+ src/util.c
+ src/vorbis.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>
+License: LGPL-2+
+ FIXME
+
+Files: COPYING
+ src/avl/COPYING
+ src/httpp/COPYING
+ src/net/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: 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>
+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+
+ 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: 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
+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: src/net/sock.h
+Copyright: 1999, the icecast team
+License: GPL-2+
+ FIXME
+
+Files: src/mp3.c
+Copyright: 2002-2003, the Icecast team <team at icecast.org>
+ = (header >> 3) & 0x01;
+License: LGPL-2+
+ FIXME
+
+Files: src/net/sock.c
+Copyright: 1999, the icecast team
+License: LGPL-2+
+ FIXME
+
+Files: install-sh
+Copyright: 1994, X Consortium
+License: MIT/X11 (BSD like)
+ FIXME
+
--
libshout packaging
More information about the pkg-multimedia-commits
mailing list