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

Sun Oct 19 20:10:19 UTC 2014

The following commit has been merged in the master branch:
commit 52335df43ae26686dbac52aead66eb40c38b34db
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Oct 16 21:47:11 2014 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 7c54602..ef01b22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+morituri (0.2.3-1) unstable; urgency=medium
+
+  [ upstream ]
+  * New release(s).
+
+  [ Jonas Smedegaard ]
+  * Drop patches 1001 2001: Adopted upstream.
+  * Fix use canonical Vcs-Git URL.
+  * Declare compliance with Debian Policy 3.9.6.
+  * Update Vcs-Browser URL to use cgit web frontend.
+  * Allow testsuite to fail: Apparently broken currently.
+    Closes: bug#718132. Thanks to David Suárez and Rob Browning.
+  * Update copyright info:
+    + Extend coverage of autotools files.
+    + Cover convenience code copy of musicbranzngs.
+  * Build-depend on python-gtk2: Apparently needed by epydoc, even if
+    never actually used at runtime.
+  * Add patch 2001 to fix hashbang for rip executable.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Thu, 16 Oct 2014 21:46:24 +0200
+
 morituri (0.2.0-2) unstable; urgency=low
 
   * Update README.source to emphasize control.in file as *not* a
diff --git a/debian/control b/debian/control
index 5daca16..d6efce6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: morituri
 Section: sound
 Priority: optional
 Maintainer: Jonas Smedegaard <dr at jones.dk>
-Build-Depends: devscripts,
- cdbs (>= 0.4.106~),
+Build-Depends: cdbs (>= 0.4.106~),
+ devscripts,
  python,
  automake1.11,
  autoconf,
@@ -21,9 +21,9 @@ Build-Depends: devscripts,
  python-docutils,
  gstreamer-tools,
  gstreamer0.10-tools
-Standards-Version: 3.9.4
-Vcs-Git: git://anonscm.debian.org/git/collab-maint/morituri
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/morituri.git
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/collab-maint/morituri
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/morituri.git
 Homepage: http://thomas.apestaart.org/morituri/trac/
 
 Package: morituri
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 5213f0d..4dfcefd 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -9,7 +9,9 @@ Files: AUTHORS
  Makefile.am
  NEWS
  README
+ README.md
  RELEASE
+ REVISION
  TODO
  bin/Makefile.am
  bin/rip.in
@@ -19,24 +21,21 @@ Files: AUTHORS
  debian/control
  debian/control.in
  debian/gbp.conf
- debian/patches/1001_no_hardcode_python_binary.patch
  debian/patches/1002_improve_manpage_sections.patch
- debian/patches/2001_use_system_musicbrainzngs.patch
+ debian/patches/2001_fix_python_hashbang.patch
  debian/patches/README
  debian/patches/series
  debian/pycompat
  debian/source/format
  debian/watch
  doc/Makefile.am
- doc/morituri.ics
- doc/morituri.rss2
  doc/rip.1
  etc/Makefile.am
  etc/bash_completion.d/Makefile.am
  etc/bash_completion.d/bash-compgen
+ etc/bash_completion.d/bash-compgen.in
  m4/Makefile.am
  m4/as-ac-expand.m4
- m4/as-python.m4
  m4/as-version.m4
  m4/pychecker.mk
  misc/Makefile.am
@@ -48,6 +47,7 @@ Files: AUTHORS
  morituri.spec.in
  morituri/Makefile.am
  morituri/common/Makefile.am
+ morituri/common/deps.py
  morituri/common/task.py
  morituri/configure/Makefile.am
  morituri/configure/configure.py
@@ -58,8 +58,10 @@ Files: AUTHORS
  morituri/extern/Makefile.am
  morituri/extern/asyncsub.py
  morituri/extern/command/command.py
+ morituri/extern/deps/deps.py
+ morituri/extern/deps/distro.py
  morituri/extern/log/log.py
- morituri/extern/musicbrainzngs/musicbrainz.py
+ morituri/extern/musicbrainzngs/__init__.py
  morituri/image/Makefile.am
  morituri/program/Makefile.am
  morituri/result/Makefile.am
@@ -77,6 +79,7 @@ Files: AUTHORS
  morituri/test/capital.fast.toc
  morituri/test/cdparanoia.progress
  morituri/test/cdparanoia.progress.error
+ morituri/test/cdparanoia.progress.strokes
  morituri/test/cdparanoia/MATSHITA.cdparanoia-A.log
  morituri/test/cdparanoia/MATSHITA.cdparanoia-A.stderr
  morituri/test/cdparanoia/PX-L890SA.cdparanoia-A.log
@@ -92,19 +95,27 @@ Files: AUTHORS
  morituri/test/kings-single.cue
  morituri/test/ladyhawke.toc
  morituri/test/morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json
+ morituri/test/morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json
+ morituri/test/morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json
+ morituri/test/morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json
  morituri/test/release.08397059-86c1-463b-8ed0-cd596dbd174f.xml
  morituri/test/release.93a6268c-ddf1-4898-bf93-fb862b1c5c5e.xml
  morituri/test/release.c7d919f4-3ea0-4c4b-a230-b3605f069440.xml
  morituri/test/silentalarm.result.pickle
+ morituri/test/strokes-someday.eac.cue
+ morituri/test/strokes-someday.toc
+ morituri/test/surferrosa.toc
  morituri/test/test_common_accurip.py
  morituri/test/test_common_cache.py
  morituri/test/test_common_checksum.py
  morituri/test/test_common_common.py
  morituri/test/test_common_config.py
+ morituri/test/test_common_directory.py
  morituri/test/test_common_drive.py
  morituri/test/test_common_encode.py
  morituri/test/test_common_gstreamer.py
- morituri/test/test_common_musicbrainzngs.py
+ morituri/test/test_common_mbngs.py
+ morituri/test/test_common_path.py
  morituri/test/test_common_program.py
  morituri/test/test_common_renamer.py
  morituri/test/test_image_cue.py
@@ -113,6 +124,7 @@ Files: AUTHORS
  morituri/test/test_image_toc.py
  morituri/test/test_program_cdparanoia.py
  morituri/test/test_program_cdrdao.py
+ morituri/test/totbl.fast.toc
  morituri/test/track-separate.cue
  morituri/test/track-single.cue
  morituri/test/track.flac
@@ -132,7 +144,8 @@ Files: misc/header.py
  morituri/common/gstreamer.py
  morituri/common/log.py
  morituri/common/logcommand.py
- morituri/common/musicbrainzngs.py
+ morituri/common/mbngs.py
+ morituri/common/path.py
  morituri/common/program.py
  morituri/common/renamer.py
  morituri/extern/task/gstreamer.py
@@ -159,7 +172,9 @@ License: GPL-3+
  FIXME
 
 Files: Makefile.in
+ aclocal.m4
  bin/Makefile.in
+ configure
  doc/Makefile.in
  etc/Makefile.in
  etc/bash_completion.d/Makefile.in
@@ -174,23 +189,31 @@ Files: Makefile.in
  morituri/result/Makefile.in
  morituri/rip/Makefile.in
  morituri/test/Makefile.in
-Copyright: 1994-2002
+Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc
+  1994-2013, Free Software Foundation, Inc
+  1996-2013, Free Software Foundation, Inc
+  1997-2013, Free Software Foundation, Inc
+  1999-2013, Free Software Foundation, Inc
+  2001-2013, Free Software Foundation, Inc
+  2002-2013, Free Software Foundation, Inc
+  2003-2013, Free Software Foundation, Inc
+  2004-2013, Free Software Foundation, Inc
+  2006-2013, Free Software Foundation, Inc
+  2009-2013, Free Software Foundation, Inc
+  2012, Free Software Foundation, Inc
 License: UNKNOWN
  FIXME
 
-Files: install-sh
-Copyright: 1994, X Consortium
-License: Expat
- FIXME
-
 Files: missing
-Copyright: 1996-1997, 1999-2000, 2002-2006
+ py-compile
+Copyright: 1996-2013, Free Software Foundation, Inc
+  2000-2013, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
-Files: py-compile
-Copyright: 2000-2001, 2003-2005, 2008-2009, 2011 Free
-License: GPL-2+
+Files: install-sh
+Copyright: 1994, X Consortium
+License: Expat
  FIXME
 
 Files: debian/rules
@@ -201,17 +224,8 @@ License: GPL-3+
 Files: COPYING
 Copyright: 2007, Free Software Foundation, Inc. <http://fsf.org/>
   <year> <name of author>
-  HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
   are not
   disclaimer" for the program, if necessary
-  holder as a result of your choosing to follow a
-  holder explicitly and
-  holder is
-  holder is reinstated (a)
-  holder notifies you of the
-  holder who authorizes use under this
-  holder, and you cure the violation prior to 30 days after
-  holders of
   if you do
   law
   law, except executing it on a
@@ -223,26 +237,8 @@ Copyright: 2007, Free Software Foundation, Inc. <http://fsf.org/>
 License: GPL-ever
  FIXME
 
-Files: aclocal.m4
-Copyright: 1996, 1998, 2000-2005, 2008
-  1996-1997, 2000-2001, 2003, 2005, 2008
-  1996-2004,
-  1997, 1999-2001, 2003-2005, 2008
-  1997, 2000-2001, 2003-2006, 2008
-  2001, 2003, 2005, 2008, 2011, Free Software Foundation
-  2001, 2003, 2005, 2011 Free Software Foundation, Inc
-  2001-2003, 2005, 2008, 2010 Free Software
-  2002-2003, 2005-2008, 2011 Free Software
-  2003, 2005 Free Software Foundation, Inc
-  2003-2006, 2011 Free Software Foundation
-  2004-2005, 2012 Free Software Foundation, Inc
-  2006, 2008, 2010, Free Software Foundation, Inc
-License: UNKNOWN
- FIXME
-
-Files: configure
-Copyright: 1992-1996, 1998-2001
-  2010, Free Software Foundation, Inc
+Files: morituri/extern/musicbrainzngs/musicbrainz.py
+Copyright: Alastair Porter, Adrian Sampson, and others
 License: UNKNOWN
  FIXME
 
@@ -254,7 +250,7 @@ License: UNKNOWN
  FIXME
 
 Files: INSTALL
-Copyright: 1994-1996, 1999-2002, 2004-2011, Free Software Foundation
+Copyright: 1994-1996, 1999-2002, 2004-2013, Free Software Foundation
 License: UNKNOWN
  FIXME
 

-- 
morituri packaging

