Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
debian packaging fix
  • Loading branch information
jef-n committed Nov 30, 2014
1 parent 4e78b8b commit a2b7825
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 6 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
@@ -1,3 +1,9 @@
qgis (2.6.1.1) unstable; urgency=medium

* rename libqgis-customwidgets{QGIS_ABI} to libqgis-customwidgets

-- Jürgen E. Fischer <jef@norbit.de> Sun, 30 Nov 2014 15:25:38 +0100

qgis (2.6.1) unstable; urgency=medium

* Release of 2.6.1
Expand Down
13 changes: 8 additions & 5 deletions debian/control.in
Expand Up @@ -111,8 +111,7 @@ Section: libs
Depends:
${shlibs:Depends},
${misc:Depends}
Replaces:
libqgis{QGIS_ABI}
Replaces: libqgis{QGIS_ABI}
Description: QGIS - shared gui library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
Expand Down Expand Up @@ -197,7 +196,7 @@ Depends:
python-qt4-dev (>=4.1.0),
qt4-designer,
${misc:Depends}
Recommends: libqgis-customwidgets{QGIS_ABI}
Recommends: libqgis-customwidgets
Provides: qgis-dev
Replaces:
libqgis1-dev
Expand Down Expand Up @@ -276,7 +275,7 @@ Depends:
gdal-bin,
python-gdal,
python-matplotlib,
libqgis-customwidgets{QGIS_ABI},
libqgis-customwidgets,
${python:Depends},
${misc:Depends},
${sip:Depends}
Expand Down Expand Up @@ -319,6 +318,7 @@ Package: qgis-server
Architecture: any
Provides: qgis-mapserver
Replaces: qgis-mapserver
Conflicts: qgis-mapserver
Depends:
qgis-providers (= ${binary:Version}),
${shlibs:Depends},
Expand All @@ -329,12 +329,15 @@ 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,
${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
Description: QGIS custom widgets for Qt Designer
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions debian/libqgis-customwidgets.lintian-overrides
@@ -0,0 +1 @@
libqgis-customwidgets: no-symbols-control-file
1 change: 0 additions & 1 deletion debian/libqgis-customwidgets{QGIS_ABI}.lintian-overrides

This file was deleted.

0 comments on commit a2b7825

Please sign in to comment.