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

Sun Nov 29 17:51:04 UTC 2015

The following commit has been merged in the master branch:
commit 7600b3f30ce67a0631fef83248d431ad17b9709d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Nov 29 18:10:13 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index b79c0a4..355fab2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,29 @@
-morituri (0.2.3-2) UNRELEASED; urgency=medium
+morituri (0.2.3-2) experimental; urgency=medium
 
   * Packaging moved back to multimedia team. Update Cvs-* fields and
     Maintainer.
   * Add Alessio Treglia as uploader.
-
- -- Jonas Smedegaard <dr at jones.dk>  Sun, 19 Oct 2014 22:13:28 +0200
+  * Add patches cherry-picked upstream:
+    + Make sure rip cd rip -U works.
+      Closes: Bug#774667. Thanks to Manolo Díaz.
+    + Modernize musicbrainz.org URLs.
+    + Make clearer what pycdio is needed for.
+  * Update copyright info:
+    + Use common License shortname X11.
+    + Drop Files and License sections obsolete since 0.1.3.
+    + Use License-Grant and License-Reference fields.
+      Thanks to Ben Finney.
+    + Extend copyright of packaging to cover recent years.
+  * Add lintian override regarding license in License-Reference field.
+    See bug#786450.
+  * Bump debhelper compatibility level to 9.
+  * Add lintian override regarding debhelper 9.
+  * Add patch 1001 cherry-picked from Github fork, to (crudely, for now)
+    migrate to GStreamer 1.0.
+  * Update package relations: Adjust for switch to GStreamer 1.0.
+    Closes: Bug#785867. Thanks to Sebastian Dröge.
+
+ -- Jonas Smedegaard <dr at jones.dk>  Sun, 29 Nov 2015 18:04:59 +0100
 
 morituri (0.2.3-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index f97d0ed..e7c0fa3 100644
--- a/debian/control
+++ b/debian/control
@@ -12,17 +12,18 @@ Build-Depends: cdbs (>= 0.4.106~),
  python-dev (>= 2.3.5-7),
  debhelper,
  dh-buildinfo,
+ python-gi,
  python-gobject,
- python-gst0.10,
+ python-gst-1.0,
  cdparanoia,
- gstreamer0.10-plugins-good (>= 0.10.22),
+ gstreamer1.0-plugins-good,
  python-musicbrainzngs (>= 0.2-1.1~),
  python-epydoc,
  pychecker,
  python-twisted-core,
  python-docutils,
  gstreamer-tools,
- gstreamer0.10-tools
+ gstreamer1.0-tools
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/morituri
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/morituri.git
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 4dfcefd..e9d6aeb 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -5,6 +5,7 @@ Source: FIXME
 Disclaimer: Autogenerated by CDBS
 
 Files: AUTHORS
+ ChangeLog
  HACKING
  Makefile.am
  NEWS
@@ -21,12 +22,20 @@ Files: AUTHORS
  debian/control
  debian/control.in
  debian/gbp.conf
+ debian/patches/020141005~01f07c5.patch
+ debian/patches/020141102-0301~f08d0a2.patch
+ debian/patches/020141102-0303~926ce46.patch
+ debian/patches/020141102-1117~d81dd33.patch
+ debian/patches/020141102-1118~7bf7554.patch
+ debian/patches/020150905~4bfbc90.patch
+ debian/patches/1001_modernize_gstreamer.patch
  debian/patches/1002_improve_manpage_sections.patch
  debian/patches/2001_fix_python_hashbang.patch
  debian/patches/README
  debian/patches/series
  debian/pycompat
  debian/source/format
+ debian/source/lintian-overrides
  debian/watch
  doc/Makefile.am
  doc/rip.1
@@ -192,15 +201,6 @@ Files: Makefile.in
 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
 
@@ -211,8 +211,15 @@ Copyright: 1996-2013, Free Software Foundation, Inc
 License: GPL-2+
  FIXME
 
+Files: morituri/extern/musicbrainzngs/mbxml.py
+ morituri/extern/musicbrainzngs/musicbrainz.py
+Copyright: Alastair Porter, Adrian Sampson, and others
+License: UNKNOWN
+ FIXME
+
 Files: install-sh
 Copyright: 1994, X Consortium
+  and license
 License: Expat
  FIXME
 
@@ -222,24 +229,8 @@ License: GPL-3+
  FIXME
 
 Files: COPYING
-Copyright: 2007, Free Software Foundation, Inc. <http://fsf.org/>
-  <year> <name of author>
-  are not
-  disclaimer" for the program, if necessary
-  if you do
-  law
-  law, except executing it on a
-  on the Program, and are irrevocable provided the stated
-  on the software, and (2) offer you this License
-  permission
-  permission, other than the making of an
-  treaty adopted on 20 December 1996, or
-License: GPL-ever
- FIXME
-
-Files: morituri/extern/musicbrainzngs/musicbrainz.py
-Copyright: Alastair Porter, Adrian Sampson, and others
-License: UNKNOWN
+Copyright: 2007, Free Software Foundation, Inc. <http:fsf.org/>
+License: GPL-ever GPL (vever)
  FIXME
 
 Files: morituri/test/cdrdao.readtoc.progress
@@ -254,19 +245,8 @@ Copyright: 1994-1996, 1999-2002, 2004-2013, Free Software Foundation
 License: UNKNOWN
  FIXME
 
-Files: ChangeLog
-Copyright: González.toc (added):
-  González.toc (deleted):
-License: UNKNOWN
- FIXME
-
 Files: morituri/extern/python-command/scripts/help2man
 Copyright: 2009, Thomas Vander Stichele
 License: UNKNOWN
  FIXME
 
-Files: morituri/extern/musicbrainzngs/mbxml.py
-Copyright: for c in cl
-License: UNKNOWN
- FIXME
-

-- 
morituri packaging

