few minor fixes

Makefile

@@ -19,7 +19,7 @@ install-dev:
 
 install-runtime:
 	$(INSTALL) -m 755 -d $(DESTDIR)$(PREFIX)/share/python/debpython $(DESTDIR)$(PREFIX)/bin
-	$(INSTALL) -m 644 debpython/*py $(DESTDIR)$(PREFIX)/share/python/debpython/
+	$(INSTALL) -m 644 debpython/*.py $(DESTDIR)$(PREFIX)/share/python/debpython/
 	$(INSTALL) -m 755 pycompile $(DESTDIR)$(PREFIX)/bin/
 	$(INSTALL) -m 755 pyclean $(DESTDIR)$(PREFIX)/bin/
 

debian/changelog

-python-defaults (2.6.5-9) UNRELEASED; urgency=low
+python-defaults (2.6.5-9) unstable; urgency=low
 
   [ Piotr Ożarowski ]
   * pyclean, pycompile: use .communicate() instead of .wait() to avoid hanging
@@ -10,7 +10,7 @@ python-defaults (2.6.5-9) UNRELEASED; urgency=low
   * Require python (>= 2.6.5-9~) in generated dependencies to use the fixed
     pycompile.
 
- -- Piotr Ożarowski <piotr@debian.org>  Sat, 17 Jul 2010 18:58:23 +0200
+ -- Piotr Ożarowski <piotr@debian.org>  Mon, 19 Jul 2010 20:27:50 +0200
 
 python-defaults (2.6.5-8) unstable; urgency=low
 

debian/control

@@ -59,9 +59,6 @@ Description: header files and a static library for Python (default)
  Python modules, extending the Python interpreter or embedding Python
  in applications.
  .
- Includes the Python distutils, which were in a separate package up to
- version 1.5.2.
- .
  This package is a dependency package, which depends on Debian's default
  Python version (currently v2.6).
 

debian/control.in

@@ -59,9 +59,6 @@ Description: header files and a static library for Python (default)
  Python modules, extending the Python interpreter or embedding Python
  in applications.
  .
- Includes the Python distutils, which were in a separate package up to
- version 1.5.2.
- .
  This package is a dependency package, which depends on Debian's default
  Python version (currently v@VER@).
 

debian/rules

@@ -103,6 +103,7 @@ clean: control-file
 	    fi; \
 	done
 	rm -f debian/*.py[co]
+	make clean
 	dh_clean
 
 stamp-control:

debpython/depends.py

@@ -139,7 +139,7 @@ class Dependencies(object):
                 vr = options.vrange
                 if vr:
                     args += "-V %s" % vrange_str(vr)
-                    if vr[0]:  # minumum version specified
+                    if vr[0]:  # minimum version specified
                         self.depend("python (>= %s)" % vrepr(vr[0]))
                     if vr[1]:  # maximum version specified
                         self.depend("python (<< %s)" % vrepr(vr[1]))

debpython/pydist.py

@@ -112,7 +112,7 @@ def guess_dependency(req, version=None):
 
     data = load()
     req_dict = REQUIRES_RE.match(req)
-    if not req:
+    if not req_dict:
         log.warning('requirement is not valid: %s', req)
         log.info('please ask dh_python2 author to fix REQUIRES_RE '
                  'or your upstream author to fix requires.txt')

dh_python2

@@ -444,9 +444,7 @@ def main():
     if options.skip_private:
         private_dir = False
 
-    if options.verbose:
-        log.setLevel(logging.INFO)
-    if os.environ.get('DH_VERBOSE') == '1':
+    if options.verbose or os.environ.get('DH_VERBOSE') == '1':
         log.setLevel(logging.DEBUG)
         log.debug('argv: %s', sys.argv)
         log.debug('options: %s', options)

tests/Makefile

@@ -7,7 +7,7 @@ test%:
 
 clean:
 	rm -f *\.dsc *\.tar\.gz *\.build *\.changes *\.deb
-	(cd t1; fakeroot ./debian/rules clean)
+	(cd t1; ./debian/rules clean)
 	@find . -name '*\.egg-info' -exec rm -rf "{}" \; || true
 
 .PHONY: clean

tests/t1/setup.py

 #! /usr/bin/python
 # -*- coding: UTF-8 -*-
-from setuptools import setup, find_packages
+try:
+    from setuptools import setup, find_packages
+except ImportError:
+    exit()
 
 setup(name='Foo',
       version=0.1,