[Pkg-cracklib-commits] [pkg-cracklib] 01/03: Add "stage1" support to not build python bits during bootstrapping. (Closes: #721354)

[Martin Pitt]

This is an automated email from the git hooks/post-receive script.

mpitt pushed a commit to branch master
in repository pkg-cracklib.

commit b79bb3f2aca628df5f0e52f02fe38e4c9288a9f7
Author: Martin Pitt <martinpitt at gnome.org>
Date:   Wed Oct 23 07:55:53 2013 +0200

    Add "stage1" support to not build python bits during bootstrapping. (Closes: #721354)
---
 debian/changelog |    5 +++++
 debian/rules     |   15 ++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 41d3ca3..114110d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 cracklib2 (2.9.0-2) UNRELEASED; urgency=low
 
+  [ Jan Dittberner ]
   * Fix "Please add a udeb for early password quality checking in d-i"
     (Closes: #658089)
   * add udeb package stanza in debian/control
@@ -9,6 +10,10 @@ cracklib2 (2.9.0-2) UNRELEASED; urgency=low
     - copy files for libcrack2-udeb
     - include compiled cracklib dictionary in udeb
 
+  [ Eleanor Chen ]
+  * Add "stage1" support to not build python bits during bootstrapping.
+    (Closes: #721354)
+
  -- Jan Dittberner <jandd at debian.org>  Wed, 14 Aug 2013 08:54:59 +0200
 
 cracklib2 (2.9.0-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 8ced630..dc2833b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,12 @@ DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+ifneq ($(DEB_STAGE),stage1)
 PYVERS := $(shell pyversions -vs)
 PY3VERS := $(shell py3versions -vs)
+else
+NOPYTHON_OPTIONS = -Npython-cracklib -Npython3-cracklib
+endif
 
 override_dh_auto_configure:
 	aclocal && libtoolize && automake --add-missing && autoreconf
@@ -38,6 +42,7 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	$(MAKE) -C $(CURDIR)/debian/buildtmp/base
+ifneq ($(DEB_STAGE),stage1)
 	for i in $(PYVERS) $(PY3VERS); do \
 		cd $(CURDIR)/debian/buildtmp/python$$i; \
 		rm -rf lib; ln -s $(CURDIR)/debian/buildtmp/base/lib lib; \
@@ -49,11 +54,13 @@ override_dh_auto_build:
 		      . ; \
 		CFLAGS="-I$(CURDIR)/lib $(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" python$$i setup.py build ; \
 	done
+endif
 	docbook2html -o debian/doc --nochunks debian/libcrack2.xml
 	docbook2html -o debian/doc --nochunks debian/cracklib-runtime.xml
 
 override_dh_auto_test:
 	mkdir $(CURDIR)/debian/tmp
+ifneq ($(DEB_STAGE),stage1)
 	$(CURDIR)/debian/buildtmp/base/util/cracklib-packer $(CURDIR)/debian/tmp/cracklib_dict < \
 	 $(CURDIR)/dicts/cracklib-small
 	for i in $(PYVERS) $(PY3VERS); do \
@@ -61,6 +68,7 @@ override_dh_auto_test:
 		LD_LIBRARY_PATH=$(CURDIR)/debian/buildtmp/base/lib/.libs python$$i \
 		-c 'import cracklib; cracklib.test(dictpath="$(CURDIR)/debian/tmp/cracklib_dict")'; \
 	done
+endif
 
 override_dh_auto_clean:
 	rm -rf debian/buildtmp
@@ -107,6 +115,8 @@ override_dh_auto_install:
 	  $(CURDIR)/debian/cracklib-runtime/usr/sbin/cracklib-check \
 	  $(CURDIR)/debian/cracklib-runtime/usr/sbin/cracklib-packer \
 	  $(CURDIR)/debian/cracklib-runtime/usr/sbin/cracklib-unpacker
+
+ifneq ($(DEB_STAGE),stage1)
 	for i in $(PYVERS); do \
 		cd $(CURDIR)/debian/buildtmp/python$$i/python; \
 		python$$i setup.py install --install-layout=deb --root $(CURDIR)/debian/python-cracklib; \
@@ -115,6 +125,7 @@ override_dh_auto_install:
 		cd $(CURDIR)/debian/buildtmp/python$$i/python; \
 		python$$i setup.py install --install-layout=deb --root $(CURDIR)/debian/python3-cracklib; \
 	done
+endif
 
 override_dh_link:
 	dh_link -plibcrack2-dev usr/lib/$(DEB_HOST_MULTIARCH)/libcrack.so.2 \
@@ -124,11 +135,13 @@ override_dh_link:
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
+ifneq ($(DEB_STAGE),stage1)
 override_dh_python2:
 	dh_python2 -ppython-cracklib
 
 override_dh_python3:
 	dh_python3 -ppython3-cracklib
+endif
 
 %:
-	dh $@ --with python2,python3,autotools_dev
+	dh $@ --with python2,python3,autotools_dev $(NOPYTHON_OPTIONS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cracklib/pkg-cracklib.git