r13060 - in packages/trunk/fretsonfire/debian: . source

[Paul Wise]

Author: pabs
Date: 2012-01-01 04:57:39 +0000 (Sun, 01 Jan 2012)
New Revision: 13060

Added:
   packages/trunk/fretsonfire/debian/source/
   packages/trunk/fretsonfire/debian/source/format
Removed:
   packages/trunk/fretsonfire/debian/README.source
Modified:
   packages/trunk/fretsonfire/debian/changelog
   packages/trunk/fretsonfire/debian/control
   packages/trunk/fretsonfire/debian/rules
Log:
Switch to dpkg-source v3 instead of manual patching using quilt

Deleted: packages/trunk/fretsonfire/debian/README.source
===================================================================
--- packages/trunk/fretsonfire/debian/README.source	2012-01-01 04:53:50 UTC (rev 13059)
+++ packages/trunk/fretsonfire/debian/README.source	2012-01-01 04:57:39 UTC (rev 13060)
@@ -1,57 +0,0 @@
-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.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
-    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-                export QUILT_PATCHES=debian/patches
-        fi
-    done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
-    quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
-    quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches.  Then, for every file that will be modified by this patch,
-run:
-
-    quilt add <file>
-
-before editing those files.  You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly.  After editing the files, run:
-
-    quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
-    quilt import -P <patch> /path/to/patch
-    quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches.  The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
-    quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.

Modified: packages/trunk/fretsonfire/debian/changelog
===================================================================
--- packages/trunk/fretsonfire/debian/changelog	2012-01-01 04:53:50 UTC (rev 13059)
+++ packages/trunk/fretsonfire/debian/changelog	2012-01-01 04:57:39 UTC (rev 13060)
@@ -12,6 +12,7 @@
     (Closes: #561314, #561985)
   * FoF is implemented in python, no need for ${shlibs:Depends}
   * Add missing ${misc:Depends} to fretsonfire Depends
+  * Switch to dpkg-source v3 instead of manual patching using quilt
 
   [ Andrew Higginson ]
   * Better description for package 'fretsonfire' describing gameplay,

Modified: packages/trunk/fretsonfire/debian/control
===================================================================
--- packages/trunk/fretsonfire/debian/control	2012-01-01 04:53:50 UTC (rev 13059)
+++ packages/trunk/fretsonfire/debian/control	2012-01-01 04:57:39 UTC (rev 13060)
@@ -6,7 +6,7 @@
  Miriam Ruiz <little_miry at yahoo.es>,
  David Martínez Martí <deavidsedice at gmail.com>,
  Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5), quilt
+Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: python-dev, python-support (>= 0.4), docbook-to-man
 Standards-Version: 3.8.3
 Homepage: http://fretsonfire.sourceforge.net/

Modified: packages/trunk/fretsonfire/debian/rules
===================================================================
--- packages/trunk/fretsonfire/debian/rules	2012-01-01 04:53:50 UTC (rev 13059)
+++ packages/trunk/fretsonfire/debian/rules	2012-01-01 04:57:39 UTC (rev 13060)
@@ -12,14 +12,8 @@
 	CFLAGS += -O2
 endif
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
-	touch $@
-
 build: build-stamp
-build-stamp: configure-stamp 
+build-stamp:
 	dh_testdir
 	docbook-to-man debian/fretsonfire.sgml > fretsonfire.6
 	find data -name "*.svg" | sed -e "s/.svg$$/.png/" | while read l; do if ! test -f "$$l"; then echo "Missing $$l"; exit 1; fi; done
@@ -47,7 +41,6 @@
 	rm -rf translations
 	rm -rf `find . -name "*.pyc"`
 	rm -f fretsonfire.6 fretsonfire
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
 
 install: build

Added: packages/trunk/fretsonfire/debian/source/format
===================================================================
--- packages/trunk/fretsonfire/debian/source/format	                        (rev 0)
+++ packages/trunk/fretsonfire/debian/source/format	2012-01-01 04:57:39 UTC (rev 13060)
@@ -0,0 +1 @@
+3.0 (quilt)