[Python-apps-commits] r2190 - in packages/pyflakes/trunk/debian (7 files)

Sat Jan 10 16:30:45 UTC 2009

Date: Saturday, January 10, 2009 @ 16:30:45
  Author: morph
Revision: 2190

* New SVN snapshot; thanks to Julian Andres Klode for the patch;
  Closes: #509984
  - fixes new python features, like "with statement"
* debian/patches/install_scripts_package.diff
  - removed, since merged upstream in this snapshot
* debian/patches/always_close_fd.diff
  - refreshed
* debian/{compat,control,rules}
  - package converted to debhelper v7; thanks to Julian Andres Klode for the
    patch
  + Add ${misc:Depends} to Depends to remove lintian warning.

Modified:
  packages/pyflakes/trunk/debian/changelog
  packages/pyflakes/trunk/debian/compat
  packages/pyflakes/trunk/debian/control
  packages/pyflakes/trunk/debian/patches/always_close_fd.diff
  packages/pyflakes/trunk/debian/patches/series
  packages/pyflakes/trunk/debian/rules
Deleted:
  packages/pyflakes/trunk/debian/patches/install_scripts_package.diff

Modified: packages/pyflakes/trunk/debian/changelog
===================================================================

--- packages/pyflakes/trunk/debian/changelog	2009-01-09 20:41:09 UTC (rev 2189)
+++ packages/pyflakes/trunk/debian/changelog	2009-01-10 16:30:45 UTC (rev 2190)
@@ -1,16 +1,25 @@
-pyflakes (0.2.1+svn16699-2) UNRELEASED; urgency=low
+pyflakes (0.2.1+svn17054-1) UNRELEASED; urgency=low
 
   [ Sandro Tosi ]
+  * New SVN snapshot; thanks to Julian Andres Klode for the patch;
+    Closes: #509984
+    - fixes new python features, like "with statement"
+  * debian/patches/install_scripts_package.diff
+    - removed, since merged upstream in this snapshot
+  * debian/patches/always_close_fd.diff
+    - refreshed
   * debian/control
     - switch Vcs-Browser field to viewsvn
+  * debian/{compat,control,rules}
+    - package converted to debhelper v7; thanks to Julian Andres Klode for the
+      patch
 
   [ Marco Rodrigues ]
   * debian/control:
-    + Add ${misc:Depends} to Depends to remove
-      lintian warning.
+    + Add ${misc:Depends} to Depends to remove lintian warning.
     + Add watch file.
 
- -- Sandro Tosi <morph at debian.org>  Mon, 03 Nov 2008 22:47:57 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 10 Jan 2009 17:25:20 +0100
 
 pyflakes (0.2.1+svn16699-1) unstable; urgency=low
 

Modified: packages/pyflakes/trunk/debian/compat
===================================================================
--- packages/pyflakes/trunk/debian/compat	2009-01-09 20:41:09 UTC (rev 2189)
+++ packages/pyflakes/trunk/debian/compat	2009-01-10 16:30:45 UTC (rev 2190)
@@ -1 +1 @@
-5
+7

Modified: packages/pyflakes/trunk/debian/control
===================================================================
--- packages/pyflakes/trunk/debian/control	2009-01-09 20:41:09 UTC (rev 2189)
+++ packages/pyflakes/trunk/debian/control	2009-01-10 16:30:45 UTC (rev 2190)
@@ -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 (>= 5.0.37.2), cdbs (>= 0.4.43), python-central (>= 0.6), python, quilt
+Build-Depends: debhelper (>= 7), python-central (>= 0.6), python, quilt
 XS-Python-Version: current
 Standards-Version: 3.8.0
 Homepage: http://divmod.org/trac/wiki/DivmodPyflakes

Modified: packages/pyflakes/trunk/debian/patches/always_close_fd.diff
===================================================================
--- packages/pyflakes/trunk/debian/patches/always_close_fd.diff	2009-01-09 20:41:09 UTC (rev 2189)
+++ packages/pyflakes/trunk/debian/patches/always_close_fd.diff	2009-01-10 16:30:45 UTC (rev 2190)
@@ -1,10 +1,8 @@
-Index: b/bin/pyflakes
-===================================================================
 --- a/pyflakes/scripts/pyflakes.py
 +++ b/pyflakes/scripts/pyflakes.py
-@@ -34,7 +34,11 @@
- 
- def checkPath(filename):
+@@ -39,7 +39,11 @@ def checkPath(filename):
+     @return: the number of warnings printed
+     """
      if os.path.exists(filename):
 -        return check(file(filename, 'U').read() + '\n', filename)
 +        fd = file(filename, 'U')
@@ -12,6 +10,6 @@
 +            return check(fd.read(), filename)
 +        finally:
 +            fd.close()
- 
- def main(args):
-     warnings = 0
+     else:
+         print >> sys.stderr, '%s: no such file' % (filename,)
+         return 1

Deleted: packages/pyflakes/trunk/debian/patches/install_scripts_package.diff
===================================================================
--- packages/pyflakes/trunk/debian/patches/install_scripts_package.diff	2009-01-09 20:41:09 UTC (rev 2189)
+++ packages/pyflakes/trunk/debian/patches/install_scripts_package.diff	2009-01-10 16:30:45 UTC (rev 2190)
@@ -1,13 +0,0 @@
-Index: b/bin/pyflakes
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -12,7 +12,7 @@
-     maintainer="Moe Aboulkheir",
-     maintainer_email="moe at divmod.com",
-     url="http://www.divmod.org/projects/pyflakes",
--    packages=["pyflakes"],
-+    packages=["pyflakes", "pyflakes/scripts"],
-     scripts=["bin/pyflakes"],
-     long_description="""Pyflakes is program to analyze Python programs and detect various errors. It
- works by parsing the source file, not importing it, so it is safe to use on

Modified: packages/pyflakes/trunk/debian/patches/series
===================================================================
--- packages/pyflakes/trunk/debian/patches/series	2009-01-09 20:41:09 UTC (rev 2189)
+++ packages/pyflakes/trunk/debian/patches/series	2009-01-10 16:30:45 UTC (rev 2190)
@@ -2,4 +2,3 @@
 always_close_fd.diff
 set_exit_status.diff
 check_encoding_errors.diff
-install_scripts_package.diff

Modified: packages/pyflakes/trunk/debian/rules
===================================================================
--- packages/pyflakes/trunk/debian/rules	2009-01-09 20:41:09 UTC (rev 2189)
+++ packages/pyflakes/trunk/debian/rules	2009-01-10 16:30:45 UTC (rev 2190)
@@ -1,18 +1,17 @@
 #!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
 
-DEB_PYTHON_SYSTEM=pycentral
+# Build instructions
+%:
+	dh $@ --with python_central
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+# Dependency information
+build: patch
+clean: unpatch
+binary-arch: build
+binary-indep: build
+binary: binary-arch binary-indep
 
-DEB_PYTHON_INSTALL_ARGS_ALL += --prefix=/usr
-
-clean::
-	find . -name \*pyc -exec rm '{}' \;
-
 PACKAGE = pyflakes
 SRC_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
 SVN_REVISION := $(shell echo $(SRC_VERSION) | awk -F"+" '{ print $$2 }' | sed 's/svn//' )
@@ -26,4 +25,3 @@
 	GZIP=--best tar czf $(TARBALL) -C get-orig-source $(PACKAGE)-$(SRC_VERSION).orig
 	rm -rf get-orig-source
 	#  $(TARBALL) created; move it to the right destination to build the package
-


