This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis.
commit ca7a3292f8103b4d3f060a90a00147bab76488a1 Author: Bas Couwenberg <[email protected]> Date: Thu Mar 10 20:50:09 2016 +0100 Fix build with `dpkg-buildpackage -A`. Various files in architecture independent packages are built in the -arch targets. --- debian/changelog | 3 +++ debian/rules | 19 ++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1b69977..bda2060 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ qgis (2.14.0+dfsg0-3) UNRELEASED; urgency=medium * Recreate symbols files, old ones failed to patch. + * Fix build with `dpkg-buildpackage -A`. Various files in architecture + independent packages are built in the -arch target. + (closes: #817811) -- Bas Couwenberg <[email protected]> Thu, 10 Mar 2016 17:37:19 +0100 diff --git a/debian/rules b/debian/rules index d6651a6..69fb390 100755 --- a/debian/rules +++ b/debian/rules @@ -175,7 +175,7 @@ endif dh $@ --with pkgkde_symbolshelper,python2 --parallel --builddirectory=$(QGIS_BUILDDIR) override_dh_clean: - dh_clean qgis.bin.1 qbrowser.bin.1 + dh_clean qgis.bin.1 qbrowser.bin.1 build-arch-stamp install-arch-stamp # automatically generated files -$(RM) $(CURDIR)/src/core/qgscontexthelp_texts.cpp @@ -186,10 +186,12 @@ override_dh_clean: override_dh_auto_configure: dh_auto_configure -- $(CMAKE_OPTS) -override_dh_auto_build-arch: - dh_auto_build --arch +override_dh_auto_build-arch: build-arch-stamp +build-arch-stamp: + dh_auto_build + touch $@ -override_dh_auto_build-indep: +override_dh_auto_build-indep: build-arch-stamp cd $(QGIS_BUILDDIR) && doxygen doc/Doxyfile ; cd - override_dh_auto_test: @@ -206,8 +208,9 @@ else @echo Skipping tests. endif -override_dh_auto_install-arch: - dh_auto_install --arch +override_dh_auto_install-arch: install-arch-stamp +install-arch-stamp: + dh_auto_install # remove unwanted files $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox @@ -279,7 +282,9 @@ override_dh_auto_install-arch: install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qgis install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qbrowser -override_dh_auto_install-indep: + touch $@ + +override_dh_auto_install-indep: install-arch-stamp install -o root -g root -m 755 -d $(CURDIR)/debian/tmp/usr/share/qgis/doc mv -v $(QGIS_BUILDDIR)/doc/api/html $(CURDIR)/debian/tmp/usr/share/qgis/doc/api -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
