[Python-apps-commits] r7528 - in packages/pyflakes/trunk/debian (8 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Sun Sep 11 17:41:49 UTC 2011
Date: Sunday, September 11, 2011 @ 17:41:47
Author: morph
Revision: 7528
Converted to '3.0 (quilt)' + patches refresh
Modified:
packages/pyflakes/trunk/debian/changelog
packages/pyflakes/trunk/debian/control
packages/pyflakes/trunk/debian/patches/add_main_function.diff
packages/pyflakes/trunk/debian/patches/always_close_fd.diff
packages/pyflakes/trunk/debian/patches/check_encoding_errors.diff
packages/pyflakes/trunk/debian/patches/set_exit_status.diff
packages/pyflakes/trunk/debian/rules
packages/pyflakes/trunk/debian/source/format
Modified: packages/pyflakes/trunk/debian/changelog
===================================================================
--- packages/pyflakes/trunk/debian/changelog 2011-09-11 17:29:26 UTC (rev 7527)
+++ packages/pyflakes/trunk/debian/changelog 2011-09-11 17:41:47 UTC (rev 7528)
@@ -13,8 +13,9 @@
- update Homepage field
* debian/rules
- removed 'get-orig-source', no more needed
+ * Converted to '3.0 (quilt)' + patches refresh
- -- Sandro Tosi <morph at debian.org> Sun, 11 Sep 2011 19:28:15 +0200
+ -- Sandro Tosi <morph at debian.org> Sun, 11 Sep 2011 19:40:47 +0200
pyflakes (0.4.0-1) unstable; urgency=low
Modified: packages/pyflakes/trunk/debian/control
===================================================================
--- packages/pyflakes/trunk/debian/control 2011-09-11 17:29:26 UTC (rev 7527)
+++ packages/pyflakes/trunk/debian/control 2011-09-11 17:41:47 UTC (rev 7528)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Uploaders: Tristan Seligmann <mithrandi at mithrandi.net>, Varun Hiremath <varun at debian.org>, Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 7), python-support (>= 1.0.0), python, quilt (>= 0.46-7)
+Build-Depends: debhelper (>= 7), python-support (>= 1.0.0), python
XS-Python-Version: >= 2.5
Standards-Version: 3.8.3
Homepage: https://launchpad.net/pyflakes
Modified: packages/pyflakes/trunk/debian/patches/add_main_function.diff
===================================================================
--- packages/pyflakes/trunk/debian/patches/add_main_function.diff 2011-09-11 17:29:26 UTC (rev 7527)
+++ packages/pyflakes/trunk/debian/patches/add_main_function.diff 2011-09-11 17:41:47 UTC (rev 7528)
@@ -1,7 +1,9 @@
# fix arguments passing to main function
---- a/bin/pyflakes
-+++ b/bin/pyflakes
+Index: pyflakes-0.5.0/bin/pyflakes
+===================================================================
+--- pyflakes-0.5.0.orig/bin/pyflakes 2011-09-03 18:02:29.000000000 +0200
++++ pyflakes-0.5.0/bin/pyflakes 2011-09-11 19:38:23.305803892 +0200
@@ -1,4 +1,5 @@
#!/usr/bin/python
@@ -9,12 +11,14 @@
from pyflakes.scripts.pyflakes import main
-main()
+main(sys.argv[1:])
---- a/pyflakes/scripts/pyflakes.py
-+++ b/pyflakes/scripts/pyflakes.py
-@@ -46,9 +46,8 @@
- print >> sys.stderr, '%s: no such file' % (filename,)
+Index: pyflakes-0.5.0/pyflakes/scripts/pyflakes.py
+===================================================================
+--- pyflakes-0.5.0.orig/pyflakes/scripts/pyflakes.py 2011-09-03 18:02:29.000000000 +0200
++++ pyflakes-0.5.0/pyflakes/scripts/pyflakes.py 2011-09-11 19:38:23.305803892 +0200
+@@ -72,9 +72,8 @@
return 1
+
-def main():
+def main(args):
warnings = 0
Modified: packages/pyflakes/trunk/debian/patches/always_close_fd.diff
===================================================================
--- packages/pyflakes/trunk/debian/patches/always_close_fd.diff 2011-09-11 17:29:26 UTC (rev 7527)
+++ packages/pyflakes/trunk/debian/patches/always_close_fd.diff 2011-09-11 17:41:47 UTC (rev 7528)
@@ -1,21 +1,19 @@
# Be sure to close file descriptor (even in case of errors)
-Index: pyflakes-0.4.0quilt/pyflakes/scripts/pyflakes.py
+Index: pyflakes-0.5.0/pyflakes/scripts/pyflakes.py
===================================================================
---- pyflakes-0.4.0quilt.orig/pyflakes/scripts/pyflakes.py 2009-12-20 19:20:53.933250864 +0100
-+++ pyflakes-0.4.0quilt/pyflakes/scripts/pyflakes.py 2009-12-20 22:03:33.488043385 +0100
-@@ -75,8 +75,12 @@
+--- pyflakes-0.5.0.orig/pyflakes/scripts/pyflakes.py 2011-09-11 19:38:35.005013432 +0200
++++ pyflakes-0.5.0/pyflakes/scripts/pyflakes.py 2011-09-11 19:38:35.029011813 +0200
+@@ -66,7 +66,11 @@
@return: the number of warnings printed
"""
try:
- return check(file(filename, 'U').read() + '\n', filename)
-- except IOError, msg:
+ fd = file(filename, 'U')
+ try:
+ return check(fd.read(), filename)
+ finally:
+ fd.close()
-+ except IOError, msg:
+ except IOError, msg:
print >> sys.stderr, "%s: %s" % (filename, msg.args[1])
return 1
-
Modified: packages/pyflakes/trunk/debian/patches/check_encoding_errors.diff
===================================================================
--- packages/pyflakes/trunk/debian/patches/check_encoding_errors.diff 2011-09-11 17:29:26 UTC (rev 7527)
+++ packages/pyflakes/trunk/debian/patches/check_encoding_errors.diff 2011-09-11 17:41:47 UTC (rev 7528)
@@ -1,14 +1,16 @@
# Handle Unicode errors gracefully
---- a/pyflakes/scripts/pyflakes.py
-+++ b/pyflakes/scripts/pyflakes.py
-@@ -26,6 +26,9 @@
- print >> sys.stderr, line
- print >> sys.stderr, " " * offset, "^"
+Index: pyflakes-0.5.0/pyflakes/scripts/pyflakes.py
+===================================================================
+--- pyflakes-0.5.0.orig/pyflakes/scripts/pyflakes.py 2011-09-11 19:38:58.151449543 +0200
++++ pyflakes-0.5.0/pyflakes/scripts/pyflakes.py 2011-09-11 19:38:58.163448731 +0200
+@@ -50,6 +50,9 @@
+ print >> sys.stderr, " " * offset, "^"
+
return 1
+ except UnicodeError, msg:
+ print >> sys.stderr, 'encoding error at %r: %s' % (filename, msg)
+ return 1
else:
+ # Okay, it's syntactically valid. Now check it.
w = checker.Checker(tree, filename)
- w.messages.sort(lambda a, b: cmp(a.lineno, b.lineno))
Modified: packages/pyflakes/trunk/debian/patches/set_exit_status.diff
===================================================================
--- packages/pyflakes/trunk/debian/patches/set_exit_status.diff 2011-09-11 17:29:26 UTC (rev 7527)
+++ packages/pyflakes/trunk/debian/patches/set_exit_status.diff 2011-09-11 17:41:47 UTC (rev 7528)
@@ -1,16 +1,20 @@
# fixed duplicated output
---- a/bin/pyflakes
-+++ b/bin/pyflakes
+Index: pyflakes-0.5.0/bin/pyflakes
+===================================================================
+--- pyflakes-0.5.0.orig/bin/pyflakes 2011-09-11 19:38:35.005013432 +0200
++++ pyflakes-0.5.0/bin/pyflakes 2011-09-11 19:38:45.116330262 +0200
@@ -2,4 +2,4 @@
import sys
from pyflakes.scripts.pyflakes import main
-main(sys.argv[1:])
+sys.exit(main(sys.argv[1:]))
---- a/pyflakes/scripts/pyflakes.py
-+++ b/pyflakes/scripts/pyflakes.py
-@@ -64,4 +64,4 @@
+Index: pyflakes-0.5.0/pyflakes/scripts/pyflakes.py
+===================================================================
+--- pyflakes-0.5.0.orig/pyflakes/scripts/pyflakes.py 2011-09-11 19:38:45.096331615 +0200
++++ pyflakes-0.5.0/pyflakes/scripts/pyflakes.py 2011-09-11 19:38:45.120329992 +0200
+@@ -90,4 +90,4 @@
else:
warnings += check(sys.stdin.read(), '<stdin>')
Modified: packages/pyflakes/trunk/debian/rules
===================================================================
--- packages/pyflakes/trunk/debian/rules 2011-09-11 17:29:26 UTC (rev 7527)
+++ packages/pyflakes/trunk/debian/rules 2011-09-11 17:41:47 UTC (rev 7528)
@@ -1,5 +1,4 @@
#!/usr/bin/make -f
-# Build instructions
%:
- dh --with quilt $@
+ dh $@
Modified: packages/pyflakes/trunk/debian/source/format
===================================================================
--- packages/pyflakes/trunk/debian/source/format 2011-09-11 17:29:26 UTC (rev 7527)
+++ packages/pyflakes/trunk/debian/source/format 2011-09-11 17:41:47 UTC (rev 7528)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-apps-commits
mailing list