r8016 - packages/trunk/xmoto/debian

[Miriam Ruiz]

Author: miriam
Date: 2008-08-28 16:42:39 +0000 (Thu, 28 Aug 2008)
New Revision: 8016

Modified:
   packages/trunk/xmoto/debian/changelog
   packages/trunk/xmoto/debian/control
   packages/trunk/xmoto/debian/rules
Log:
Switch to quilt



Modified: packages/trunk/xmoto/debian/changelog
===================================================================
--- packages/trunk/xmoto/debian/changelog	2008-08-28 15:45:17 UTC (rev 8015)
+++ packages/trunk/xmoto/debian/changelog	2008-08-28 16:42:39 UTC (rev 8016)
@@ -8,6 +8,9 @@
   * Added Suggests: xmoto to package xmoto-data
   * Added ArcadeGame to desktop categories. Closes: #478974
     Thanks to Daniel Dickinson <cshore at wightman.ca>
+  * Replaced dpatch by quilt for patch management
+  * Replaced build dependency on the obsolete xlibmesa-gl-dev
+    by libgl1-mesa-dev
   * The Debian Games Team is taking care for this package from now on
 
  -- Miriam Ruiz <little_miry at yahoo.es>  Tue, 26 Aug 2008 21:42:52 +0200

Modified: packages/trunk/xmoto/debian/control
===================================================================
--- packages/trunk/xmoto/debian/control	2008-08-28 15:45:17 UTC (rev 8015)
+++ packages/trunk/xmoto/debian/control	2008-08-28 16:42:39 UTC (rev 8016)
@@ -3,7 +3,10 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpkg-dev (>= 1.13.19), dpatch, autotools-dev, libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libjpeg62-dev, libpng12-dev, zlib1g-dev, xlibmesa-gl-dev | libgl-dev, libode0-dev, liblua5.1-0-dev, libcurl4-gnutls-dev, libbz2-dev, libsqlite3-dev
+Build-Depends: debhelper (>= 4.0.0), dpkg-dev (>= 1.13.19), autotools-dev, quilt,
+ libsdl1.2-dev, libsdl-ttf2.0-dev, libsdl-mixer1.2-dev, libjpeg62-dev, libpng12-dev,
+ zlib1g-dev, libgl1-mesa-dev | libgl-dev, libode0-dev, liblua5.1-0-dev,
+ libcurl4-gnutls-dev, libbz2-dev, libsqlite3-dev
 Standards-Version: 3.8.0
 Homepage: http://xmoto.tuxfamily.org/
 

Modified: packages/trunk/xmoto/debian/rules
===================================================================
--- packages/trunk/xmoto/debian/rules	2008-08-28 15:45:17 UTC (rev 8015)
+++ packages/trunk/xmoto/debian/rules	2008-08-28 16:42:39 UTC (rev 8016)
@@ -1,17 +1,8 @@
 #!/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
 
-# We want to use dpatch
-include /usr/share/dpatch/dpatch.make
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -32,7 +23,10 @@
 	CFLAGS += -O2
 endif
 
-config.status: configure
+patch:
+	$(MAKE) -f /usr/share/quilt/quilt.make patch
+
+config.status: configure patch
 	dh_testdir
 	CFLAGS="$(CFLAGS) -Wl,-z,defs"; \
 	CXXFLAGS="$(CFLAGS) -Wl,-z,defs"; \
@@ -54,7 +48,7 @@
 	$(MAKE)
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -62,6 +56,7 @@
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f config.log
 
+	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean
 
 install: build