r11537 - in packages/trunk/xmahjongg/debian: . source

[Peter Pentchev]

Author: roam-guest
Date: 2010-11-30 15:15:57 +0000 (Tue, 30 Nov 2010)
New Revision: 11537

Removed:
   packages/trunk/xmahjongg/debian/README.source
Modified:
   packages/trunk/xmahjongg/debian/changelog
   packages/trunk/xmahjongg/debian/control
   packages/trunk/xmahjongg/debian/rules
   packages/trunk/xmahjongg/debian/source/format
Log:
Switch to the 3.0 (quilt) source format.


Deleted: packages/trunk/xmahjongg/debian/README.source
===================================================================
--- packages/trunk/xmahjongg/debian/README.source	2010-11-30 15:09:06 UTC (rev 11536)
+++ packages/trunk/xmahjongg/debian/README.source	2010-11-30 15:15:57 UTC (rev 11537)
@@ -1,17 +0,0 @@
-The xmahjongg package uses quilt to maintain local changes to
-the xmahjongg distribution.  The Debian-specific patches are maintained
-in the debian/patches/ directory.
-
-To apply all the patches, preparing the source for building, use:
-  debian/rules patch
-
-To revert the patches, preparing to build a source package, use:
-  debian/rules unpatch
-
-You do not need to manually execute these targets when building
-the package; they are part of the debian/rules target chain.
-
-For more information on the quilt integration with Debian packages,
-as well as editing, adding or removing patches, please see
-the quilt documentation; in recent versions of the Debian package of
-quilt, start at the /usr/share/doc/quilt/README.source file.

Modified: packages/trunk/xmahjongg/debian/changelog
===================================================================
--- packages/trunk/xmahjongg/debian/changelog	2010-11-30 15:09:06 UTC (rev 11536)
+++ packages/trunk/xmahjongg/debian/changelog	2010-11-30 15:15:57 UTC (rev 11537)
@@ -1,6 +1,9 @@
 xmahjongg (3.7-4) UNRELEASED; urgency=low
 
-  * Specify the source format as 1.0 for the present.
+  * Switch to the 3.0 (quilt) source format:
+    - no longer use quilt.make in the rules file
+    - drop the quilt dependency
+    - drop the README.source file
 
  -- Peter Pentchev <roam at ringlet.net>  Mon, 29 Nov 2010 17:18:09 +0200
 

Modified: packages/trunk/xmahjongg/debian/control
===================================================================
--- packages/trunk/xmahjongg/debian/control	2010-11-30 15:09:06 UTC (rev 11536)
+++ packages/trunk/xmahjongg/debian/control	2010-11-30 15:15:57 UTC (rev 11537)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter Pentchev <roam at ringlet.net>
 Standards-Version: 3.8.1
-Build-Depends: debhelper (>= 7.0.50), libx11-dev, x11proto-core-dev, quilt, hardening-wrapper
+Build-Depends: debhelper (>= 7.0.50), libx11-dev, x11proto-core-dev, hardening-wrapper
 Homepage: http://www.lcdf.org/xmahjongg/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/xmahjongg
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/xmahjongg/?op=log

Modified: packages/trunk/xmahjongg/debian/rules
===================================================================
--- packages/trunk/xmahjongg/debian/rules	2010-11-30 15:09:06 UTC (rev 11536)
+++ packages/trunk/xmahjongg/debian/rules	2010-11-30 15:15:57 UTC (rev 11537)
@@ -22,17 +22,11 @@
 CXXFLAGS+=	${WARNFLAGS}
 export CFLAGS CXXFLAGS
 
-include /usr/share/quilt/quilt.make
-
-override_dh_auto_configure:	${QUILT_STAMPFN}
+override_dh_auto_configure:
 	./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/games
 	# Avoid rebuilding config.h.in
 	touch config.h.in && touch configure && touch config.status
 
-override_dh_auto_clean:
-	dh_auto_clean
-	${MAKE} -f debian/rules unpatch
-
 override_dh_auto_install:
 	$(MAKE) install prefix=$D/usr bindir=$D/usr/games mandir=$D/usr/share/man datadir=$D/usr/share/games
 

Modified: packages/trunk/xmahjongg/debian/source/format
===================================================================
--- packages/trunk/xmahjongg/debian/source/format	2010-11-30 15:09:06 UTC (rev 11536)
+++ packages/trunk/xmahjongg/debian/source/format	2010-11-30 15:15:57 UTC (rev 11537)
@@ -1 +1 @@
-1.0
+3.0 (quilt)