[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
Tue Aug 29 11:14:27 UTC 2017
The following commit has been merged in the master branch:
commit c59bd12635a235160a8e02affa103d814b0c2f62
Author: Jonas Smedegaard <dr at jones.dk>
Date: Tue Aug 29 13:11:26 2017 +0200
Prepare for release: Update changelog, control file and copyright hints.
diff --git a/debian/changelog b/debian/changelog
index c0e53a4..1f35e3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+libshout (2.3.1-4) experimental; urgency=medium
+
+ * Update copyright info:
+ + Add alternative git source URL.
+ + Use SPDX License shortnames.
+ + Extend coverage for myself.
+ + Use License-Grant and License-Reference fields.
+ Thanks to Ben Finney.
+ + Fix add Files section licensed as GPL-2.
+ * Modernize cdbs:
+ + Do copyright-check in maintainer script (not during build).
+ Stop build-depend on devscripts.
+ * Add lintian overrides regarding License-Reference.
+ * Advertise DEP-3 format in patch headers.
+ * Use debhelper compatibility level 9.
+ * Modernize Vcs-* fields:
+ + Use https protocol.
+ + Use git (not gitweb) in path.
+ * Declare compliance with Debian Policy 4.1.0.
+ * Update git-buildpackage config:
+ + Add usage comment.
+ + Filter any .git* files.
+ * Use newest autotools.
+ Build-depend on automake (not automake1.11).
+ Closes: Bug#865186. Thanks to Simon McVittie
+ * Stop pre-depend on multiarch.
+ Closes: Bug#870425, #870515. Thanks to Jörg-Volker Peetz and
+ Aurelien Jarno.
+ * Update watch file:
+ + Bump format version.
+ + Mention gbp --uscan in usage comment.
+ + Tighten version regex.
+ * Add symbols file.
+ * Track symbols using pkgkde-symbolshelper.
+ Build-depend on pkg-kde-tools.
+
+ -- Jonas Smedegaard <dr at jones.dk> Tue, 29 Aug 2017 13:11:05 +0200
+
libshout (2.3.1-3) unstable; urgency=low
* Bump dephelper compatibility level to 8.
diff --git a/debian/control b/debian/control
index 2f7f406..5d98a1e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,10 @@ Uploaders: Jonas Smedegaard <dr at jones.dk>,
Guillaume Pellerin <yomguy at altern.org>,
Romain Beauxis <toots at rastageeks.org>,
Ying-Chun Liu <grandpaul at gmail.com>
-Build-Depends: autotools-dev,
- devscripts,
- cdbs (>= 0.4.106~),
+Build-Depends: cdbs,
+ autotools-dev,
libtool,
- automake1.11,
+ automake,
autoconf,
debhelper,
dh-buildinfo,
@@ -19,10 +18,11 @@ Build-Depends: autotools-dev,
pkg-config,
libtheora-dev,
libspeex-dev,
- d-shlibs (>= 0.48)
-Vcs-Git: git://anonscm.debian.org/pkg-multimedia/libshout.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/libshout.git
-Standards-Version: 3.9.4
+ d-shlibs (>= 0.48),
+ pkg-kde-tools
+Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/libshout.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-multimedia/libshout.git
+Standards-Version: 4.1.0
Homepage: http://www.icecast.org/
Package: libshout3-dev
@@ -53,8 +53,7 @@ Package: libshout3
Section: libs
Architecture: any
Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
- ${cdbs:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: MP3/Ogg Vorbis broadcast streaming library
diff --git a/debian/copyright_hints b/debian/copyright_hints
index ed79b1f..dbb4799 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -7,7 +7,6 @@ Disclaimer: Autogenerated by CDBS
Files: INSTALL
Makefile.am
NEWS
- README
config.h.in
configure.ac
debian/README.source
@@ -16,6 +15,7 @@ Files: INSTALL
debian/control.in
debian/gbp.conf
debian/libshout3-dev.install
+ debian/libshout3.symbols
debian/patches/1001_upstream_is_not_debian.patch
debian/patches/1003_fix_pkg-config_requires.patch
debian/patches/README
@@ -51,8 +51,6 @@ Files: INSTALL
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
@@ -68,13 +66,11 @@ Files: INSTALL
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*
+Copyright: NONE
License: UNKNOWN
FIXME
@@ -83,6 +79,7 @@ Files: Makefile.in
examples/Makefile.in
include/Makefile.in
include/shout/Makefile.in
+ m4/ltoptions.m4
src/Makefile.in
src/avl/Makefile.in
src/httpp/Makefile.in
@@ -90,11 +87,13 @@ Files: Makefile.in
src/thread/Makefile.in
src/timing/Makefile.in
win32/Makefile.in
-Copyright: 1994-2002
+Copyright: 1994-2009, Free Software Foundation,
+ 2004-2005, 2007-2009, Free Software Foundation,
License: UNKNOWN
FIXME
Files: include/shout/shout.h.in
+ src/mp3.c
src/ogg.c
src/shout.c
src/shout_ogg.h
@@ -117,25 +116,30 @@ Files: COPYING
src/net/COPYING
src/thread/COPYING
src/timing/COPYING
-Copyright: 1991, Free Software Foundation, Inc
+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
+ ed by the Free Software Foundation, write to the Free
+ ed interfaces, the
interest in the
- law: that is to say, a work containing the Library or a
- notices, you must include the
-License: LGPL-ever
+ the library, and (2) offer you this license which gives you legal
+License: LGPL-2+
+ FIXME
+
+Files: src/httpp/httpp.c
+ src/httpp/httpp.h
+ src/timing/timing.c
+ src/timing/timing.h
+Copyright: NONE
+License: GPL-2
FIXME
Files: config.guess
config.sub
missing
-Copyright: 1992-1999,
- 1992-2001
- 1996-1997, 1999-2000, 2002-2006
+Copyright: 1992-2008, Free Software Foundation, Inc.
+ 1992-2009, Free Software Foundation, Inc.
+ 1996-1997, 1999-2000, 2002-2006, 2008-2009, Free Software Foundation, Inc.
License: GPL-2+
FIXME
@@ -150,9 +154,9 @@ License: LGPL-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
+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
@@ -169,68 +173,72 @@ License: Expat
FIXME
Files: configure
-Copyright: (ISLOWER ? 'A' + ( - 'a') : )
- (ISLOWER ? ( | 0x40) : )
- 1992-1996, 1998-2001,
- 1996-2001, 2003-2005
- 2010, Free Software Foundation, Inc
+Copyright: 1992-1996, 1998-2010, Free Software
+ 1996-2001, 2003-2010, Free Software Foundation,
+ 2010, Free Software Foundation, Inc.
+License: FSFUL and/or GPL-2+
+ FIXME
+
+Files: depcomp
+Copyright: 1999-2000, 2003-2007, 2009, Free
License: GPL-2+
FIXME
Files: m4/libtool.m4
-Copyright: 1996-2001, 2003-2005
- 2010, Free Software Foundation, Inc
+Copyright: 1996-2001, 2003-2010, Free Software Foundation,
+ 2010, Free Software Foundation, Inc.
License: GPL-2+
FIXME
Files: aclocal.m4
-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
+Copyright: 1996, 1998, 2000-2005, 2008, Free Software Foundation, Inc.
+ 1996-1997, 2000-2001, 2003, 2005, 2008, Free Software Foundation, Inc.
+ 1996-1997, 2000-2001, 2003, 2005, Free Software Foundation, Inc.
+ 1996-2006, 2008-2009, Free Software Foundation, Inc.
+ 1996-2009, Free Software Foundation, Inc.
+ 1997, 1999-2001, 2003-2005, 2008, Free Software Foundation, Inc.
+ 1997, 2000-2001, 2003-2006, 2008, Free Software Foundation, Inc.
+ 1999-2005, 2008, Free Software Foundation, Inc.
+ 1999-2006, 2009, Free Software Foundation, Inc.
+ 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-2006
+Copyright: 1996-2001, 2003-2010, Free Software Foundation, Inc.
all begin with the string "--lt-"
License: GPL-2+
FIXME
-Files: depcomp
-Copyright: 1999-2000, 2003-2007, 2009 Free
+Files: src/net/sock.h
+Copyright: 1999, the icecast team
License: GPL-2+
FIXME
Files: debian/rules
-Copyright: 2003, Keegan Quinn <ice at thebasement.org>
- 2004-2008, 2011-2013, Jonas
-License: GPL-2+
+Copyright: -check =
+ 2003, Keegan Quinn <ice at thebasement.org>
+ 2004-2008, 2011-2013, 2016-2017, Jonas Smedegaard
+License: GPL-3+
FIXME
-Files: src/net/sock.h
-Copyright: 1999, the icecast team
-License: GPL-2+
+Files: debian/copyright-check
+Copyright: 2016-2017, Jonas Smedegaard <dr at jones.dk>
+License: GPL-3+
FIXME
-Files: src/mp3.c
-Copyright: 2002-2003, the Icecast team <team at icecast.org>
- = (header >> 3) & 0x01;
-License: LGPL-2+
+Files: README
+Copyright: NONE
+License: LGPL
FIXME
Files: src/opus.c
@@ -244,8 +252,16 @@ Copyright: 1999, the icecast team
License: LGPL-2+
FIXME
-Files: m4/ltoptions.m4
-Copyright: 2004-2005, 2007-2009, Free Software Foundation
+Files: debian/source/lintian-overrides
+Copyright: GPL-2
+ GPL-2+
+ GPL-2+~file
+ GPL-3+
+ LGPL-2+
+ gpl-2
+ gpl-2+
+ gpl-3+
+ lgpl-2+
License: UNKNOWN
FIXME
--
libshout packaging
More information about the pkg-multimedia-commits
mailing list