[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 12:28:51 UTC 2017
The following commit has been merged in the master branch:
commit 4346249779187b9d04c4295e3965224985387812
Author: Jonas Smedegaard <dr at jones.dk>
Date: Tue Aug 29 14:26:45 2017 +0200
Prepare for release: Update changelog, control file and copyright hints.
diff --git a/debian/changelog b/debian/changelog
index 1f35e3e..d9e7ca6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+libshout (2.4.1-1) unstable; urgency=medium
+
+ [ upstream ]
+ * New release(s).
+
+ [ Jonas Smedegaard ]
+ * Update copyright info:
+ + Extend and merge most upstream Files sections, now relicensed to
+ LGPL-2+.
+ + Extend and refine coverage of autotools.
+ * Build-depend on libssl1.0-dev.
+ * Drop patches: Adopted/addressed upstream.
+ * Update symbols.
+ * Tighten lintian overrides regarding License-Reference.
+
+ -- Jonas Smedegaard <dr at jones.dk> Tue, 29 Aug 2017 14:26:36 +0200
+
libshout (2.3.1-4) experimental; urgency=medium
* Update copyright info:
diff --git a/debian/control b/debian/control
index 5d98a1e..21a1a1a 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends: cdbs,
pkg-config,
libtheora-dev,
libspeex-dev,
+ libssl1.0-dev,
d-shlibs (>= 0.48),
pkg-kde-tools
Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/libshout.git
diff --git a/debian/copyright_hints b/debian/copyright_hints
index dbb4799..7e8979f 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -16,10 +16,6 @@ Files: INSTALL
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
- debian/patches/series
debian/source/format
debian/watch
doc/Makefile.am
@@ -31,6 +27,7 @@ Files: INSTALL
include/Makefile.am
include/os.h
include/shout/Makefile.am
+ libshout.ckport
m4/acx_pthread.m4
m4/ogg.m4
m4/shout.m4
@@ -39,34 +36,32 @@ Files: INSTALL
m4/vorbis.m4
m4/xiph_compiler.m4
m4/xiph_net.m4
+ m4/xiph_openssl.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/avl.dsp
- src/avl/test.c
- src/httpp/Makefile.am
- src/httpp/README
- src/httpp/TODO
- 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/util.h
+ src/common/avl/BUILDING
+ src/common/avl/Makefile.am
+ src/common/avl/README
+ src/common/avl/TODO
+ src/common/avl/avl.dsp
+ src/common/avl/test.c
+ src/common/httpp/Makefile.am
+ src/common/httpp/README
+ src/common/httpp/TODO
+ src/common/net/BUILDING
+ src/common/net/Makefile.am
+ src/common/net/README
+ src/common/net/TODO
+ src/common/net/test_resolver.c
+ src/common/thread/BUILDING
+ src/common/thread/Makefile.am
+ src/common/thread/README
+ src/common/thread/TODO
+ src/common/timing/BUILDING
+ src/common/timing/Makefile.am
+ src/common/timing/README
+ src/common/timing/TODO
win32/Makefile.am
win32/libshout.dsp
win32/libshout.dsw
@@ -79,29 +74,59 @@ Files: Makefile.in
examples/Makefile.in
include/Makefile.in
include/shout/Makefile.in
- m4/ltoptions.m4
+ m4/ltsugar.m4
+ m4/ltversion.m4
+ m4/lt~obsolete.m4
src/Makefile.in
- src/avl/Makefile.in
- src/httpp/Makefile.in
- src/net/Makefile.in
- src/thread/Makefile.in
- src/timing/Makefile.in
+ src/common/avl/Makefile.in
+ src/common/httpp/Makefile.in
+ src/common/net/Makefile.in
+ src/common/thread/Makefile.in
+ src/common/timing/Makefile.in
win32/Makefile.in
-Copyright: 1994-2009, Free Software Foundation,
- 2004-2005, 2007-2009, Free Software Foundation,
+Copyright: 1994-2014, Free Software Foundation, Inc.
+ 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/common/httpp/httpp.c
+ src/common/httpp/httpp.h
+ src/common/net/resolver.c
+ src/common/net/sock.c
+ src/common/net/sock.h
+ src/common/thread/thread.c
+ src/common/thread/thread.h
+ src/common/timing/timing.c
+ src/common/timing/timing.h
+Copyright: 2014, Michael Smith <msmith at icecast.org>,
+License: LGPL-2+
+ FIXME
+
Files: include/shout/shout.h.in
- src/mp3.c
- src/ogg.c
+ src/proto_http.c
+ src/proto_icy.c
+ src/proto_xaudiocast.c
+ src/queue.c
src/shout.c
- src/shout_ogg.h
- src/speex.c
- src/theora.c
+ src/shout_private.h
src/util.c
- src/vorbis.c
- src/webm.c
+ src/util.h
+Copyright: 2002-2003, the Icecast team <team at icecast.org>,
+ 2002-2004, the Icecast team <team at icecast.org>,
+ 2012, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
+ 2012-2015, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
+License: LGPL-2+
+ FIXME
+
+Files: src/codec_speex.c
+ src/codec_theora.c
+ src/codec_vorbis.c
+ src/format_mp3.c
+ src/format_ogg.c
+ src/format_ogg.h
+ src/format_webm.c
Copyright: 2002-2003, 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>
@@ -111,11 +136,11 @@ License: LGPL-2+
FIXME
Files: COPYING
- src/avl/COPYING
- src/httpp/COPYING
- src/net/COPYING
- src/thread/COPYING
- src/timing/COPYING
+ src/common/avl/COPYING
+ src/common/httpp/COPYING
+ src/common/net/COPYING
+ src/common/thread/COPYING
+ src/common/timing/COPYING
Copyright: 1991, Free Software Foundation, Inc.
<year> <name of author>
disclaimer" for the library, if
@@ -126,42 +151,29 @@ Copyright: 1991, Free Software Foundation, Inc.
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
+Files: compile
+ depcomp
missing
-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.
+Copyright: 1996-2014, Free Software Foundation, Inc.
+ 1999-2014, Free Software Foundation, Inc.
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>
+Files: src/common/httpp/encoding.c
+ src/common/httpp/encoding.h
+ src/proto_roaraudio.c
+Copyright: 2015, Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org>
License: LGPL-2+
FIXME
-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
+Files: config.guess
+ config.sub
+Copyright: 1992-2014, Free Software Foundation, Inc.
+License: GPL-3
FIXME
-Files: src/avl/avl.c
- src/avl/avl.h
+Files: src/common/avl/avl.c
+ src/common/avl/avl.h
Copyright: 1995, Sam Rushing <rushing at nightmare.com>
1995-1997, Sam Rushing <rushing at nightmare.com>
License: UNKNOWN
@@ -173,57 +185,38 @@ License: Expat
FIXME
Files: configure
-Copyright: 1992-1996, 1998-2010, Free Software
- 1996-2001, 2003-2010, Free Software Foundation,
- 2010, Free Software Foundation, Inc.
+Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
+ 1996-2001, 2003-2011, Free Software
+ 2012, 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-2010, Free Software Foundation,
- 2010, Free Software Foundation, Inc.
+Copyright: 1996-2001, 2003-2011, Free Software
+ 2011, Free Software Foundation, Inc.
License: GPL-2+
FIXME
Files: aclocal.m4
-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.
+Copyright: 1996-2014, Free Software Foundation, Inc.
+ 1997-2014, Free Software Foundation, Inc.
+ 1999-2014, Free Software Foundation, Inc.
+ 2001-2014, Free Software Foundation, Inc.
+ 2002-2014, Free Software Foundation, Inc.
+ 2003-2014, Free Software Foundation, Inc.
2004, Scott James Remnant <scott at netsplit.com>.
- 2004-2005, Free Software Foundation, Inc.
- 2006, 2008, Free Software Foundation, Inc.
+ 2004-2014, Free Software Foundation, Inc.
+ 2006-2014, Free Software Foundation, Inc.
+ 2009-2014, Free Software Foundation, Inc.
License: GPL-2+
FIXME
Files: ltmain.sh
-Copyright: 1996-2001, 2003-2010, Free Software Foundation, Inc.
+Copyright: 1996-2001, 2003-2011, Free Software Foundation, Inc.
all begin with the string "--lt-"
License: GPL-2+
FIXME
-Files: src/net/sock.h
-Copyright: 1999, the icecast team
-License: GPL-2+
- FIXME
-
Files: debian/rules
Copyright: -check =
2003, Keegan Quinn <ice at thebasement.org>
@@ -241,15 +234,25 @@ Copyright: NONE
License: LGPL
FIXME
-Files: src/opus.c
+Files: src/common/net/resolver.h
+Copyright: 2014, Brendan Cully <brendan at xiph.org>,
+License: LGPL-2+
+ FIXME
+
+Files: src/tls.c
+Copyright: 2015, Philipp Schafft <lion at lion.leolix.org>
+License: LGPL-2+
+ FIXME
+
+Files: src/codec_opus.c
Copyright: 2005, the Icecast team <team at icecast.org>
2011-2012, Xiph.Org Foundation
License: LGPL-2+
FIXME
-Files: src/net/sock.c
-Copyright: 1999, the icecast team
-License: LGPL-2+
+Files: m4/ltoptions.m4
+Copyright: 2004-2005, 2007-2009, Free Software Foundation,
+License: UNKNOWN
FIXME
Files: debian/source/lintian-overrides
--
libshout packaging
More information about the pkg-multimedia-commits
mailing list