The following commit has been merged in the master branch:
commit 2e6bf626beb64a6ff4d344505507226bd7db13db
Author: Juergen E. Fischer <j...@norbit.de>
Date: Tue Mar 6 20:38:31 2012 +0100
debian packaging update: add wheezy and use internal spatialite where
libspatialite3 not available
diff --git a/debian/changelog b/debian/changelog
index d474299..a596437 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +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
+ * add support for Debian wheezy and Ubuntu precise
+ * build package with internal libspatialite where libspatialite not available
- -- Jürgen E. Fischer <j...@norbit.de> Mon, 05 Mar 2012 20:21:48 +0100
+ -- Jürgen E. Fischer <j...@norbit.de> Tue, 06 Mar 2012 20:33:08 +0100
qgis (1.8.0) UNRELEASED; urgency=low
diff --git a/debian/control.sid b/debian/control.wheezy
similarity index 100%
copy from debian/control.sid
copy to debian/control.wheezy
diff --git a/debian/rules b/debian/rules
index 500f509..5b461d4 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 precise"))
+ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"squeeze wheezy hardy
intrepid jaunty karmic lucid maverick natty oneiric precise"))
DISTRIBUTION := sid
endif
@@ -32,10 +32,10 @@ CMAKE_OPTS := \
-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
-D WITH_APIDOC=TRUE
-ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric
precise sid"))
- CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
-else
+ifeq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"hardy intrepid jaunty
karmic lucid maverick natty oneiric lenny squeeze"))
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=FALSE
+else
+ CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
endif
ifneq (,$(findstring $(DISTRIBUTION),"sid"))
--
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
