r14349 - in packages/trunk/gimp-dds/debian: . patches

[Vincent Fourmond]

Author: fourmond
Date: 2013-06-27 22:19:36 +0000 (Thu, 27 Jun 2013)
New Revision: 14349

Modified:
   packages/trunk/gimp-dds/debian/changelog
   packages/trunk/gimp-dds/debian/control
   packages/trunk/gimp-dds/debian/patches/makefile.diff
   packages/trunk/gimp-dds/debian/rules
Log:
[gimp-dds] new upstream version

Modified: packages/trunk/gimp-dds/debian/changelog
===================================================================
--- packages/trunk/gimp-dds/debian/changelog	2013-06-27 06:45:12 UTC (rev 14348)
+++ packages/trunk/gimp-dds/debian/changelog	2013-06-27 22:19:36 UTC (rev 14349)
@@ -1,3 +1,14 @@
+gimp-dds (2.2.1-1) unstable; urgency=low
+
+  * New upstream release, which fixes a FTBS (closes: #713553)
+  * Fix small typo in package description, thanks to Erik Esterer
+    <erik.esterer at gmail.com> (closes: #626917)
+  * Switch to dh debian/rules
+  * Refresh the patch on upstream makefile to make sure that debian global 
+    flags are used
+
+ -- Vincent Fourmond <fourmond at debian.org>  Fri, 28 Jun 2013 00:15:15 +0200
+
 gimp-dds (2.0.9-3) unstable; urgency=low
 
   * Update to the new home for gimp-dds

Modified: packages/trunk/gimp-dds/debian/control
===================================================================
--- packages/trunk/gimp-dds/debian/control	2013-06-27 06:45:12 UTC (rev 14348)
+++ packages/trunk/gimp-dds/debian/control	2013-06-27 22:19:36 UTC (rev 14349)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Vincent Fourmond <fourmond at debian.org>
-Build-Depends: debhelper (>= 5), libgimp2.0-dev (>=2.6), pkg-config,
+Build-Depends: debhelper (>= 8), libgimp2.0-dev (>=2.6), pkg-config,
  libgtk2.0-dev
-Standards-Version: 3.9.0
+Standards-Version: 3.9.4
 Homepage: http://code.google.com/p/gimp-dds/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/gimp-dds
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/gimp-dds/?op=log
@@ -13,7 +13,7 @@
 Package: gimp-dds
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: DDS (DirectDraw Surface) plugin for the gimp
- gimp-dds is a plugin for the gimp that lets you manipulate Microsoft
+Description: DDS (DirectDraw Surface) plugin for GIMP
+ gimp-dds is a plugin for GIMP that lets you manipulate Microsoft
  DirectDraw surfaces. These kind of files are widely used in 3D games for
  textures and the like.

Modified: packages/trunk/gimp-dds/debian/patches/makefile.diff
===================================================================
--- packages/trunk/gimp-dds/debian/patches/makefile.diff	2013-06-27 06:45:12 UTC (rev 14348)
+++ packages/trunk/gimp-dds/debian/patches/makefile.diff	2013-06-27 22:19:36 UTC (rev 14349)
@@ -1,16 +1,25 @@
 Add the --as-needed flag to take down the number of libraries linked
 against this package
 
-Index: gimp-dds-2.0.7/Makefile.linux
+Index: gimp-dds-2.2.1/Makefile
 ===================================================================
---- gimp-dds-2.0.7.orig/Makefile.linux	2008-12-10 19:07:18.000000000 +0100
-+++ gimp-dds-2.0.7/Makefile.linux	2010-02-16 00:39:50.128690353 +0100
-@@ -4,7 +4,7 @@
+--- gimp-dds-2.2.1.orig/Makefile	2012-07-26 09:25:36.000000000 +0200
++++ gimp-dds-2.2.1/Makefile	2013-06-28 00:15:00.137132290 +0200
+@@ -2,7 +2,7 @@
+ GIMPTOOL=gimptool-2.0
+ 
  CC=gcc
- CFLAGS=-pipe -g -O2 -Wall $(shell pkg-config --cflags gtk+-2.0 gimp-2.0)
- LD=gcc
--LDFLAGS=
-+LDFLAGS=-Wl,--as-needed
+-CFLAGS=-pipe -g -O2 -Wall $(shell pkg-config --cflags gtk+-2.0 gimp-2.0)
++CFLAGS+=-pipe -g -O2 -Wall $(shell pkg-config --cflags gtk+-2.0 gimp-2.0)
  
- TARGET=dds
+ OS=$(shell uname -s)
+ ifeq (,$(findstring Windows,$(OS)))
+@@ -11,6 +11,8 @@
+ EXT=.exe
+ endif
  
++LDFLAGS+=-Wl,--as-needed
++
+ TARGET=dds$(EXT)
+ 
+ SRCS=color.c dds.c ddsread.c ddswrite.c dxt.c mipmap.c misc.c

Modified: packages/trunk/gimp-dds/debian/rules
===================================================================
--- packages/trunk/gimp-dds/debian/rules	2013-06-27 06:45:12 UTC (rev 14348)
+++ packages/trunk/gimp-dds/debian/rules	2013-06-27 22:19:36 UTC (rev 14349)
@@ -1,62 +1,5 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@
 
-# We use the Makefile.linux as else it defaults to using the win32 one
-# on freebsd.
-MAKEFILE = -f Makefile.linux
-
-configure: configure-stamp
-
-configure-stamp:
-#	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	touch $@
-
-build: build-stamp
-
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE) $(MAKEFILE)
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	$(MAKE) $(MAKEFILE) clean
-
-#	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	dh_clean 
-
-# Build architecture-independent files here.
-binary-indep: build
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure