[Pkg-cracklib-commits] [SCM] Git repository for pkg-cracklib branch, experimental, updated. debian/2.8.16-2-19-gb343783

[Jan Dittberner]

The following commit has been merged in the experimental branch:
commit b3437835960058cece0fc3d57cba25a5672e4a2b
Author: Jan Dittberner <jandd at debian.org>
Date:   Mon Jan 24 19:16:25 2011 +0100

    fix Python 3 build

diff --git a/debian/rules b/debian/rules
index bb2e129..fd243fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,16 +19,21 @@ override_dh_auto_configure:
 		mkdir -p debian/build$$i; \
 		cd debian/build$$i; \
 		../../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-rpath --with-default-dict=/var/cache/cracklib/cracklib_dict PYTHON_PREFIX=/usr/lib/python$$i PYTHON=/usr/bin/python$$i; \
-		cd ../..; \
+		cd python; \
+		ln -s ../../../python/_cracklibmodule.c ../../../python/cracklib.py .; \
+		cd ../../..; \
 	done
 
 override_dh_auto_build:
 	$(MAKE) -C debian/tmpbuild
-	for i in $(PYVERS); do \
-		${MAKE} -C debian/build$$i/python top_builddir=`pwd`/debian/tmpbuild; \
-	done
-	for i in $(PY3VERS); do \
-		${MAKE} -C debian/build$$i/python top_builddir=`pwd`/debian/tmpbuild; \
+	cd debian/tmpbuild/lib ; ln -s ../../../lib/crack.h . ; cd ../../..
+	for i in $(PYVERS) $(PY3VERS); do \
+		cd debian/build$$i; \
+		rm -r lib; \
+		ln -s ../tmpbuild/lib lib; \
+		cd python; \
+		python$$i setup.py build; \
+		cd ../../..; \
 	done
 	xmlto -o debian/doc xhtml-nochunks debian/libcrack2.xml
 	xmlto -o debian/doc xhtml-nochunks debian/cracklib-runtime.xml
@@ -52,30 +57,36 @@ override_dh_auto_clean:
 
 override_dh_auto_install:
 	$(MAKE) -C debian/tmpbuild DESTDIR=`pwd`/debian/tmp install
-	for i in $(PYVERS); do \
-		$(MAKE) -C debian/build$$i/python install DESTDIR=`pwd`/debian/tmp; \
-		rm -rf debian/tmp/usr/lib/python$$i/*.pyc; \
-		rm -rf debian/tmp/usr/lib/python$$i/*.pyo; \
-	done
-	for i in $(PY3VERS); do \
-		$(MAKE) -C debian/build$$i/python3 install DESTDIR=`pwd`/debian/tmp; \
-		rm -rf debian/tmp/usr/lib/python$$i/*.pyc; \
-		rm -rf debian/tmp/usr/lib/python$$i/*.pyo; \
+	for i in $(PYVERS) $(PY3VERS); do \
+		cd debian/build$$i/python; \
+		python$$i setup.py install --root `pwd`/debian/tmp; \
+		cd ../../..; \
 	done
+	# for i in $(PYVERS); do \
+	# 	$(MAKE) -C debian/build$$i/python install DESTDIR=`pwd`/debian/tmp; \
+	# 	rm -rf debian/tmp/usr/lib/python$$i/*.pyc; \
+	# 	rm -rf debian/tmp/usr/lib/python$$i/*.pyo; \
+	# done
+	# for i in $(PY3VERS); do \
+	# 	$(MAKE) -C debian/build$$i/python3 install DESTDIR=`pwd`/debian/tmp; \
+	# 	rm -rf debian/tmp/usr/lib/python$$i/*.pyc; \
+	# 	rm -rf debian/tmp/usr/lib/python$$i/*.pyo; \
+	# done
 	chrpath -d debian/tmp/usr/sbin/cracklib-check \
 	 debian/tmp/usr/sbin/cracklib-packer \
 	 debian/tmp/usr/sbin/cracklib-unpacker
-	for i in $(PYVERS); do \
-		cd debian/build$$i/python; \
-		ln -s ../../../python/cracklib.py . ; \
-		ln -s ../../../_cracklibmodule.c . ; \
-		python$$i setup.py egg_info install_egg_info --install-dir "../../tmp/usr/lib/python$$i/$(call py_sitename_sh, $$i)"; \
-		cd ../../..; \
-		find "debian/tmp/usr/lib/python$$i/$(call py_sitename_sh, $$i)" -type f | grep egg-info >> 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
+	# for i in $(PYVERS); do \
+	# 	cd debian/build$$i/python; \
+	# 	ln -s ../../../python/cracklib.py . ; \
+	# 	ln -s ../../../_cracklibmodule.c . ; \
+	# 	python$$i setup.py egg_info install_egg_info --install-dir "../../tmp/usr/lib/python$$i/$(call py_sitename_sh, $$i)"; \
+	# 	cd ../../..; \
+	# 	find "debian/tmp/usr/lib/python$$i/$(call py_sitename_sh, $$i)" -type f | grep egg-info >> 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
+	exit 1
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS

-- 
Git repository for pkg-cracklib