r11841 - in packages/trunk/holotz-castle/debian: . source

[Peter Pentchev]

Author: roam-guest
Date: 2011-02-28 15:19:10 +0000 (Mon, 28 Feb 2011)
New Revision: 11841

Added:
   packages/trunk/holotz-castle/debian/source/
   packages/trunk/holotz-castle/debian/source/format
Removed:
   packages/trunk/holotz-castle/debian/README.source
Modified:
   packages/trunk/holotz-castle/debian/changelog
   packages/trunk/holotz-castle/debian/control
   packages/trunk/holotz-castle/debian/rules
Log:
Convert to the 3.0 (quilt) source format.


Deleted: packages/trunk/holotz-castle/debian/README.source
===================================================================
--- packages/trunk/holotz-castle/debian/README.source	2011-02-28 09:10:00 UTC (rev 11840)
+++ packages/trunk/holotz-castle/debian/README.source	2011-02-28 15:19:10 UTC (rev 11841)
@@ -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/holotz-castle/debian/changelog
===================================================================
--- packages/trunk/holotz-castle/debian/changelog	2011-02-28 09:10:00 UTC (rev 11840)
+++ packages/trunk/holotz-castle/debian/changelog	2011-02-28 15:19:10 UTC (rev 11841)
@@ -3,6 +3,10 @@
   * Team upload.
   * Link with zlib to fix the FTBFS with recent linker versions.
     Closes: #615730
+  * Convert to the 3.0 (quilt) source format:
+    - drop the quilt build dependency
+    - drop the README.source file
+    - drop the quilt snippets in the rules file
 
  -- Peter Pentchev <roam at ringlet.net>  Mon, 28 Feb 2011 10:48:09 +0200
 

Modified: packages/trunk/holotz-castle/debian/control
===================================================================
--- packages/trunk/holotz-castle/debian/control	2011-02-28 09:10:00 UTC (rev 11840)
+++ packages/trunk/holotz-castle/debian/control	2011-02-28 15:19:10 UTC (rev 11841)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.13.19), quilt,
+Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.13.19),
  libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev
 Standards-Version: 3.8.3
 Homepage: http://www.mainreactor.net/holotzcastle/en/index_en.html

Modified: packages/trunk/holotz-castle/debian/rules
===================================================================
--- packages/trunk/holotz-castle/debian/rules	2011-02-28 09:10:00 UTC (rev 11840)
+++ packages/trunk/holotz-castle/debian/rules	2011-02-28 15:19:10 UTC (rev 11841)
@@ -14,7 +14,6 @@
 
 build-stamp:
 	dh_testdir
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
 	$(MAKE) MORE_CFLAGS="$(CFLAGS)"
 	touch build-stamp
 
@@ -24,7 +23,6 @@
 	rm -f *-stamp
 	chmod -x res/stories/milanb/*
 	$(MAKE) clean
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean
 
 install-indep:

Added: packages/trunk/holotz-castle/debian/source/format
===================================================================
--- packages/trunk/holotz-castle/debian/source/format	                        (rev 0)
+++ packages/trunk/holotz-castle/debian/source/format	2011-02-28 15:19:10 UTC (rev 11841)
@@ -0,0 +1 @@
+3.0 (quilt)