From 125a67d2202fec435c880f58747248f36b0a0fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr@debian.org>
Date: Fri, 13 Aug 2010 22:41:44 +0200
Subject: [PATCH] dh_python2: pass shallow=False to cmpfiles to make sure only
exactly the same files are moved to pyshared
---
debian/changelog | 9 ++++++---
dh_python2 | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index df482a2..7dc2082 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-defaults (2.6.5-13) UNRELEASED; urgency=low
+python-defaults (2.6.5-13) unstable; urgency=low
[ Scott Kitterman ]
* Python policy changes for X-Python-Version and X-Python3-Version
@@ -8,9 +8,12 @@ python-defaults (2.6.5-13) UNRELEASED; urgency=low
[ Piotr Ożarowski ]
* Fix documentation typo in pycompile/pycompile.1
- * dh_python2: Add support for X-Python-Version
+ * dh_python2:
+ - pass shallow=False to cmpfiles to make sure only exactly the same files
+ are moved to pyshared
+ - add support for X-Python-Version
- -- Scott Kitterman <scott@kitterman.com> Tue, 10 Aug 2010 22:27:20 -0400
+ -- Piotr Ożarowski <piotr@debian.org> Fri, 13 Aug 2010 22:39:37 +0200
python-defaults (2.6.5-12) unstable; urgency=low
diff --git a/dh_python2 b/dh_python2
index 2187fbe..faa9e5d 100755
--- a/dh_python2
+++ b/dh_python2
@@ -224,7 +224,7 @@ def share_2x(dir1, dir2, dc=None):
common_dirs = dc.subdirs.iteritems()
common_files = dc.common_files
# dircmp returns common names only, lets check files more carefully...
- common_files = cmpfiles(dir1, dir2, common_files)[0]
+ common_files = cmpfiles(dir1, dir2, common_files, shallow=False)[0]
for fn in common_files:
fpath1 = join(dir1, fn)
--
GitLab