debian packaging update: use libspatialindex on more distributions

qgis · Oct 8, 2011 · cf5e790 · cf5e790
1 parent 0782a34
commit cf5e790
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -9,9 +9,9 @@ qgis (1.8.0) UNRELEASED; urgency=low
   * update watch
   * drop abi postfix from sqlanywhere plugin
   * include network analysis library
-  * build unstable and squeeze package with libspatialindex.
+  * build package with libspatialindex where available
 
- -- Jürgen E. Fischer <jef@norbit.de>  Sat, 08 Oct 2011 11:40:39 +0000
+ -- Jürgen E. Fischer <jef@norbit.de>  Sat, 08 Oct 2011 20:03:51 +0000
 
 qgis (1.7.0) UNRELEASED; urgency=low
 

diff --git a/debian/control.lucid b/debian/control.lucid
@@ -18,6 +18,7 @@ Build-Depends:
  libqt4-dev (>=4.4.0),
  libqwt5-qt4-dev,
  libspatialite-dev,
+ libspatialindex-dev,
  libsqlite3-dev,
  pkg-config,
  pyqt4-dev-tools,

diff --git a/debian/control.maverick b/debian/control.maverick
@@ -19,6 +19,7 @@ Build-Depends:
  libqtwebkit-dev,
  libqwt5-qt4-dev,
  libspatialite-dev,
+ libspatialindex-dev,
  libsqlite3-dev,
  pkg-config,
  pyqt4-dev-tools,

diff --git a/debian/control.natty b/debian/control.natty
@@ -19,6 +19,7 @@ Build-Depends:
  libqtwebkit-dev,
  libqwt5-qt4-dev,
  libspatialite-dev,
+ libspatialindex-dev,
  libsqlite3-dev,
  pkg-config,
  pyqt4-dev-tools,

diff --git a/debian/control.oneiric b/debian/control.oneiric
@@ -19,6 +19,7 @@ Build-Depends:
  libqtwebkit-dev,
  libqwt5-qt4-dev,
  libspatialite-dev,
+ libspatialindex-dev,
  libsqlite3-dev,
  pkg-config,
  pyqt4-dev-tools,

diff --git a/debian/rules b/debian/rules
@@ -46,7 +46,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid"))
 	CMAKE_OPTS += -D WITH_GLOBE=TRUE
 endif
 
-ifneq (,$(findstring $(DISTRIBUTION),"squeeze sid"))
+ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric sid"))
 	CMAKE_OPTS += -D WITH_INTERNAL_SPATIALINDEX=FALSE
 endif