[Pkg-sdl-commits] [SCM] Debian packaging of SDL_mixer project branch, master, updated. debian/1.2.12-1-4-gb02c9fc

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 12499088b1b18347617c065c69b2733971494f3e
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Tue Apr 24 21:41:47 2012 +0100

    Changes for -2 revision
    
    Tweaking versions in depends, lintian warnings, policy standards version... Changes so far available in the changelog.
    
    Additionally, reverting previous commits dropping depends for -dev library

diff --git a/debian/changelog b/debian/changelog
index b93d47e..5d794b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
-sdl-mixer1.2 (1.2.12-2) UNRELEASED; urgency=low
-
-  * Drop unnecessary dependencies of libsdl-mixer1.2-dev.
-
- -- Felix Geyer <debfx-pkg at fobos.de>  Mon, 19 Mar 2012 13:14:54 +0100
+sdl-mixer1.2 (1.2.12-2) unstable; urgency=low
+
+  * Bump Policy Standards-Version to 3.9.3 (no changes needed)
+  * Build-Depends on debhelper>=9~, quells lintian warning
+    "package-needs-versioned-debhelper-build-depends 9"
+  * Build-Depends and Depends on SDL with added ~ to the version number, in
+    order to allow to work with backported/local versions
+  * Adding lintian overrides for the slightly different names "libsdl-mixer1.2"
+    and "libSDL-mixer-1.2-0" -- the package names are not going to change by now
+    for the 1.2 series
+  * Update debian/copyright format now that 1.0 is approved (quells lintian
+    unversioned-copyright-format-uri)
+
+ -- Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>  Tue, 01 May 2012 20:21:27 +0100
 
 sdl-mixer1.2 (1.2.12-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 0fe7f9c..d0db305 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.debian.org>
 Uploaders: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
 DM-Upload-Allowed: yes
-Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 8.9.0~),
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9~),
                dh-autoreconf,
                dpkg-dev (>= 1.16.1~),
                libflac-dev (>= 1.2.1),
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 8.9.0~),
                libmodplug-dev (>= 1:0.8.8),
                libmikmod2-dev (>= 3.1.11),
                libogg-dev (>= 1.2.0),
-               libsdl1.2-dev (>= 1.2.14),
+               libsdl1.2-dev (>= 1.2.14~),
                libtool,
                libvorbis-dev (>= 1.2.0)
 Homepage: http://www.libsdl.org/projects/SDL_mixer/
@@ -40,8 +40,13 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
+         libflac-dev (>= 1.2.1),
+         libmad0-dev (>= 0.15.1b),
+         libmikmod2-dev (>= 3.1.11),
+         libogg-dev (>= 1.2.0),
          libsdl-mixer1.2 (= ${binary:Version}),
-         libsdl1.2-dev (>= 1.2.14)
+         libsdl1.2-dev (>= 1.2.14~),
+         libvorbis-dev (>= 1.2.0)
 Description: Mixer library for Simple DirectMedia Layer 1.2, development files
  SDL_mixer is a sample multi-channel audio mixer library.  It supports any
  number of simultaneously playing channels of 16 bit stereo audio, plus a single
diff --git a/debian/copyright b/debian/copyright
index 65040b4..96f4f20 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: SDL_mixer
 Upstream-Contact: Sam Lantinga <slouken at libsdl.org>
 		  Stephane Peter <megastep at megastep.org>
@@ -34,7 +34,7 @@ Comment: From README
  GNU GPL, (2) the GNU LGPL, or (3) the Perl Artistic License.
 
 Files: debian/*
-Copyright: 2011-2012, Manuel A. Fernandez Montecelo
+Copyright: 2011-2012, Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
            2011, Roman Vasiyarov <rvasiyarov at gmail.com>
            2010, Jon Dowland <jmtd at debian.org>
            2009, Barry deFreese <bdefreese at debian.org>
diff --git a/debian/libsdl-mixer1.2.lintian-overrides b/debian/libsdl-mixer1.2.lintian-overrides
new file mode 100644
index 0000000..b94b2f2
--- /dev/null
+++ b/debian/libsdl-mixer1.2.lintian-overrides
@@ -0,0 +1 @@
+libsdl-mixer1.2: package-name-doesnt-match-sonames libSDL-mixer-1.2-0
diff --git a/debian/rules b/debian/rules
index 739050d..8e96f25 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,5 +44,5 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	dh_auto_configure -- $(confflags)
 
-override_dh_auto_installchangelogs:
-	dh_auto_installchangelogs -- CHANGES
+override_dh_installchangelogs:
+	dh_installchangelogs -- CHANGES

-- 
Debian packaging of SDL_mixer project