Skip to content
Permalink
Browse files

debian packaging update (merge and squash PR#1725)

  • Loading branch information
jef-n committed Dec 9, 2014
1 parent b3953b8 commit 6557cb84c8505fe4d463baf6c29948e4eef2ee2f
Showing with 18 additions and 11 deletions.
  1. +2 −2 debian/changelog
  2. +16 −9 debian/control.in
@@ -3,10 +3,10 @@ qgis (2.7.0) UNRELEASED; urgency=medium
* New development version 2.7 after branch of 2.6
* run tests in en_US.UTF-8 locale
* add build dependency to python-qscintilla2 for tests
* merge some downstream debian changes
* rename libqgis-customwidgets{QGIS_ABI} to libqgis-customwidgets
* merge some downstream debian changes

-- Jürgen E. Fischer <jef@norbit.de> Sun, 30 Nov 2014 16:49:54 +0100
-- Jürgen E. Fischer <jef@norbit.de> Tue, 09 Dec 2014 09:37:11 +0100

qgis (2.6.0) unstable; urgency=medium

@@ -177,9 +177,18 @@ Depends:
qt4-designer,
${shlibs:Depends},
${misc:Depends}
Replaces: libqgis-customwidgets2.6.0, libqgis-customwidgets2.6.1
Conflicts: libqgis-customwidgets2.6.0, libqgis-customwidgets2.6.1
Provides: libqgis-customwidgets2.6.0, libqgis-customwidgets2.6.1
Replaces:
libqgis-customwidgets2.4.0,
libqgis-customwidgets2.6.0,
libqgis-customwidgets2.6.1
Conflicts:
libqgis-customwidgets2.4.0,
libqgis-customwidgets2.6.0,
libqgis-customwidgets2.6.1
Provides:
libqgis-customwidgets2.4.0,
libqgis-customwidgets2.6.0,
libqgis-customwidgets2.6.1
Description: QGIS custom widgets for Qt Designer
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
@@ -328,9 +337,7 @@ Depends:
python-gdal,
python-matplotlib,
libqgis-customwidgets,
${python:Depends},
${misc:Depends},
${sip:Depends}
${misc:Depends}
XB-Python-Version: ${python:Versions}
Description: Python bindings to QGIS - architecture-independent files
QGIS is a Geographic Information System (GIS) which manages, analyzes and
@@ -368,13 +375,13 @@ Description: collection of data providers to QGIS - architecture-independent fil

Package: qgis-server
Architecture: any
Provides: qgis-mapserver
Replaces: qgis-mapserver
Conflicts: qgis-mapserver
Depends:
qgis-providers (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Conflicts: qgis-mapserver
Provides: qgis-mapserver
Replaces: qgis-mapserver
Description: QGIS server providing various OGC services
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.

0 comments on commit 6557cb8

Please sign in to comment.
You can’t perform that action at this time.