debian packaging updates

qgis · Feb 25, 2015 · f5b7834 · f5b7834
1 parent 6eb2159
commit f5b7834
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/debian/control b/debian/control
@@ -271,7 +271,7 @@ Description: QGIS server providing various OGC services
  .
  This package contains the QGIS server.
 
-Package: libqgis-customwidgets{QGIS_ABI}
+Package: libqgis-customwidgets
 Architecture: any
 Depends:
  qt4-designer,

diff --git a/debian/control.in b/debian/control.in
@@ -9,7 +9,7 @@ Build-Depends:
 #sid jessie wheezy saucy sid-oracle trusty utopic vivid# debhelper (>= 9),
 #precise# debhelper (>= 7),
  flex,
- grass-dev,
+ grass-dev (<< 7),
  libexpat1-dev,
  libfcgi-dev,
 #sid jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
@@ -32,7 +32,7 @@ Build-Depends:
  pyqt4-dev-tools,
  python-qscintilla2,
 #precise saucy wheezy# python,
-#precise saucy# python-central (>=0.5),
+#precise saucy# python-central (>= 0.5),
 #saucy wheezy# python-dev,
 #saucy# libpython2.7-dev,
 #sid jessie sid-oracle trusty utopic vivid# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
@@ -210,7 +210,7 @@ Package: libqgis-dev
 Architecture: any
 Section: libdevel
 Depends:
- grass-dev,
+ grass-dev (<< 7),
  libexpat1-dev,
 #sid jessie sid-oracle trusty utopic vivid# libgdal-dev (>= 1.10.1-0~),
 #precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
@@ -226,10 +226,10 @@ Depends:
  libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
  libqgisgrass{QGIS_ABI} (= ${binary:Version}),
  libqgispython{QGIS_ABI} (= ${binary:Version}),
- libqt4-dev (>=4.6.0),
+ libqt4-dev (>= 4.7.0),
  libsqlite3-dev,
- python-qt4 (>=4.1.0),
- python-qt4-dev (>=4.1.0),
+ python-qt4 (>= 4.1.0),
+ python-qt4-dev (>= 4.1.0),
  qt4-designer,
  ${misc:Depends}
 Recommends: libqgis-customwidgets
@@ -250,7 +250,8 @@ Depends:
  qgis-plugin-grass-common (= ${source:Version}),
  ${shlibs:Depends},
  ${misc:Depends},
- grass{GRASS_ABI}
+#!precise# grass-core (<< 7)
+#precise# grass (<< 7)
 Description: GRASS plugin for QGIS
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.

diff --git a/debian/rules b/debian/rules
@@ -39,14 +39,13 @@ QGIS_MAJOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]*\)")/\1/p
 QGIS_MINOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MINOR "\([0-9]*\)")/\1/p' CMakeLists.txt)
 QGIS_PATCH=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")/\1/p' CMakeLists.txt)
 QGIS_ABI=$(QGIS_MAJOR).$(QGIS_MINOR).$(QGIS_PATCH)
-GRASS_ABI=$(subst .,,$(shell pkg-config --modversion grass|sed -e "s/\.//g" -e "s/RC/-/"))
 GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
 
 CMAKE_OPTS := \
 	-DBUILDNAME=$(DEB_BUILD_NAME) \
 	-DCMAKE_VERBOSE_MAKEFILE=1 \
 	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DGRASS_PREFIX=/usr/lib/grass64 \
+	-DGRASS_PREFIX=/usr/lib/$(GRASS) \
 	-DBINDINGS_GLOBAL_INSTALL=TRUE \
 	-DPEDANTIC=TRUE \
 	-DWITH_QSPATIALITE=TRUE \
@@ -137,7 +136,7 @@ $(2): $(1)
 		-e "s#\{QT_PLUGIN_DIR\}#$(QT_PLUGIN_DIR)#g" \
 		-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
 		-e "s/\{GRASS\}/$(GRASS)/g" \
-		-e "s/\{GRASS_ABI\}/$(GRASS_ABI)/g" $$^ >$$@
+		$$^ >$$@
 
 templates:: $(2)