diff -Nru recoll-1.24.1/debian/changelog recoll-1.24.1/debian/changelog --- recoll-1.24.1/debian/changelog 2018-06-28 06:55:32.000000000 +0000 +++ recoll-1.24.1/debian/changelog 2018-06-28 11:56:02.000000000 +0000 @@ -1,8 +1,9 @@ -recoll (1.24.1-1build1) cosmic; urgency=medium +recoll (1.24.1-2) unstable; urgency=medium - * No-change rebuild to build for python3.7. + * debian/rules: + + Fix FTBFS when built with dpkg-buildpackage -A (Closes: #900311) - -- Matthias Klose Thu, 28 Jun 2018 06:55:32 +0000 + -- Kartik Mistry Thu, 28 Jun 2018 17:26:02 +0530 recoll (1.24.1-1) unstable; urgency=low diff -Nru recoll-1.24.1/debian/rules recoll-1.24.1/debian/rules --- recoll-1.24.1/debian/rules 2018-01-16 10:52:29.000000000 +0000 +++ recoll-1.24.1/debian/rules 2018-06-28 11:56:02.000000000 +0000 @@ -53,16 +53,23 @@ chmod +x $(CURDIR)/debian/tmp/usr/share/recoll/examples/rclmon.sh chmod -x $(CURDIR)/debian/tmp/usr/share/recoll/filters/rclexec1.py chmod -x $(CURDIR)/debian/tmp/usr/share/recoll/filters/rclxslt.py + + #Remove .la files find $(CURDIR) -type f -name '*.la' -exec rm -f '{}' \; + (cd python/recoll; python setup.py install \ - --install-layout=deb \ - --prefix=$(CURDIR)/debian/tmp/usr ) + --install-layout=deb \ + --prefix=$(CURDIR)/debian/tmp/usr ) set -e && for i in $(build3vers); do \ - (cd python/recoll; python$$i ./setup.py install \ - --install-layout=deb \ - --prefix=$(CURDIR)/debian/tmp/usr ) ; \ + (cd python/recoll; python$$i ./setup.py install \ + --install-layout=deb \ + --prefix=$(CURDIR)/debian/tmp/usr ) ; \ done + # Remove unneeded files + rm -f $(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages/recoll/*.pyc + rm -rf $(CURDIR)/debian/tmp/usr/lib/python3/dist-packages/recoll/__pycache__/ + binary-arch: build install dh_testdir dh_testroot @@ -70,14 +77,11 @@ dh_installdocs README dh_installman dh_install --sourcedir=debian/tmp - dh_makeshlibs - dh_python2 -p python-recoll - dh_python3 -p python3-recoll dh_link dh_strip --no-automatic-dbgsym dh_compress dh_fixperms - dh_lintian + dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol @@ -85,6 +89,21 @@ dh_builddeb binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs README + dh_install --sourcedir=debian/tmp + dh_python2 -p python-recoll + dh_python3 -p python3-recoll + dh_link + dh_compress + dh_fixperms + dh_lintian + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb binary: binary-indep binary-arch .PHONY: build build-arch build-indep clean binary-indep binary-arch binary install