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

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ffda4d036d29784abf9090a1d8cf57059d38d4b6
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Feb 14 19:32:20 2012 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 488c6ab..82809b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,29 @@
-morituri (0.1.2-2) UNRELEASED; urgency=low
+morituri (0.1.2-2) unstable; urgency=low
 
+  * Acknowledge NMU. Thanks to Greor Hermann and Daniel T Chen.
+    Apparently also closes: bug#655859.
   * Switch to new default Python install helper (from python-central).
     Closes: bug#616909. Thanks to Matthias Klose.
+  * Update package relations:
+    + Tighten build-dependency on cdbs: Needed for new Python handling.
+    + Relax build-depend unversioned on debhelper and devscripts: needed
+      versions satisfied even in oldstable.
+    + Suggest (not build-depend or depend on) python-gtk2: needed only
+      in odd (unused?) taskgtk module.
+      Closes: bug#645331. Thanks to Julian Hughes.
+  * Drop dpkg-source local-options: Defaults since dpkg-source 1.16.1.
+  * Improve patch:
+    + Add upstream commit message.
+    + Refresh with shortening options -pab --no-index --no-timestamps.
+    + Drop Forwarded hint: wrong (not vendor-specific) and superfluous
+      (implied by bug hint).
+    + Rename to include the bug number 0535.
+  * Add patch README documenting numbering micro-format.
+  * Bump debhelper compat level to 7.
+  * Fix typo and slightly improve long description.
+    Closes: bug#646962. Thanks to Joe Dalton.
 
- -- Jonas Smedegaard <dr at jones.dk>  Thu, 11 Aug 2011 11:55:50 +0200
+ -- Jonas Smedegaard <dr at jones.dk>  Tue, 14 Feb 2012 19:19:30 +0100
 
 morituri (0.1.2-1.1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index d53e5ce..671e1d9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,13 @@ Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr at jones.dk>
-Build-Depends: devscripts (>= 2.10.7~),
- cdbs (>= 0.4.75~),
- debhelper (>= 6),
+Build-Depends: devscripts,
+ cdbs (>= 0.4.97~),
+ debhelper,
  dh-buildinfo,
  python-epydoc,
  pychecker,
  python-twisted-core,
- python-gtk2,
  python-gobject,
  python-gst0.10,
  gstreamer0.10-plugins-good (>= 0.10.22)
@@ -40,8 +39,9 @@ Description: CD ripper aiming for maximum quality
   - tagging and retagging using GStreamer, including MusicBrainz id's
   - for now, only a command line client (rip) is shipped
  .
- The following encoding profiles are always enabled: flac, wav, wavpack, vorbis
+ The following encoding profiles are always enabled: flac, wav, wavpack,
+ vorbis
  .
- Installing gstreamer0.10-ffmpeg provides encoding profile alac.
+ Installing gstreamer0.10-ffmpeg enables encoding profile alac.
  .
- Installing gstreamer0.10-lame profiles encoding profiles mp3 and mp3vbr.
+ Installing gstreamer0.10-lame enables encoding profiles mp3 and mp3vbr.
diff --git a/debian/copyright_hints b/debian/copyright_hints
index b38b5da..42fc632 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -19,9 +19,11 @@ Files: AUTHORS
  debian/control
  debian/control.in
  debian/gbp.conf
+ debian/patches/0535_skip_flacparse.patch
+ debian/patches/README
+ debian/patches/series
  debian/pycompat
  debian/source/format
- debian/source/local-options
  debian/watch
  doc/Makefile.am
  doc/morituri.ics
@@ -173,17 +175,17 @@ License: UNKNOWN
 
 Files: missing
 Copyright: 1996-1997, 1999-2000, 2002-2006
-License: GPL
+License: GPL-2+
  FIXME
 
 Files: py-compile
 Copyright: 2000-2001, 2003-2005, 2008-2009, Free Software
-License: GPL
+License: GPL-2+
  FIXME
 
 Files: debian/rules
 Copyright: 2009-2010, Jonas Smedegaard <dr at jones.dk>
-License: GPL
+License: GPL-2+
  FIXME
 
 Files: morituri/extern/command/test_command.py

-- 
morituri packaging