The following commit has been merged in the master branch: commit dde9ed7373731bc4f3e953a8a44fde3611640e0b Author: Juergen E. Fischer <j...@norbit.de> Date: Mon Mar 5 20:22:46 2012 +0100
debian packaging update diff --git a/debian/changelog b/debian/changelog index 1a4c468..d474299 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,10 @@ qgis (1.9.90) UNRELEASED; urgency=low * drop extra include path for QtWebkit on oneiric and natty * add translations for desktop link * add browser desktop entry + * add support for Ubuntu precise + * build package with libspatialite where available - -- Jürgen E. Fischer <j...@norbit.de> Thu, 23 Feb 2012 09:36:48 +0100 + -- Jürgen E. Fischer <j...@norbit.de> Mon, 05 Mar 2012 20:21:48 +0100 qgis (1.8.0) UNRELEASED; urgency=low diff --git a/debian/compat.lucid b/debian/compat.precise similarity index 100% copy from debian/compat.lucid copy to debian/compat.precise diff --git a/debian/control.natty b/debian/control.precise similarity index 100% copy from debian/control.natty copy to debian/control.precise diff --git a/debian/rules b/debian/rules index 74ce5ef..500f509 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p") -ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"squeeze hardy intrepid jaunty karmic lucid maverick natty oneiric")) +ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"squeeze hardy intrepid jaunty karmic lucid maverick natty oneiric precise")) DISTRIBUTION := sid endif @@ -32,17 +32,17 @@ CMAKE_OPTS := \ -D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \ -D WITH_APIDOC=TRUE -#ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric sid")) +ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric precise sid")) CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE -#else -# CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=FALSE -#endif +else + CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=FALSE +endif ifneq (,$(findstring $(DISTRIBUTION),"sid")) CMAKE_OPTS += -D WITH_GLOBE=TRUE endif -ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric sid")) +ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric precise sid")) CMAKE_OPTS += -D WITH_INTERNAL_SPATIALINDEX=FALSE endif -- The Quantum GIS in Debian project _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel