r11987 - in packages/trunk/barrage/debian: . source

[Paul Wise]

Author: pabs
Date: 2011-03-24 09:38:15 +0000 (Thu, 24 Mar 2011)
New Revision: 11987

Added:
   packages/trunk/barrage/debian/source/
   packages/trunk/barrage/debian/source/format
Removed:
   packages/trunk/barrage/debian/README.source
Modified:
   packages/trunk/barrage/debian/changelog
   packages/trunk/barrage/debian/control
   packages/trunk/barrage/debian/rules
Log:
Switch to dpkg-source v3 quilt

Deleted: packages/trunk/barrage/debian/README.source
===================================================================
--- packages/trunk/barrage/debian/README.source	2011-03-24 09:33:54 UTC (rev 11986)
+++ packages/trunk/barrage/debian/README.source	2011-03-24 09:38:15 UTC (rev 11987)
@@ -1,58 +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
-                break
-        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/barrage/debian/changelog
===================================================================
--- packages/trunk/barrage/debian/changelog	2011-03-24 09:33:54 UTC (rev 11986)
+++ packages/trunk/barrage/debian/changelog	2011-03-24 09:38:15 UTC (rev 11987)
@@ -1,10 +1,14 @@
 barrage (1.0.3-1) UNRELEASED; urgency=low
 
+  [ Gonéri Le Bouder ]
   * new upstream release 
   * add a BD on autotools-dev to get fresh config.{sub,guess} 
   * bump Standards-Version to 3.9.1, no changes
   * barrage depends on ${misc:Depends} now
 
+  [ Paul Wise ]
+  * Switch to dpkg-source v3 quilt
+
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Mon, 03 Jan 2011 22:09:01 +0100
 
 barrage (1.0.2-4) unstable; urgency=low

Modified: packages/trunk/barrage/debian/control
===================================================================
--- packages/trunk/barrage/debian/control	2011-03-24 09:33:54 UTC (rev 11986)
+++ packages/trunk/barrage/debian/control	2011-03-24 09:38:15 UTC (rev 11987)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bddebian at comcast.net>, Gonéri Le Bouder <goneri at rulezlan.org>
-Build-Depends: debhelper (>= 5.0.0), quilt, libsdl1.2-dev, libsdl-mixer1.2-dev, binutils (>= 2.14.90.0.7),
+Build-Depends: debhelper (>= 5.0.0), libsdl1.2-dev, libsdl-mixer1.2-dev, binutils (>= 2.14.90.0.7),
  autotools-dev
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/barrage/

Modified: packages/trunk/barrage/debian/rules
===================================================================
--- packages/trunk/barrage/debian/rules	2011-03-24 09:33:54 UTC (rev 11986)
+++ packages/trunk/barrage/debian/rules	2011-03-24 09:38:15 UTC (rev 11987)
@@ -2,8 +2,6 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-include /usr/share/quilt/quilt.make
-
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -17,7 +15,7 @@
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=\$${prefix}/games
 
 
-build: patch build-stamp
+build: build-stamp
 
 build-stamp:  config.status
 	dh_testdir
@@ -26,7 +24,7 @@
 
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 

Added: packages/trunk/barrage/debian/source/format
===================================================================
--- packages/trunk/barrage/debian/source/format	                        (rev 0)
+++ packages/trunk/barrage/debian/source/format	2011-03-24 09:38:15 UTC (rev 11987)
@@ -0,0 +1 @@
+3.0 (quilt)