Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
debian packaging update
git-svn-id: http://svn.osgeo.org/qgis/trunk@13655 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Jun 5, 2010
1 parent ca08029 commit c51974c
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 8 deletions.
3 changes: 2 additions & 1 deletion debian/changelog
Expand Up @@ -12,8 +12,9 @@ qgis (1.5.0) UNRELEASED; urgency=low
* exclude python scripts from grass plugin on lenny
* add missing dependency to python-sip(4) to python-qgis
* follow sip4 => sip transition
* add gdal-bin and python-gdal dependency for GdalTools

-- Jürgen E. Fischer <jef@norbit.de> Wed, 02 Jun 2010 12:46:06 +0200
-- Jürgen E. Fischer <jef@norbit.de> Sat, 05 Jun 2010 04:26:22 +0200

qgis (1.4.0) UNRELEASED; urgency=low

Expand Down
2 changes: 1 addition & 1 deletion debian/control.hardy
Expand Up @@ -103,7 +103,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: python-qgis (>= ${source:Version})
Depends: gdal-bin, python-gdal
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Expand Down
2 changes: 1 addition & 1 deletion debian/control.intrepid
Expand Up @@ -103,7 +103,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: python-qgis (>= ${source:Version})
Depends: gdal-bin, python-gdal
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Expand Down
2 changes: 1 addition & 1 deletion debian/control.jaunty
Expand Up @@ -103,7 +103,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: python-qgis (>= ${source:Version})
Depends: gdal-bin, python-gdal
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Expand Down
2 changes: 1 addition & 1 deletion debian/control.karmic
Expand Up @@ -103,7 +103,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: python-qgis (>= ${source:Version})
Depends: gdal-bin, python-gdal
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Expand Down
2 changes: 1 addition & 1 deletion debian/control.lenny
Expand Up @@ -103,7 +103,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: python-qgis (>= ${source:Version})
Depends: gdal-bin, python-gdal
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Expand Down
1 change: 1 addition & 0 deletions debian/control.lucid
Expand Up @@ -103,6 +103,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
Expand Down
1 change: 1 addition & 0 deletions debian/control.sid
Expand Up @@ -103,6 +103,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
Expand Down
1 change: 1 addition & 0 deletions debian/libqgis{QGIS_ABI}.lintian-overrides
@@ -1,2 +1,3 @@
libqgis{QGIS_ABI}: shlib-calls-exit
libqgis{QGIS_ABI}: package-name-doesnt-match-sonames
libqgis{QGIS_ABI}: no-symbols-control-file
1 change: 1 addition & 0 deletions debian/qgis-plugin-grass.lintian-overrides
@@ -1,2 +1,3 @@
qgis-plugin-grass: binary-without-manpage
qgis-plugin-grass: package-name-doesnt-match-sonames
qgis-plugin-grass: no-symbols-control-file
4 changes: 2 additions & 2 deletions debian/rules
Expand Up @@ -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),"lenny hardy intrepid jaunty karmic lucid"))
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny squeeze hardy intrepid jaunty karmic lucid"))
DISTRIBUTION := sid
endif

Expand All @@ -30,7 +30,7 @@ CMAKE_OPTS := \
-D PEDANTIC=TRUE \
-D WITH_SPATIALITE=TRUE

ifeq (,$(findstring $(DISTRIBUTION),"sid"))
ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid sid"))
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
else
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=FALSE
Expand Down

0 comments on commit c51974c

Please sign in to comment.