r11404 - packages/trunk/ii-esu/debian

[Peter De Wachter]

Author: pdewacht-guest
Date: 2010-10-12 06:15:21 +0000 (Tue, 12 Oct 2010)
New Revision: 11404

Removed:
   packages/trunk/ii-esu/debian/source/
Modified:
   packages/trunk/ii-esu/debian/changelog
   packages/trunk/ii-esu/debian/control
   packages/trunk/ii-esu/debian/rules
Log:
ii-esu: undo quilt changes


Modified: packages/trunk/ii-esu/debian/changelog
===================================================================
--- packages/trunk/ii-esu/debian/changelog	2010-10-11 18:43:01 UTC (rev 11403)
+++ packages/trunk/ii-esu/debian/changelog	2010-10-12 06:15:21 UTC (rev 11404)
@@ -2,13 +2,10 @@
 
   * Fix FTBFS with newer gdc by using the right return type in addEnemy().
     Thanks to Iain Buclaw and Johann Felix Soden (Closes: #594382)
-  * Switch to the new source package format:
-    - Remove patching/unpatching code in debian/rules
-    - Remove quilt build-dependency
   * Clean up copyright file
   * Bump Standards-Version to 3.9.1. No changes needed.
 
- -- Peter De Wachter <pdewacht at gmail.com>  Mon, 11 Oct 2010 20:41:21 +0200
+ -- Peter De Wachter <pdewacht at gmail.com>  Tue, 12 Oct 2010 08:13:45 +0200
 
 ii-esu (1.0a.dfsg1-2) unstable; urgency=low
 

Modified: packages/trunk/ii-esu/debian/control
===================================================================
--- packages/trunk/ii-esu/debian/control	2010-10-11 18:43:01 UTC (rev 11403)
+++ packages/trunk/ii-esu/debian/control	2010-10-12 06:15:21 UTC (rev 11404)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Peter De Wachter <pdewacht at gmail.com>
-Build-Depends: debhelper (>= 5), gdc,
+Build-Depends: debhelper (>= 5), quilt, gdc,
  libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
  libsdl1.2-dev, libsdl-mixer1.2-dev
 Standards-Version: 3.9.1

Modified: packages/trunk/ii-esu/debian/rules
===================================================================
--- packages/trunk/ii-esu/debian/rules	2010-10-11 18:43:01 UTC (rev 11403)
+++ packages/trunk/ii-esu/debian/rules	2010-10-12 06:15:21 UTC (rev 11404)
@@ -13,8 +13,14 @@
 	DFLAGS = -O -g -release -d
 endif
 
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	$(MAKE) -f /usr/share/quilt/quilt.make patch
+	touch $@
+
 build: build-stamp
-build-stamp:
+build-stamp: configure-stamp 
 	dh_testdir
 	#ant -v
 	$(MAKE) CFLAGS="$(CFLAGS)" DFLAGS="$(DFLAGS)"
@@ -28,6 +34,7 @@
 	#[ ! -f Makefile ] || $(MAKE) clean
 	rm -f ii-esu
 	rm -f `find . -name "*.o"`
+	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
 
 install: build