another debian packaging update (fixes #1164)

git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_11_0@8816 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jul 19, 2008 · 3e7692c · 3e7692c
1 parent 7ad7bc3
commit 3e7692c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,11 @@
+qgis (0.11.0-2) stable; urgency=low
+
+  * remove libqgisgrass0.11 package by integrating it into qgis-plugin-grass
+  * move libqgisgrass.so link from libqgis1-dev to qgis-plugin-grass
+  * qgis recommends instead of just suggests the grass and python plugin
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Sat, 19 Jul 2008 11:38:49 +0200
+
 qgis (0.11.0-1) stable; urgency=low
 
   * libqgispython0.11 integrated into python-qgis

diff --git a/debian/control b/debian/control
@@ -17,7 +17,7 @@ Homepage: http://qgis.org/
 Package: qgis
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: qgis-plugin-grass, python-qgis
+Recommends: qgis-plugin-grass, python-qgis
 Description: Geographic Information System (GIS)
  A Geographic Information System (GIS) manages, analyzes, and displays
  databases of geographic information. Quantum GIS (QGIS) supports shapefile
@@ -36,8 +36,8 @@ Description: Quantum GIS - shared core library
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
  .
- This package contains the shared core library that
- provides an interface for plugins.
+ This package contains the shared core library that provides an interface for
+ plugins.
 
 Package: libqgis-gui0.11
 Architecture: any
@@ -59,7 +59,7 @@ Depends: qgis (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
  libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0),
  libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- qt4-designer (>=4.2.0), libqgisgrass0.11, libqgis-gui0.11, libqgis-core0.11
+ qt4-designer (>=4.2.0), libqgis-gui0.11, libqgis-core0.11
 Provides: libqgis-dev
 Conflicts: libqgis-dev, qgis-dev
 Replaces: qgis-dev
@@ -73,19 +73,12 @@ Description: Quantum GIS - development files
 Package: qgis-plugin-grass
 Architecture: any
 Depends: qgis (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.5.0-grass
+Replaces: libqgisgrass0.11
+Conflicts: libqgisgrass0.10
 Description: Plugin for accessing GRASS data from Quantum GIS
  This plugin enables a GRASS data access toolbox in the Quantum GIS geographic
  data viewer.
 
-Package: libqgisgrass0.11
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Quantum GIS - shared grass library
- Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
- and display databases of geographic information.
- .
- This package contains the shared library for the grass plugin.
-
 Package: python-qgis
 Section: python
 Architecture: any

diff --git a/debian/libqgis1-dev.install b/debian/libqgis1-dev.install
@@ -1,4 +1,3 @@
 usr/include/qgis/*
-usr/lib/libqgisgrass.so
 usr/lib/libqgis_gui.so
 usr/lib/libqgis_core.so
diff --git a/debian/libqgisgrass0.11.install b/debian/libqgisgrass0.11.install
diff --git a/debian/qgis-plugin-grass.install b/debian/qgis-plugin-grass.install
@@ -1,3 +1,4 @@
 usr/lib/qgis/libgrassplugin.so
 usr/lib/qgis/libgrassprovider.so
+usr/lib/libqgisgrass.so*
 usr/share/qgis/grass/*