[Pkg-sdl-commits] [SCM] Debian packaging of SDL_image 1.2 branch, master, updated. debian/1.2.10-3-7-gbf0548f

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit f35c4d72c1c01a06cc38f97dcc3afe04c0a57e5d
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Fri Jan 20 23:40:02 2012 +0000

    Revisiting debian/rules, no big changes except for added support of WebP image format, adding it to debian/control dependencies

diff --git a/debian/control b/debian/control
index b755fc0..7ac7c95 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 8.9.0~),
                libjpeg-dev,
                libpng-dev,
                libtiff4-dev,
+               libwebp-dev (>= 0.1.3),
                zlib1g-dev
 Standards-Version: 3.9.2
 Homepage: http://www.libsdl.org/projects/SDL_image/
@@ -41,6 +42,7 @@ Depends: ${misc:Depends},
          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
diff --git a/debian/rules b/debian/rules
index 76191fc..39e9abf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,42 @@
 #!/usr/bin/make -f
 
-%:
-	dh $@ --parallel
+#export DH_VERBOSE=1
 
-override_dh_auto_configure:
-	dh_auto_configure -- --disable-jpg-shared --disable-tif-shared --disable-png-shared
+# mafm: introduced but commented out for new upstream 1.2.11-1, to uncomment
+# later when 1.2.11 is known to work fine
+#
+#export DEB_CFLAGS_MAINT_APPEND = -pipe -Wall
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-undefined -Wl,-Bsymbolic -Wl,--as-needed
 
-override_dh_install:
-	dh_install --fail-missing -XlibSDL_image.la
 
-override_dh_install_changelogs:
-	dh_installchangelogs CHANGES
+# according to help: speeds up one-time build
+confflags = --disable-dependency-tracking
+
+# features -- disable building as plugins, otherwise dh_shlibs
+confflags += --disable-jpg-shared
+confflags += --disable-tif-shared
+confflags += --disable-png-shared
+confflags += --disable-webp-shared
+
+%:
+	dh $@ --with autoreconf --parallel
+
+override_dh_autoreconf:
+	dh_autoreconf ./autogen.sh
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(confflags)
 
-override_dh_makeshlibs:
-	dh_makeshlibs -V 'libsdl-image1.2 (>= 1.2.10)'
+# mafm: is this really needed?
+#
+#override_dh_makeshlibs:
+#	dh_makeshlibs -V 'libsdl-image1.2 (>= 1.2.11)'
 
 override_dh_compress:
 	dh_compress -Xshowimage.c
+
+override_dh_install:
+	dh_install --fail-missing -XlibSDL_image.la
+
+override_dh_auto_installchangelogs:
+	dh_auto_installchangelogs -- CHANGES

-- 
Debian packaging of SDL_image 1.2