[Python-modules-commits] r31084 - in packages/ply/trunk/debian (6 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Thu Oct 16 06:12:04 UTC 2014
Date: Thursday, October 16, 2014 @ 06:12:04
Author: arnau
Revision: 31084
Remove meaningless (at least with quilt) numbering prefix for patches.
Added:
packages/ply/trunk/debian/patches/fix-lex-tabversion.patch
packages/ply/trunk/debian/patches/relax-lex-tabversion-check.patch
Modified:
packages/ply/trunk/debian/changelog
packages/ply/trunk/debian/patches/series
Deleted:
packages/ply/trunk/debian/patches/01_fix-lex-tabversion.patch
packages/ply/trunk/debian/patches/02_relax-lex-tabversion-check.patch
Modified: packages/ply/trunk/debian/changelog
===================================================================
--- packages/ply/trunk/debian/changelog 2014-10-16 06:09:45 UTC (rev 31083)
+++ packages/ply/trunk/debian/changelog 2014-10-16 06:12:04 UTC (rev 31084)
@@ -12,6 +12,7 @@
* d/control: bump Standards-Version to 3.9.6. No changes needed.
* Add dh_python3-ply to generate proper package Depends for Python3.
Closes: #714099.
+ * d/patches/*: remove meaningless (at least with quilt) numbering prefix.
-- Arnaud Fontaine <arnau at debian.org> Thu, 16 Oct 2014 14:33:15 +0900
Deleted: packages/ply/trunk/debian/patches/01_fix-lex-tabversion.patch
===================================================================
--- packages/ply/trunk/debian/patches/01_fix-lex-tabversion.patch 2014-10-16 06:09:45 UTC (rev 31083)
+++ packages/ply/trunk/debian/patches/01_fix-lex-tabversion.patch 2014-10-16 06:12:04 UTC (rev 31084)
@@ -1,23 +0,0 @@
-Description: Set proper _tabversion in ply.lex
-Author: Daniele Tricoli <eriol at mornie.org>
-Forwarded: https://github.com/dabeaz/ply/pull/1
---- a/ply/lex.py
-+++ b/ply/lex.py
-@@ -175,7 +175,7 @@
- filename = os.path.join(outputdir,basetabfilename)+".py"
- tf = open(filename,"w")
- tf.write("# %s.py. This file automatically created by PLY (version %s). Don't edit!\n" % (tabfile,__version__))
-- tf.write("_tabversion = %s\n" % repr(__version__))
-+ tf.write("_tabversion = %s\n" % repr(__tabversion__))
- tf.write("_lextokens = %s\n" % repr(self.lextokens))
- tf.write("_lexreflags = %s\n" % repr(self.lexreflags))
- tf.write("_lexliterals = %s\n" % repr(self.lexliterals))
-@@ -222,7 +222,7 @@
- exec("import %s as lextab" % tabfile, env,env)
- lextab = env['lextab']
-
-- if getattr(lextab,"_tabversion","0.0") != __version__:
-+ if getattr(lextab,"_tabversion","0.0") != __tabversion__:
- raise ImportError("Inconsistent PLY version")
-
- self.lextokens = lextab._lextokens
Deleted: packages/ply/trunk/debian/patches/02_relax-lex-tabversion-check.patch
===================================================================
--- packages/ply/trunk/debian/patches/02_relax-lex-tabversion-check.patch 2014-10-16 06:09:45 UTC (rev 31083)
+++ packages/ply/trunk/debian/patches/02_relax-lex-tabversion-check.patch 2014-10-16 06:12:04 UTC (rev 31084)
@@ -1,21 +0,0 @@
-Description: Don't break already built packages with wrong _tabversion
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: not-needed
---- a/ply/lex.py
-+++ b/ply/lex.py
-@@ -222,7 +222,14 @@
- exec("import %s as lextab" % tabfile, env,env)
- lextab = env['lextab']
-
-- if getattr(lextab,"_tabversion","0.0") != __tabversion__:
-+ # python-ply 3.3-1 is shipped by Debian since Squeeze, so
-+ # to not break packages that were built with wrong
-+ # _tabversion we need to explicitly fix it.
-+ actual_tabversion = getattr(lextab, '_tabversion', '0.0')
-+ if actual_tabversion in ('3.3', '3.4'):
-+ actual_tabversion = '3.2'
-+
-+ if actual_tabversion != __tabversion__:
- raise ImportError("Inconsistent PLY version")
-
- self.lextokens = lextab._lextokens
Added: packages/ply/trunk/debian/patches/fix-lex-tabversion.patch
===================================================================
--- packages/ply/trunk/debian/patches/fix-lex-tabversion.patch (rev 0)
+++ packages/ply/trunk/debian/patches/fix-lex-tabversion.patch 2014-10-16 06:12:04 UTC (rev 31084)
@@ -0,0 +1,23 @@
+Description: Set proper _tabversion in ply.lex
+Author: Daniele Tricoli <eriol at mornie.org>
+Forwarded: https://github.com/dabeaz/ply/pull/1
+--- a/ply/lex.py
++++ b/ply/lex.py
+@@ -175,7 +175,7 @@
+ filename = os.path.join(outputdir,basetabfilename)+".py"
+ tf = open(filename,"w")
+ tf.write("# %s.py. This file automatically created by PLY (version %s). Don't edit!\n" % (tabfile,__version__))
+- tf.write("_tabversion = %s\n" % repr(__version__))
++ tf.write("_tabversion = %s\n" % repr(__tabversion__))
+ tf.write("_lextokens = %s\n" % repr(self.lextokens))
+ tf.write("_lexreflags = %s\n" % repr(self.lexreflags))
+ tf.write("_lexliterals = %s\n" % repr(self.lexliterals))
+@@ -222,7 +222,7 @@
+ exec("import %s as lextab" % tabfile, env,env)
+ lextab = env['lextab']
+
+- if getattr(lextab,"_tabversion","0.0") != __version__:
++ if getattr(lextab,"_tabversion","0.0") != __tabversion__:
+ raise ImportError("Inconsistent PLY version")
+
+ self.lextokens = lextab._lextokens
Added: packages/ply/trunk/debian/patches/relax-lex-tabversion-check.patch
===================================================================
--- packages/ply/trunk/debian/patches/relax-lex-tabversion-check.patch (rev 0)
+++ packages/ply/trunk/debian/patches/relax-lex-tabversion-check.patch 2014-10-16 06:12:04 UTC (rev 31084)
@@ -0,0 +1,21 @@
+Description: Don't break already built packages with wrong _tabversion
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: not-needed
+--- a/ply/lex.py
++++ b/ply/lex.py
+@@ -222,7 +222,14 @@
+ exec("import %s as lextab" % tabfile, env,env)
+ lextab = env['lextab']
+
+- if getattr(lextab,"_tabversion","0.0") != __tabversion__:
++ # python-ply 3.3-1 is shipped by Debian since Squeeze, so
++ # to not break packages that were built with wrong
++ # _tabversion we need to explicitly fix it.
++ actual_tabversion = getattr(lextab, '_tabversion', '0.0')
++ if actual_tabversion in ('3.3', '3.4'):
++ actual_tabversion = '3.2'
++
++ if actual_tabversion != __tabversion__:
+ raise ImportError("Inconsistent PLY version")
+
+ self.lextokens = lextab._lextokens
Modified: packages/ply/trunk/debian/patches/series
===================================================================
--- packages/ply/trunk/debian/patches/series 2014-10-16 06:09:45 UTC (rev 31083)
+++ packages/ply/trunk/debian/patches/series 2014-10-16 06:12:04 UTC (rev 31084)
@@ -1,5 +1,5 @@
-01_fix-lex-tabversion.patch
-02_relax-lex-tabversion-check.patch
+fix-lex-tabversion.patch
+relax-lex-tabversion-check.patch
fixed-yacc-tests-to-account-for-dict-hash-key-random.patch
more-test-fixes.patch
fixed-lexer-line-tracking.patch
More information about the Python-modules-commits
mailing list