[Pkg-sdl-commits] [SCM] Debian packaging of SDL_image 1.2 branch, master, updated. debian/1.2.12-1-1-g32bc651

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 32bc651050ad2200ad1040a8ff79edf8cfc15328
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Tue May 1 19:39:50 2012 +0100

    Changes for 1.2.12-2, see the changelog for the full changes

diff --git a/debian/changelog b/debian/changelog
index e497170..8253bfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+sdl-image1.2 (1.2.12-2) unstable; urgency=low
+
+  * Adding back dependencies of libsdl-image1.2-dev to avoid FTBFS in packages
+    depending on this one, while we decide what to do in the long run
+   (Closes: #669571)
+  * Re-tweaked debian/rules, especially dh_autoreconf so it executes
+    'autogen.sh' properly (Closes: #669504)
+  * Bumped Policy Standards-Version to 3.9.3 (no changes needed)
+  * Set copyright-format version to 1.0
+
+ -- Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>  Tue, 01 May 2012 19:25:58 +0100
+
 sdl-image1.2 (1.2.12-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index f3587e1..a7802e0 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9),
                libtiff4-dev,
                libwebp-dev (>= 0.1.3),
                zlib1g-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.libsdl.org/projects/SDL_image/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-sdl/packages/sdl-image1.2.git
 Vcs-Git: git://anonscm.debian.org/pkg-sdl/packages/sdl-image1.2.git
@@ -36,7 +36,12 @@ Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libsdl-image1.2 (= ${binary:Version}),
-         libsdl1.2-dev (>= 1.2.14)
+         libsdl1.2-dev (>= 1.2.14),
+         libjpeg-dev,
+         libpng-dev,
+         libtiff4-dev,
+         libwebp-dev (>= 0.1.3),
+         zlib1g-dev
 Description: Image loading library for Simple DirectMedia Layer 1.2, development files
  This is a simple library to load images of various formats as SDL surfaces.  It
  supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF,
diff --git a/debian/copyright b/debian/copyright
index ac5dfbc..84127ef 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_image
 Upstream-Contact: Sam Lantinga <slouken at libsdl.org>
 		  Mattias Engdegård <f91-men at nada.kth.se>
diff --git a/debian/rules b/debian/rules
index a3a0ad3..62180dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 
 #export DH_VERBOSE=1
 
+export DEB_CFLAGS_MAINT_APPEND  = -pipe -Wall
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 
@@ -15,7 +16,7 @@ confflags += --disable-webp-shared
 	dh $@ --with autoreconf --parallel
 
 override_dh_autoreconf:
-	AUTOMAKE="automake --foreign" dh_autoreconf --as-needed
+	AUTOMAKE="automake --foreign" dh_autoreconf --as-needed ./autogen.sh
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(confflags)

-- 
Debian packaging of SDL_image 1.2