add test4 to test handling private directories

debian/changelog

@@ -10,6 +10,7 @@ python-defaults (2.6.6-11) UNRELEASED; urgency=low
     - add support for DH_OPTIONS env. variable
     - fix checking shebangs in private directories (executable bit wasn't
       checked correctly)
+    - add test4 to test handling private directories
   * pycompile:
     - --exclude now works with private dirs
     - use /usr/bin/pythonX.Y rather than pythonX.Y (to avoid /usr/local

dh_python2

@@ -421,7 +421,7 @@ def scan(package, dname=None):
 
 ################################################################
 def main():
-    usage = '%prog -p PACKAGE [-V [X.Y][-][A.B]] DIR_OR_FILE [-X REGEXPR]\n'
+    usage = '%prog -p PACKAGE [-V [X.Y][-][A.B]] DIR [-X REGEXPR]\n'
     parser = OptionParser(usage, version='%prog 2.0~beta1',
                                    option_class=Option)
     parser.add_option('--no-guessing-versions', action='store_false',

tests/Makefile

 #!/usr/bin/make -f
 
 # enable or disable tests here:
-TESTS := test1 test2 test3
+TESTS := test1 test2 test3 test4
 
 all: $(TESTS)
 

tests/t4/Makefile

+#!/usr/bin/make -f
+
+all: run check
+
+
+run: clean
+	dpkg-buildpackage -b -us -uc
+
+check:
+	grep -q python2.6 debian/foo/usr/share/foo/foo.py
+	grep -q Depends:.*python2.6 debian/foo/DEBIAN/control
+	grep -q python2.5 debian/foo/usr/share/bar/bar.py
+	grep -q Depends:.*python2.5 debian/foo/DEBIAN/control
+	grep -q python2.4 debian/foo/usr/share/foo/baz.py
+	test ! -x debian/foo/usr/share/foo/baz.py
+	grep -q Depends:.*python2.5 debian/foo/DEBIAN/control && false || true
+
+clean:
+	./debian/rules clean

tests/t4/bar.py

+#!/usr/bin/python2.5
+print("I'm bar")

tests/t4/baz.py

+#!/usr/bin/python2.4
+print("I'm baz - not executable")

tests/t4/debian/changelog

+foo (0.1.1) unstable; urgency=low
+
+  * Initial release
+
+ -- Piotr Ożarowski <piotr@debian.org>  Sat, 27 Feb 2010 20:42:17 +0100

tests/t4/debian/compat

+7

tests/t4/debian/control

+Source: foo
+Section: misc
+Priority: optional
+Maintainer: Piotr Ożarowski <piotr@debian.org>
+Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends-Indep: python
+Standards-Version: 3.9.1
+
+Package: foo
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+Recommends: ${python:Recommends}
+Suggests: ${python:Suggests}
+Enhances: ${python:Enhances}
+Description: example 4 - private directory
+ exemple package #4 - private directory

tests/t4/debian/copyright

+The Debian packaging is © 2011, Piotr Ożarowski <piotr@debian.org> and
+is licensed under the MIT License.

tests/t4/debian/install

+foo.py /usr/share/foo/
+bar.py /usr/share/bar/
+baz.py /usr/share/foo/

tests/t4/debian/rules

+#!/usr/bin/make -f
+%:
+	dh $@ --buildsystem=python_distutils
+
+override_dh_pysupport:
+	DH_VERBOSE=1 ../../dh_python2
+	DH_VERBOSE=1 ../../dh_python2 /usr/share/bar
+
+clean:
+	dh_clean

tests/t4/debian/source/format

+3.0 (native)

tests/t4/foo.py

+#!/usr/bin/python2.6
+print("I'm foo")