r10804 - in packages/trunk/gimp-dds/debian: . patches source

[Vincent Fourmond]

Author: fourmond
Date: 2010-02-15 23:48:38 +0000 (Mon, 15 Feb 2010)
New Revision: 10804

Added:
   packages/trunk/gimp-dds/debian/source/
   packages/trunk/gimp-dds/debian/source/format
Removed:
   packages/trunk/gimp-dds/debian/README.source
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] Fix FTBS due to now-missing build-dep + switch to 3.0 (quilt)

Deleted: packages/trunk/gimp-dds/debian/README.source
===================================================================
--- packages/trunk/gimp-dds/debian/README.source	2010-02-14 21:16:53 UTC (rev 10803)
+++ packages/trunk/gimp-dds/debian/README.source	2010-02-15 23:48:38 UTC (rev 10804)
@@ -1,9 +0,0 @@
-This is the README.source file for the package gimp-dds
-
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-
- -- Vincent Fourmond <fourmond at debian.org>, Tue,  5 May 2009 20:42:49 +0200

Modified: packages/trunk/gimp-dds/debian/changelog
===================================================================
--- packages/trunk/gimp-dds/debian/changelog	2010-02-14 21:16:53 UTC (rev 10803)
+++ packages/trunk/gimp-dds/debian/changelog	2010-02-15 23:48:38 UTC (rev 10804)
@@ -1,3 +1,14 @@
+gimp-dds (2.0.7-2) unstable; urgency=medium
+
+  * Converted to source format 3.0 (quilt)
+  * Refreshed makefile.diff
+  * Removed debian/README.source, obsoleted by the use of format 3.0 (quilt)
+  * Add build-depend on libgtk2.0-dev, now necessary (closes: #569383)
+  * Urgency medium to fix RC bug in testing
+  * Conforms to standards 3.8.4
+
+ -- Vincent Fourmond <fourmond at debian.org>  Tue, 16 Feb 2010 00:47:59 +0100
+
 gimp-dds (2.0.7-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/trunk/gimp-dds/debian/control
===================================================================
--- packages/trunk/gimp-dds/debian/control	2010-02-14 21:16:53 UTC (rev 10803)
+++ packages/trunk/gimp-dds/debian/control	2010-02-15 23:48:38 UTC (rev 10804)
@@ -3,8 +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, quilt
-Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 5), libgimp2.0-dev (>=2.6), pkg-config,
+ quilt, libgtk2.0-dev
+Standards-Version: 3.8.4
 Homepage: http://nifelheim.dyndns.org/~cocidius/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

Modified: packages/trunk/gimp-dds/debian/patches/makefile.diff
===================================================================
--- packages/trunk/gimp-dds/debian/patches/makefile.diff	2010-02-14 21:16:53 UTC (rev 10803)
+++ packages/trunk/gimp-dds/debian/patches/makefile.diff	2010-02-15 23:48:38 UTC (rev 10804)
@@ -1,13 +1,13 @@
 Add the --as-needed flag to take down the number of libraries linked
 against this package
 
-Index: gimp-dds-2.0.3/Makefile.linux
+Index: gimp-dds-2.0.7/Makefile.linux
 ===================================================================
---- gimp-dds-2.0.3.orig/Makefile.linux	2008-04-17 21:12:11.000000000 +0200
-+++ gimp-dds-2.0.3/Makefile.linux	2008-04-17 21:12:40.000000000 +0200
+--- 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 @@
  CC=gcc
- CFLAGS=-pipe -O2 -Wall `pkg-config --cflags gtk+-2.0 gimp-2.0`
+ CFLAGS=-pipe -g -O2 -Wall $(shell pkg-config --cflags gtk+-2.0 gimp-2.0)
  LD=gcc
 -LDFLAGS=
 +LDFLAGS=-Wl,--as-needed

Modified: packages/trunk/gimp-dds/debian/rules
===================================================================
--- packages/trunk/gimp-dds/debian/rules	2010-02-14 21:16:53 UTC (rev 10803)
+++ packages/trunk/gimp-dds/debian/rules	2010-02-15 23:48:38 UTC (rev 10804)
@@ -13,7 +13,7 @@
 configure: configure-stamp
 
 configure-stamp:
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+#	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	touch $@
 
 build: build-stamp
@@ -30,7 +30,7 @@
 
 	$(MAKE) clean
 
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+#	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	dh_clean 
 
 # Build architecture-independent files here.

Added: packages/trunk/gimp-dds/debian/source/format
===================================================================
--- packages/trunk/gimp-dds/debian/source/format	                        (rev 0)
+++ packages/trunk/gimp-dds/debian/source/format	2010-02-15 23:48:38 UTC (rev 10804)
@@ -0,0 +1 @@
+3.0 (quilt)