[SCM] qgis branch, master, updated. a2ee769957385f4e084c5e8b6ba178a8c877d1db

Juergen E. Fischer jef at norbit.de
Tue Mar 20 13:43:17 UTC 2012


The following commit has been merged in the master branch:
commit f700c01e33ea030bb56e49e6a2d41f7fc6710db6
Author: Juergen E. Fischer <jef at norbit.de>
Date:   Fri Mar 9 13:30:55 2012 +0100

    debian packaging update

diff --git a/debian/control.precise b/debian/control.precise
index 1d69bd7..a39647a 100644
--- a/debian/control.precise
+++ b/debian/control.precise
@@ -16,11 +16,12 @@ Build-Depends:
  libpq-dev,
  libproj-dev,
  libqt4-dev (>=4.4.0),
+ libqt4-opengl-dev,
  libqtwebkit-dev,
  libqwt5-qt4-dev,
  libspatialite-dev,
- libspatialindex-dev,
  libsqlite3-dev,
+ libspatialindex-dev,
  pkg-config,
  pyqt4-dev-tools,
  python,
diff --git a/debian/rules b/debian/rules
index 4b8cfd2..8c22725 100755
--- a/debian/rules
+++ b/debian/rules
@@ -165,7 +165,7 @@ binary-arch: build install
 	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
 	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
 	
-ifneq (,$(findstring $(DISTRIBUTION),"sid"))
+ifneq (,$(findstring $(DISTRIBUTION),"wheezy sid"))
 	dh_python2 --no-guessing-versions
 else
 	dh_pycentral

-- 
The Quantum GIS in Debian project



More information about the Pkg-grass-devel mailing list