[Python-apps-commits] r3840 - in packages/osc/trunk/debian (7 files)

[nijel at users.alioth.debian.org]

    Date: Friday, September 25, 2009 @ 12:26:07
  Author: nijel
Revision: 3840

* Use quilt patch system.
  - Fix not escaped ' in man page.
  - Fix compilation with Python 2.4.

Added:
  packages/osc/trunk/debian/patches/
  packages/osc/trunk/debian/patches/series
  packages/osc/trunk/debian/patches/svn-8101.patch
  packages/osc/trunk/debian/patches/svn-8117.patch
Modified:
  packages/osc/trunk/debian/changelog
  packages/osc/trunk/debian/control
  packages/osc/trunk/debian/rules

Modified: packages/osc/trunk/debian/changelog
===================================================================
--- packages/osc/trunk/debian/changelog	2009-09-25 12:24:12 UTC (rev 3839)
+++ packages/osc/trunk/debian/changelog	2009-09-25 12:26:07 UTC (rev 3840)
@@ -2,8 +2,11 @@
 
   * NOT RELEASED YET
   * Simplify debian rules by using dh.
+  * Use quilt patch system.
+    - Fix not escaped ' in man page.
+    - Fix compilation with Python 2.4.
 
- -- Michal ÄŒihaÅ™ <nijel at debian.org>  Fri, 25 Sep 2009 14:23:29 +0200
+ -- Michal ÄŒihaÅ™ <nijel at debian.org>  Fri, 25 Sep 2009 14:25:40 +0200
 
 osc (0.122-1) unstable; urgency=low
 

Modified: packages/osc/trunk/debian/control
===================================================================
--- packages/osc/trunk/debian/control	2009-09-25 12:24:12 UTC (rev 3839)
+++ packages/osc/trunk/debian/control	2009-09-25 12:26:07 UTC (rev 3840)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Michal ÄŒihaÅ™ <nijel at debian.org>
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50)
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7)
 Build-Depends-Indep: python-dev, python-support (>= 0.5.3)
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/osc/trunk

Added: packages/osc/trunk/debian/patches/series
===================================================================
--- packages/osc/trunk/debian/patches/series	                        (rev 0)
+++ packages/osc/trunk/debian/patches/series	2009-09-25 12:26:07 UTC (rev 3840)
@@ -0,0 +1,2 @@
+svn-8117.patch
+svn-8101.patch -p0

Added: packages/osc/trunk/debian/patches/svn-8101.patch
===================================================================
--- packages/osc/trunk/debian/patches/svn-8101.patch	                        (rev 0)
+++ packages/osc/trunk/debian/patches/svn-8101.patch	2009-09-25 12:26:07 UTC (rev 3840)
@@ -0,0 +1,37 @@
+Fix compilation with python 2.4.
+SVN revision 8101.
+Index: osc/util/packagequery.py
+===================================================================
+--- osc/util/packagequery.py	(revision 8100)
++++ osc/util/packagequery.py	(revision 8101)
+@@ -4,7 +4,7 @@
+         Exception.__init__(self)
+         self.msg = msg
+ 
+-class PackageQuery():
++class PackageQuery:
+     """abstract base class for all package types"""
+     def read(self):
+         raise NotImplementedError
+Index: osc/util/rpmquery.py
+===================================================================
+--- osc/util/rpmquery.py	(revision 8100)
++++ osc/util/rpmquery.py	(revision 8101)
+@@ -8,7 +8,7 @@
+ class RpmHeaderError(RpmError):
+     pass
+ 
+-class RpmHeader():
++class RpmHeader:
+     """corresponds more or less to the indexEntry_s struct"""
+     def __init__(self, offset, length):
+         self.offset = offset
+@@ -32,7 +32,7 @@
+     def __len__(self):
+         return len(self.entries)
+ 
+-class RpmHeaderEntry():
++class RpmHeaderEntry:
+     """corresponds to the entryInfo_s struct (except the data attribute)"""
+ 
+     # each element represents an int

Added: packages/osc/trunk/debian/patches/svn-8117.patch
===================================================================
--- packages/osc/trunk/debian/patches/svn-8117.patch	                        (rev 0)
+++ packages/osc/trunk/debian/patches/svn-8117.patch	2009-09-25 12:26:07 UTC (rev 3840)
@@ -0,0 +1,12 @@
+Fixed generation of man page.
+SVN revision 8117.
+--- a/osc/cmdln.py
++++ b/osc/cmdln.py
+@@ -124,6 +124,7 @@
+     (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"^'"), r" '"),
+     ]
+ 
+ def man_escape(text):

Modified: packages/osc/trunk/debian/rules
===================================================================
--- packages/osc/trunk/debian/rules	2009-09-25 12:24:12 UTC (rev 3839)
+++ packages/osc/trunk/debian/rules	2009-09-25 12:26:07 UTC (rev 3840)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh --with quilt $@
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS