[Pkg-cracklib-commits] r82 - cracklib2/trunk/debian

[mpitt at alioth.debian.org]

Author: mpitt
Date: 2009-03-16 09:03:50 +0000 (Mon, 16 Mar 2009)
New Revision: 82

Modified:
   cracklib2/trunk/debian/changelog
   cracklib2/trunk/debian/rules
Log:
debian/rules: Include /usr/share/python/python.mk and use py_sitename_sh
macro, so that installation will work correctly with the forthcoming
Python 2.6 as well. (LP: #342383)

Modified: cracklib2/trunk/debian/changelog
===================================================================
--- cracklib2/trunk/debian/changelog	2009-03-08 20:17:22 UTC (rev 81)
+++ cracklib2/trunk/debian/changelog	2009-03-16 09:03:50 UTC (rev 82)
@@ -1,10 +1,16 @@
 cracklib2 (2.8.13-7) UNRELEASED; urgency=low
 
+  [ Jan Dittberner ]
   * debian/control: remove duplicate Priority field of python-cracklib
     and Section field of libcrack2
   * remove debian/libcrack2.postinst and debian/libcrack2.postrm as
     their functionality is automatically generated by debhelper
 
+  [ Alessio Treglia ]
+  * debian/rules: Include /usr/share/python/python.mk and use py_sitename_sh
+    macro, so that installation will work correctly with the forthcoming
+    Python 2.6 as well. (LP: #342383)
+
  -- Jan Dittberner <jan at dittberner.info>  Wed, 25 Feb 2009 11:10:14 +0100
 
 cracklib2 (2.8.13-6) unstable; urgency=low

Modified: cracklib2/trunk/debian/rules
===================================================================
--- cracklib2/trunk/debian/rules	2009-03-08 20:17:22 UTC (rev 81)
+++ cracklib2/trunk/debian/rules	2009-03-16 09:03:50 UTC (rev 82)
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/python/python.mk
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -71,9 +72,9 @@
 	 debian/tmp/usr/sbin/cracklib-unpacker
 	touch debian/python-cracklib.install
 	for i in $(PYVERS); do \
-		echo "debian/tmp/usr/lib/python$$i/site-packages/_cracklibmodule.so usr/lib/python$$i/site-packages" >> debian/python-cracklib.install; \
-		echo "debian/tmp/usr/lib/python$$i/site-packages/cracklib.py usr/lib/python$$i/site-packages" >> debian/python-cracklib.install; \
-		echo "debian/crack.py usr/lib/python$$i/site-packages" >> debian/python-cracklib.install; \
+		echo "debian/tmp/usr/lib/python$$i/$(call py_sitename_sh, $$i)/_cracklibmodule.so usr/lib/python$$i/$(call py_sitename_sh, $$i)" >> debian/python-cracklib.install; \
+		echo "debian/tmp/usr/lib/python$$i/$(call py_sitename_sh, $$i)/cracklib.py usr/lib/python$$i/$(call py_sitename_sh, $$i)" >> debian/python-cracklib.install; \
+		echo "debian/crack.py usr/lib/python$$i/$(call py_sitename_sh, $$i)" >> debian/python-cracklib.install; \
 	done
 	dh_install