Imported Debian patch 4.7.2-3

debian/rules

@@ -3,8 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpkg/architecture.mk
-include /usr/share/dpkg/pkg-info.mk
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # build server only where nodejs is available
 ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips mips64el mipsel ppc64 ppc64el s390x))
@@ -13,13 +12,12 @@ else
   ONLY_CLIENT=1
 endif
 
-#ONLY_CLIENT=1
+# build client only until dogtag works
+ONLY_CLIENT=1
 
 DESTDIR=$(CURDIR)/debian/tmp
 
-export PYTHON=python3
-export am_cv_python_pythondir=/usr/lib/python3/dist-packages
-export am_cv_python_pyexecdir=/usr/lib/python3/dist-packages
+export PYTHON=python
 
 confflags = \
 	--libexecdir=/usr/lib/ \
@@ -37,10 +35,12 @@ confflags += --enable-server \
 endif
 
 # For maintainer use only, generate a tarball:
+SOURCE = freeipa
+gentarball: UV=$(shell dpkg-parsechangelog|awk '/^Version:/ {print $$2}'|sed 's/-.*$$//')
 gentarball:
-	tar --transform 's,^,$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)/,' \
-		--exclude './debian' --exclude-vcs \
-		-cJf ../$(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.xz .
+	git archive --format=tar upstream-next --prefix=$(SOURCE)-$(UV)/ | \
+		xz --best \
+		> ../$(SOURCE)_$(UV).orig.tar.xz
 
 gencontrol:
 ifeq ($(ONLY_CLIENT), 1)
@@ -57,7 +57,7 @@ endif
 
 override_dh_clean: gencontrol
 	dh_clean
-	rm -f po/*.gmo po/Makefile.hack po/POTFILES.in po/stamp-po
+	rm -f po/*.gmo po/Makefile.hack po/POTFILES.in po/ipa.pot po/stamp-po
 	rm -rf contrib/completion/ipa.bash_completion daemons/ipa-version.h \
 	       install/ui/src/libs/loader.js m4
 	rm -f ipaplatform/override.py ipapython/version.py ipasetup.py
@@ -95,10 +95,11 @@ endif
 	find $(CURDIR)/debian/tmp -name "*.mo" -type f -exec chmod -x "{}" \;
 	# remove files which are useful only for make uninstall
 	find $(CURDIR)/debian/tmp -wholename '*/dist-packages/*/install_files.txt' -exec rm '{}' \;
-	# fix the interpreter
+
+	# we still need to use python2
 	find debian/tmp ! -name '*.pyc' -a ! -name '*.pyo' -a \
 	    -type f -exec grep -qsm1 '^#!.*\bpython' {} \; \
-	    -exec sed -i -e '1 s|^#!.*\bpython[^ ]*|#!/usr/bin/python3|' {} \;
+	    -exec sed -i -e '1 s|^#!.*\bpython[^ ]*|#!/usr/bin/python|' {} \;
 
 override_dh_missing:
 	dh_missing --fail-missing
@@ -121,5 +122,5 @@ override_dh_fixperms:
 	fi
 
 %:
-	dh $@ --with python3
+	dh $@ --with python2
 #		--builddirectory=build