r7273 - packages/trunk/desmume/debian

[Cyril Brulebois]

Author: kibi
Date: 2008-06-08 04:01:26 +0000 (Sun, 08 Jun 2008)
New Revision: 7273

Removed:
   packages/trunk/desmume/debian/patches/
Modified:
   packages/trunk/desmume/debian/changelog
   packages/trunk/desmume/debian/control
   packages/trunk/desmume/debian/rules
Log:
Remove the only patch, applied upstream already, and all quilt machinery (Closes: #485033 for real).

Modified: packages/trunk/desmume/debian/changelog
===================================================================
--- packages/trunk/desmume/debian/changelog	2008-06-08 03:47:17 UTC (rev 7272)
+++ packages/trunk/desmume/debian/changelog	2008-06-08 04:01:26 UTC (rev 7273)
@@ -7,8 +7,12 @@
   * Update config.{guess,sub} before running configure and remove them in
     the clean target, instead of updating them in the clean target, so as
     to keep the Debian diff clean, and also prevent an FTBFS with the new
-    “3.0 (quilt)” source package format, thanks to Raphaël Hertzog for the
-    notice (Closes: #485033).
+    “3.0 (quilt)” source package format.
+  * Drop the only patch (along with the series file), since it's already
+    applied upstream, and would cause an FTBFS under the same conditions
+    as above, thanks to Raphaël Hertzog for the notice (Closes: #485033).
+  * Also drop patch-related target dependencies, and quilt build-dependency
+    accordingly.
   * Update my mail address.
 
  -- Reinhard Tartler <siretart at tauware.de>  Sat, 10 May 2008 23:18:38 +0200

Modified: packages/trunk/desmume/debian/control
===================================================================
--- packages/trunk/desmume/debian/control	2008-06-08 03:47:17 UTC (rev 7272)
+++ packages/trunk/desmume/debian/control	2008-06-08 04:01:26 UTC (rev 7273)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Reinhard Tartler <siretart at tauware.de>, Pascal Giard <pascal at debian.org>, Cyril Brulebois <kibi at debian.org>
-Build-Depends: debhelper (>= 5), libglade2-dev, libgtk2.0-dev, libsdl1.2-dev, libgtkglext1-dev, intltool, quilt
+Build-Depends: debhelper (>= 5), libglade2-dev, libgtk2.0-dev, libsdl1.2-dev, libgtkglext1-dev, intltool
 Standards-Version: 3.7.2
 Homepage: http://desmume.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/desmume/

Modified: packages/trunk/desmume/debian/rules
===================================================================
--- packages/trunk/desmume/debian/rules	2008-06-08 03:47:17 UTC (rev 7272)
+++ packages/trunk/desmume/debian/rules	2008-06-08 04:01:26 UTC (rev 7273)
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/quilt/quilt.make
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -35,14 +33,14 @@
 		--localedir=/usr/share/locale \
 		CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
-build: patch build-stamp
+build: build-stamp
 
 build-stamp:  config.status
 	dh_testdir
 	$(MAKE)
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp