[Python-apps-commits] r4583 - in packages/waf/trunk/debian (5 files)

[dfiloni-guest at users.alioth.debian.org]

    Date: Sunday, January 24, 2010 @ 15:11:26
  Author: dfiloni-guest
Revision: 4583

New upstream release.

Added:
  packages/waf/trunk/debian/source/
  packages/waf/trunk/debian/source/format
Modified:
  packages/waf/trunk/debian/README.source
  packages/waf/trunk/debian/changelog
  packages/waf/trunk/debian/patches/waf_stylesheet.patch

Modified: packages/waf/trunk/debian/README.source
===================================================================
--- packages/waf/trunk/debian/README.source	2010-01-24 14:27:26 UTC (rev 4582)
+++ packages/waf/trunk/debian/README.source	2010-01-24 15:11:26 UTC (rev 4583)
@@ -5,62 +5,3 @@
     please use the provided get-orig-source target to generate the tarball.
 
  -- Devid Antonio Filoni <d.filoni at ubuntu.com>  Sun, 19 Jul 2009 16:23:56 +0200
-
-
-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/waf/trunk/debian/changelog
===================================================================
--- packages/waf/trunk/debian/changelog	2010-01-24 14:27:26 UTC (rev 4582)
+++ packages/waf/trunk/debian/changelog	2010-01-24 15:11:26 UTC (rev 4583)
@@ -1,3 +1,11 @@
+waf (1.5.11+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Switch to format 3.0 (quilt).
+  * Update debian/patches/waf_stylesheet.patch patch.
+
+ -- Devid Antonio Filoni <d.filoni at ubuntu.com>  Sun, 24 Jan 2010 14:40:06 +0100
+
 waf (1.5.10+dfsg-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/waf/trunk/debian/patches/waf_stylesheet.patch
===================================================================
--- packages/waf/trunk/debian/patches/waf_stylesheet.patch	2010-01-24 14:27:26 UTC (rev 4582)
+++ packages/waf/trunk/debian/patches/waf_stylesheet.patch	2010-01-24 15:11:26 UTC (rev 4583)
@@ -2,11 +2,11 @@
 Origin:		Debian
 Forwarded:	not-needed
 
-Index: waf-1.5.8/doc/book/wscript
+Index: waf-1.5.11+dfsg/doc/book/wscript
 ===================================================================
---- waf-1.5.8.orig/doc/book/wscript	2009-07-19 15:26:47.000000000 +0200
-+++ waf-1.5.8/doc/book/wscript	2009-07-19 15:27:01.000000000 +0200
-@@ -87,8 +87,8 @@
+--- waf-1.5.11+dfsg.orig/doc/book/wscript	2010-01-24 15:40:17.408343936 +0100
++++ waf-1.5.11+dfsg/doc/book/wscript	2010-01-24 15:41:39.396340372 +0100
+@@ -91,11 +91,11 @@
  	obj.source = 'waf.xml'
  
  	obj.type = 'html'
@@ -15,5 +15,10 @@
 +	obj.stylesheet='/usr/share/xml/docbook/stylesheet/docbook-xsl/html/chunk.xsl'
 +	#obj.stylesheet='/home/waf/Escritorio/docbook/docbook-xsl-snapshot/html/chunk.xsl'
  	#obj.stylesheet='/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl'
- 	#obj.stylesheet = '/home/tnagy/docbook-xsl-snapshot/html/chunk.xsl'
+-	obj.stylesheet = '/home/tnagy/docbook-xsl-snapshot/html/chunk.xsl'
+-	obj.stylesheet = '/home/tnagy/docbook-xsl-snapshot/html/docbook.xsl'
++	#obj.stylesheet = '/home/tnagy/docbook-xsl-snapshot/html/chunk.xsl'
++	#obj.stylesheet = '/home/tnagy/docbook-xsl-snapshot/html/docbook.xsl'
  
+ 	#obj.type = 'pdf'
+ 	#obj.stylesheet = "/usr/share/xml/docbook/stylesheet/nwalsh/current/fo/docbook.xsl"

Added: packages/waf/trunk/debian/source/format
===================================================================
--- packages/waf/trunk/debian/source/format	                        (rev 0)
+++ packages/waf/trunk/debian/source/format	2010-01-24 15:11:26 UTC (rev 4583)
@@ -0,0 +1 @@
+3.0 (quilt)