This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository qgis.
commit be5293e67c6de2d85e46ceea4187ec049999e998 Merge: 35d8827 0df9b23 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Dec 21 02:07:52 2015 +0100 Merge tag 'upstream/2.8.5+dfsg' Upstream version 2.8.5+dfsg Conflicts: debian/changelog debian/qgis-provider-grass.lintian-overrides debian/rules CMakeLists.txt | 2 +- ChangeLog | 57 +++++++++++++++++++++++++++++ debian/changelog | 6 +++ debian/control.in | 13 ++++--- debian/rules | 63 ++++++++++++++++++++++++++------ python/core/qgsfeature.sip | 2 +- src/app/legend/qgsapplegendinterface.cpp | 26 +++++++++++-- src/core/dxf/qgsdxfexport.cpp | 2 +- src/server/qgshttprequesthandler.cpp | 1 + src/server/qgsserverprojectparser.cpp | 42 +++++++++++++++------ src/server/qgswmsconfigparser.cpp | 2 +- 11 files changed, 178 insertions(+), 38 deletions(-) diff --cc debian/changelog index 35b08d7,e38df26..67c582b --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,17 +1,26 @@@ + qgis (2.8.5) UNRELEASED; urgency=medium + + * Release of 2.8.5 + + -- Jürgen E. Fischer <j...@norbit.de> Fri, 18 Dec 2015 14:18:20 +0100 + -qgis (2.8.4) unstable; urgency=medium +qgis (2.8.4+dfsg-1) unstable; urgency=medium - * Release of 2.8.4 + * Update symbols for other architectures. - -- Jürgen E. Fischer <j...@norbit.de> Fri, 18 Dec 2015 14:18:20 +0100 + -- Bas Couwenberg <sebas...@debian.org> Tue, 08 Dec 2015 18:01:50 +0100 + +qgis (2.8.4+dfsg-1~exp2) unstable; urgency=medium + + * Update symbols for other architectures. + * Move from experimental to unstable. -qgis (2.8.3-1) unstable; urgency=medium + -- Bas Couwenberg <sebas...@debian.org> Mon, 07 Dec 2015 14:23:35 +0100 +qgis (2.8.4+dfsg-1~exp1) experimental; urgency=medium + + [ Jürgen E. Fischer ] + * Release of 2.8.4 * split grass provider off into a separate package. * disable grass plugin on sid (because of GRASS7) * add ubuntu wily diff --cc debian/rules index ed2fa48,289742a..fe2e5dc --- a/debian/rules +++ b/debian/rules @@@ -142,29 -136,65 +139,71 @@@ ifneq (,$(findstring profile,$(DEB_BUIL LDFLAGS += -pg endif - %: - dh $@ --with python2,pkgkde_symbolshelper --parallel + + # multi distribution support: + # - remove lines with applicable excludes + # - remove prefixes with applicable includes + # - remove prefixes with not applicable excludes + # - remove remaining comments + + CONTROL_EXPRESSIONS = $(DISTRIBUTION) grass$(GRASSVER) + + ifneq (,$(WITH_ORACLE)) + CONTROL_EXPRESSIONS += oracle + endif + + define gentemplate + $(2): $(1) + sed -r \ + -e '/#(.+ |)!($(subst $(eval) ,|,$(CONTROL_EXPRESSIONS)))( .+|)#/d' \ + -e 's/#([^#]+ |)($(subst $(eval) ,|,$(CONTROL_EXPRESSIONS)))( [^#]+|)#//g' \ + -e 's/#([^#]+ |)![^#]+( [^#]*|)#//g' \ + -e '/^#/d' \ + -e "s/\{DEB_BUILD_GNU_TYPE\}/$(DEB_BUILD_GNU_TYPE)/g" \ + -e "s#\{QT_PLUGIN_DIR\}#$(QT_PLUGIN_DIR)#g" \ + -e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \ + -e "s/\{GRASS\}/$(GRASS)/g" \ + -e "s/\{GRASSVER\}/$(GRASSVER)/g" \ + $$^ >$$@ + + templates:: $(2) + + templateclean:: + rm -f $(2) + endef + + $(foreach t,$(wildcard debian/*.in),$(eval $(call gentemplate,$(t),$(basename $(t))))) + $(foreach t,$(wildcard debian/*{QGIS_ABI}*),$(eval $(call gentemplate,$(t),$(subst {QGIS_ABI},$(QGIS_ABI),$(t))))) + + cleantemplates: + $(MAKE) -f debian/rules templateclean + $(MAKE) -f debian/rules debian/control debian/compat + + binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep: + dh $@ --with python2 --parallel --builddirectory=$(QGIS_BUILDDIR) -override_dh_clean: cleantemplates +override_dh_clean: dh_clean # automatically generated files -$(RM) $(CURDIR)/src/core/qgscontexthelp_texts.cpp -$(RM) $(CURDIR)/src/core/qgsexpression_texts.cpp - -$(RM) -r build/ + -$(RM) -r $(CURDIR)/$(QGIS_BUILDDIR)/ -override_dh_auto_configure: templates +override_dh_auto_configure: dh_auto_configure -- $(CMAKE_OPTS) +override_dh_auto_build-arch: + dh_auto_build --arch + +override_dh_auto_build-indep: + cd obj-* && doxygen doc/Doxyfile ; cd - + + override_dh_auto_test: test-stamp + + test-stamp: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - override_dh_auto_test: # Code to run the package test suite - and ignore the outcome for now mkdir -p debian/tmp/locale/ localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel