[Python-modules-commits] r5774 - in packages/pyparsing/trunk/debian (6 files)

[shlomme at users.alioth.debian.org]

    Date: Tuesday, July 1, 2008 @ 15:04:33
  Author: shlomme
Revision: 5774

* added changes from 1.4.11-2

Added:
  packages/pyparsing/trunk/debian/patches/
  packages/pyparsing/trunk/debian/patches/00list
  packages/pyparsing/trunk/debian/patches/01_leaveWhitespace.dpatch
Modified:
  packages/pyparsing/trunk/debian/changelog
  packages/pyparsing/trunk/debian/control
  packages/pyparsing/trunk/debian/rules

Modified: packages/pyparsing/trunk/debian/changelog
===================================================================
--- packages/pyparsing/trunk/debian/changelog	2008-07-01 12:53:07 UTC (rev 5773)
+++ packages/pyparsing/trunk/debian/changelog	2008-07-01 15:04:33 UTC (rev 5774)
@@ -1,5 +1,19 @@
-pyparsing (1.4.10-2) UNRELEASED; urgency=low
+pyparsing (1.4.11-2) unstable; urgency=low
 
+  * Reinstate release 1.4.10-2 changes, which I inadvertently omitted.
+
+ -- Kevin Coyner <kcoyner at debian.org>  Sun, 24 Feb 2008 18:14:15 -0500
+
+pyparsing (1.4.11-1) unstable; urgency=low
+
+  * New upstream release
+  * Add Build-Depends on dpatch and add small patch to fix documentation of
+    leaveWhitespace() in HowToUsePyparsing.html. Closes: #381627.
+
+ -- Kevin Coyner <kcoyner at debian.org>  Sun, 24 Feb 2008 13:22:57 -0500
+
+pyparsing (1.4.10-2) unstable; urgency=low
+
   * debian/control
     - uniforming both Vcs-Svn and Vcs-Browser fields
 

Modified: packages/pyparsing/trunk/debian/control
===================================================================
--- packages/pyparsing/trunk/debian/control	2008-07-01 12:53:07 UTC (rev 5773)
+++ packages/pyparsing/trunk/debian/control	2008-07-01 15:04:33 UTC (rev 5774)
@@ -4,11 +4,11 @@
 Maintainer: Kevin Coyner <kcoyner at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Torsten Marek <shlomme at debian.org>
 Standards-Version: 3.7.3
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11)
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), dpatch
 Build-Depends-Indep: python-support (>= 0.5.3), tofrodos
 Homepage: http://pyparsing.wikispaces.com/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyparsing/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/pyparsing/trunk/?op=log
+Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/pyparsing/?op=log
 
 Package: python-pyparsing
 Architecture: all

Added: packages/pyparsing/trunk/debian/patches/00list
===================================================================
--- packages/pyparsing/trunk/debian/patches/00list	                        (rev 0)
+++ packages/pyparsing/trunk/debian/patches/00list	2008-07-01 15:04:33 UTC (rev 5774)
@@ -0,0 +1 @@
+01_leaveWhitespace

Added: packages/pyparsing/trunk/debian/patches/01_leaveWhitespace.dpatch
===================================================================
--- packages/pyparsing/trunk/debian/patches/01_leaveWhitespace.dpatch	                        (rev 0)
+++ packages/pyparsing/trunk/debian/patches/01_leaveWhitespace.dpatch	2008-07-01 15:04:33 UTC (rev 5774)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_leaveWhitespace.dpatch by Kevin Coyner <kcoyner at debian.org>
+##
+## DP: fixes leaveWhitespace function documentation in HowToUsePyparsing.html
+## DP: Bug #381627
+
+ at DPATCH@
+diff -urNad pyparsing-1.4.11~/HowToUsePyparsing.html pyparsing-1.4.11/HowToUsePyparsing.html
+--- pyparsing-1.4.11~/HowToUsePyparsing.html	2007-12-10 10:48:12.000000000 -0500
++++ pyparsing-1.4.11/HowToUsePyparsing.html	2008-02-24 13:58:16.000000000 -0500
+@@ -563,7 +563,7 @@
+ parse expression in different places in a grammar, with different parse actions
+ attached to each</p>
+ </li>
+-<li><p class="first"><tt class="docutils literal"><span class="pre">leaveWhiteSpace()</span></tt> - change default behavior of skipping
++<li><p class="first"><tt class="docutils literal"><span class="pre">leaveWhitespace()</span></tt> - change default behavior of skipping
+ whitespace before starting matching (mostly used internally to the
+ pyparsing module, rarely used by client code)</p>
+ </li>
+diff -urNad pyparsing-1.4.11~/docs/HowToUsePyparsing.html pyparsing-1.4.11/docs/HowToUsePyparsing.html
+--- pyparsing-1.4.11~/docs/HowToUsePyparsing.html	2007-12-10 10:48:12.000000000 -0500
++++ pyparsing-1.4.11/docs/HowToUsePyparsing.html	2008-02-24 13:58:30.000000000 -0500
+@@ -563,7 +563,7 @@
+ parse expression in different places in a grammar, with different parse actions
+ attached to each</p>
+ </li>
+-<li><p class="first"><tt class="docutils literal"><span class="pre">leaveWhiteSpace()</span></tt> - change default behavior of skipping
++<li><p class="first"><tt class="docutils literal"><span class="pre">leaveWhitespace()</span></tt> - change default behavior of skipping
+ whitespace before starting matching (mostly used internally to the
+ pyparsing module, rarely used by client code)</p>
+ </li>

Modified: packages/pyparsing/trunk/debian/rules
===================================================================
--- packages/pyparsing/trunk/debian/rules	2008-07-01 12:53:07 UTC (rev 5773)
+++ packages/pyparsing/trunk/debian/rules	2008-07-01 15:04:33 UTC (rev 5774)
@@ -6,6 +6,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
 clean::
 	find -name '*.py[co]' -print0 | xargs -0 --no-run-if-empty rm -f --