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

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a72be902aca991f81451cfa7b740c3da2b6a3fd0
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Aug 11 11:56:32 2011 +0200

    Update changelog, control file and copyright hints.

diff --git a/debian/changelog b/debian/changelog
index cb8458a..7243cde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,8 @@
-morituri (0.1.2-1.1) unstable; urgency=low
+morituri (0.1.2-2) UNRELEASED; urgency=low
 
-  * Non-maintainer upload.
-  * Change XS-Python-Version to ">= 2.4" from "all"
-    in debian/control (Closes: #630787).
+  * Switch to new default Python install helper (from python-central).
 
- -- Fabian Greffrath <fabian+debian at greffrath.com>  Thu, 11 Aug 2011 11:20:33 +0200
+ -- Jonas Smedegaard <dr at jones.dk>  Thu, 11 Aug 2011 11:55:50 +0200
 
 morituri (0.1.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b5bef0b..d53e5ce 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,7 @@ 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~),
- python-central,
  cdbs (>= 0.4.75~),
- python-dev (>= 2.3.5-7),
  debhelper (>= 6),
  dh-buildinfo,
  python-epydoc,
@@ -20,7 +18,6 @@ Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/morituri
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/morituri.git
 Homepage: http://thomas.apestaart.org/morituri/trac/
-XS-Python-Version: >= 2.4
 
 Package: morituri
 Architecture: all
@@ -28,7 +25,6 @@ Depends: ${python:Depends}, ${misc:Depends}, ${cdbs:Depends}
 Recommends: ${cdbs:Recommends}
 Suggests: ${cdbs:Suggests}
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: CD ripper aiming for maximum quality
  Morituri is a CD ripper aiming for accuracy over speed.
  .
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 1154bd5..b38b5da 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -21,6 +21,7 @@ Files: AUTHORS
  debian/gbp.conf
  debian/pycompat
  debian/source/format
+ debian/source/local-options
  debian/watch
  doc/Makefile.am
  doc/morituri.ics

-- 
morituri packaging