[Python-apps-commits] r3844 - in packages/osc/trunk/debian (3 files)

[nijel at users.alioth.debian.org]

    Date: Friday, September 25, 2009 @ 12:51:05
  Author: nijel
Revision: 3844

Fix non escaped - in man page. 

Added:
  packages/osc/trunk/debian/patches/svn-8118.patch
Modified:
  packages/osc/trunk/debian/changelog
  packages/osc/trunk/debian/patches/series

Modified: packages/osc/trunk/debian/changelog
===================================================================
--- packages/osc/trunk/debian/changelog	2009-09-25 12:27:49 UTC (rev 3843)
+++ packages/osc/trunk/debian/changelog	2009-09-25 12:51:05 UTC (rev 3844)
@@ -4,8 +4,9 @@
   * Use quilt patch system.
     - Fix not escaped ' in man page.
     - Fix compilation with Python 2.4.
+    - Fix non escaped - in man page. 
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Fri, 25 Sep 2009 14:26:17 +0200
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Fri, 25 Sep 2009 14:38:26 +0200
 
 osc (0.122-1) unstable; urgency=low
 

Modified: packages/osc/trunk/debian/patches/series
===================================================================
--- packages/osc/trunk/debian/patches/series	2009-09-25 12:27:49 UTC (rev 3843)
+++ packages/osc/trunk/debian/patches/series	2009-09-25 12:51:05 UTC (rev 3844)
@@ -1,2 +1,3 @@
+svn-8101.patch
 svn-8117.patch
-svn-8101.patch
+svn-8118.patch

Added: packages/osc/trunk/debian/patches/svn-8118.patch
===================================================================
--- packages/osc/trunk/debian/patches/svn-8118.patch	                        (rev 0)
+++ packages/osc/trunk/debian/patches/svn-8118.patch	2009-09-25 12:51:05 UTC (rev 3844)
@@ -0,0 +1,23 @@
+Use non consuming expressions to allow escape more strings in one row.
+SVN revision 8118.
+--- a/osc/cmdln.py
++++ b/osc/cmdln.py
+@@ -118,12 +118,12 @@
+     return decorate
+ 
+ MAN_REPLACES = [
+-    (re.compile(r'(^|[ \t\[\'])--([^/ \t-]*)-([^/ \t-]*)-([^/ \t-]*)($|[ \t=\]\'])'), r'\1\-\-\2\-\3\-\4\5'),
+-    (re.compile(r'(^|[ \t\[\'])-([^/ \t-]*)-([^/ \t-]*)-([^/ \t-]*)($|[ \t=\]\'])'), r'\1\-\2\-\3\-\4\5'),
+-    (re.compile(r'(^|[ \t\[\'])--([^/ \t-]*)-([^/ \t-]*)($|[ \t=\]\'])'), r'\1\-\-\2\-\3\4'),
+-    (re.compile(r'(^|[ \t\[\'])-([^/ \t-]*)-([^/ \t-]*)($|[ \t=\]\'])'), r'\1\-\2\-\3\4'),
+-    (re.compile(r'(^|[ \t\[\'])--([^/ \t-]*)($|[ \t=\]\'])'), r'\1\-\-\2\3'),
+-    (re.compile(r'(^|[ \t\[\'])-([^/ \t-]*)($|[ \t=\]\'])'), r'\1\-\2\3'),
++    (re.compile(r'(^|[ \t\[\'])--([^/ \t/,-]*)-([^/ \t/,-]*)-([^/ \t/,-]*)(?=$|[ \t=\]\'/,])'), r'\1\-\-\2\-\3\-\4'),
++    (re.compile(r'(^|[ \t\[\'])-([^/ \t/,-]*)-([^/ \t/,-]*)-([^/ \t/,-]*)(?=$|[ \t=\]\'/,])'), r'\1\-\2\-\3\-\4'),
++    (re.compile(r'(^|[ \t\[\'])--([^/ \t/,-]*)-([^/ \t/,-]*)(?=$|[ \t=\]\'/,])'), r'\1\-\-\2\-\3'),
++    (re.compile(r'(^|[ \t\[\'])-([^/ \t/,-]*)-([^/ \t/,-]*)(?=$|[ \t=\]\'/,])'), r'\1\-\2\-\3'),
++    (re.compile(r'(^|[ \t\[\'])--([^/ \t/,-]*)(?=$|[ \t=\]\'/,])'), r'\1\-\-\2'),
++    (re.compile(r'(^|[ \t\[\'])-([^/ \t/,-]*)(?=$|[ \t=\]\'/,])'), r'\1\-\2'),
+     (re.compile(r"^'"), r" '"),
+     ]
+