debian packaging update (following up r13792)

jef · jef · commit 6e6a7f1720b6 · 2010-06-23T16:36:15.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13793 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/AUTHORS b/AUTHORS
@@ -24,19 +24,19 @@ Masaru Hoshi	<hoshi at users.sourceforge.net>
 Peter Brewer	<p.w.brewer at rdg dot ac dot uk>
 Radim Blazek	<blazek at itc.it>
 Tom Elwertowski	<telwertowski at users.sourceforge.net>
-Godofredo Contreras	      <frdcn athotmail.com>
+Godofredo Contreras	      <frdcn at hotmail.com>
 Martin Dobias	<wonder.sk at gmail.com>
 Brendan Morley	<morb at beagle.com.au>
 Magnus Homann	<magnus at homann.se>
-Jürgen E. Fischer	<jef@norbit.de>
+Jürgen E. Fischer	<jef at norbit.de>
 Tisham Dhar	<tisham at apogee.com.au>
-Leonardo Lami	<lami@faunalia.it>
-Marco Pasetti	<marco.pasetti@alice.it>
+Leonardo Lami	<lami at faunalia.it>
+Marco Pasetti	<marco.pasetti at alice.it>
 Mateusz Loskot	<mateusz at loskot dot net>
 Peter Ersts	<ersts at amnh.org>
 Borys Jurgiel	<borysiasty at aster.pl>
 Paolo Cavallini	<cavallini at faunalia.it>
 Carson J. Q. Farmer	<carson dot farmer at gmail dot com>
-Lorenzo Masini	<lorenxo86@gmail.com>
-Werner Macho	<werner.macho@gmail.com>
-Giuseppe Sucameli	<brush.tyler@gmail.com>
+Lorenzo Masini	<lorenxo86 at gmail.com>
+Werner Macho	<werner.macho at gmail.com>
+Giuseppe Sucameli	<brush.tyler at gmail.com>
diff --git a/debian/changelog b/debian/changelog
@@ -13,8 +13,9 @@ qgis (1.5.0) UNRELEASED; urgency=low
   * add missing dependency to python-sip(4) to python-qgis
   * follow sip4 => sip transition
   * add gdal-bin and python-gdal dependency for GdalTools
+  * trim build dependencies
 
- -- Jürgen E. Fischer <jef@norbit.de>  Sat, 05 Jun 2010 04:26:22 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Wed, 23 Jun 2010 18:34:25 +0200
 
 qgis (1.4.0) UNRELEASED; urgency=low
 
diff --git a/debian/control b/debian/control
@@ -5,10 +5,9 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
 Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
  libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj (<< 4.7.0) | libproj-dev (>= 4.7.0), libexpat1-dev, 
  flex, bison, python-dev, cmake (>= 2.6), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
- sharutils, sip4 (>= 4.5), libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
+ sip4 (>= 4.5), libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
  libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
- libsm-dev, pyqt4-dev-tools, libqwt5-qt4-dev
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current
@@ -69,7 +68,7 @@ Description: Quantum GIS - development files
 
 Package: qgis-plugin-grass
 Architecture: any
-Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass640-5+41380
+Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass640-5+41380
 Description: GRASS plugin for Quantum GIS
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
diff --git a/debian/control.hardy b/debian/control.hardy
@@ -5,10 +5,9 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
 Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
  libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, 
  flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
- sharutils, sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
+ sip4 (>= 4.5), 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),
- python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
- libsm-dev, pyqt4-dev-tools
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
diff --git a/debian/control.intrepid b/debian/control.intrepid
@@ -5,10 +5,9 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
 Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
  libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, 
  flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
- sharutils, sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
+ sip4 (>= 4.5), 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),
- python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
- libsm-dev, pyqt4-dev-tools, libqwt5-qt4-dev
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
diff --git a/debian/control.jaunty b/debian/control.jaunty
@@ -5,10 +5,9 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
 Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
  libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, 
  flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
- sharutils, sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
+ sip4 (>= 4.5), 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),
- python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
- libsm-dev, pyqt4-dev-tools, libqwt5-qt4-dev
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
diff --git a/debian/control.karmic b/debian/control.karmic
@@ -5,10 +5,9 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
 Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
  libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, 
  flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
- sharutils, sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
+ sip4 (>= 4.5), 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),
- python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
- libsm-dev, pyqt4-dev-tools, libqwt5-qt4-dev
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
diff --git a/debian/control.lenny b/debian/control.lenny
@@ -5,10 +5,9 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
 Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
  libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, 
  flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
- sharutils, sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
+ sip4 (>= 4.5), 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),
- python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
- libsm-dev, pyqt4-dev-tools, libqwt5-qt4-dev
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
diff --git a/debian/control.lucid b/debian/control.lucid
@@ -5,10 +5,9 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
 Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev, 
  libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, 
  flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0), python-central (>=0.5), python,
- sharutils, libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
+ libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
  libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
- libsm-dev, pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev
+ python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current
diff --git a/debian/control.sid b/debian/control.sid
@@ -5,10 +5,9 @@ Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
 Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev, 
  libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, 
  flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0), python-central (>=0.5), python,
- sharutils, libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
+ libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
  libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
- python-sip-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
- libsm-dev, pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev
+ python-sip-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libspatialite-dev
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current
diff --git a/debian/copyright b/debian/copyright
@@ -1,4 +1,4 @@
-This package was debianized by Steve Halasz <debian@adkgis.org> on
+This package was debianized by Steve Halasz <debian at adkgis.org> on
 Wed, 31 Dec 2003 10:07:40 -0500.
 
 It was downloaded from:
@@ -7,36 +7,37 @@ It was downloaded from:
 The upstream contributors are listed in the AUTHORS file and here
 reported:
 
-	Gary E.Sherman	<sherman at mrcc dot com>
-	Steve Halasz	<stevehalasz at users.sourceforge.net>
+	Gary E.Sherman		<sherman at mrcc dot com>
+	Steve Halasz		<stevehalasz at users.sourceforge.net>
 	Marco Hugentobler	<mhugent at users.sourceforge.net>
-	Tim Sutton	<tim at linfiniti.com>
-	Denis Antipov	<rawbytes at users.sourceforge.net>
-	Mark Coletti	<mcoletti at users.sourceforge.net>
-	Lars Luthman	<larsl at users.sourceforge.net>
-	Jens Oberender	<j.obi at troja.net>
+	Tim Sutton		<tim at linfiniti.com>
+	Denis Antipov		<rawbytes at users.sourceforge.net>
+	Mark Coletti		<mcoletti at users.sourceforge.net>
+	Lars Luthman		<larsl at users.sourceforge.net>
+	Jens Oberender		<j.obi at troja.net>
 	Christoph Spoerri	<spoerri at users.sourceforge.net>
-	Carl Anderson	<>
-	Gavin Macaulay	<g_j_m at users.sourceforge.net>
-	Masaru Hoshi	<hoshi at users.sourceforge.net>
-	Peter Brewer	<p.w.brewer at rdg dot ac dot uk>
-	Radim Blazek	<blazek at itc.it>
-	Tom Elwertowski	<telwertowski at users.sourceforge.net>
-	Godofredo Contreras	      <frdcn athotmail.com>
-	Martin Dobias	<wonder.sk at gmail.com>
-	Brendan Morley	<morb at beagle.com.au>
-	Magnus Homann	<magnus at homann.se>
-	Jürgen E. Fischer	<jef@norbit.de>
-	Tisham Dhar	<tisham at apogee.com.au>
-	Leonardo Lami	<lami@faunalia.it>
-	Marco Pasetti	<marco.pasetti@alice.it>
-	Mateusz Loskot	<mateusz at loskot dot net>
-	Peter Ersts	<ersts at amnh.org>
-	Borys Jurgiel	<borysiasty at aster.pl>
-	Paolo Cavallini	<cavallini at faunalia.it>
+	Carl Anderson		<>
+	Gavin Macaulay		<g_j_m at users.sourceforge.net>
+	Masaru Hoshi		<hoshi at users.sourceforge.net>
+	Peter Brewer		<p.w.brewer at rdg dot ac dot uk>
+	Radim Blazek		<blazek at itc.it>
+	Tom Elwertowski		<telwertowski at users.sourceforge.net>
+	Godofredo Contreras	<frdcn at hotmail.com>
+	Martin Dobias		<wonder.sk at gmail.com>
+	Brendan Morley		<morb at beagle.com.au>
+	Magnus Homann		<magnus at homann.se>
+	Jürgen E. Fischer	<jef at norbit.de>
+	Tisham Dhar		<tisham at apogee.com.au>
+	Leonardo Lami		<lami at faunalia.it>
+	Marco Pasetti		<marco.pasetti at alice.it>
+	Mateusz Loskot		<mateusz at loskot dot net>
+	Peter Ersts		<ersts at amnh.org>
+	Borys Jurgiel		<borysiasty at aster.pl>
+	Paolo Cavallini		<cavallini at faunalia.it>
 	Carson J. Q. Farmer	<carson dot farmer at gmail dot com>
-	Lorenzo Masini	<lorenxo86@gmail.com>
-	Werner Macho	<werner.macho@gmail.com>
+	Lorenzo Masini		<lorenxo86 at gmail.com>
+	Werner Macho		<werner.macho at gmail.com>
+	Giuseppe Sucameli	<brush.tyler at gmail.com>
 
 Copyright:
 
@@ -53,4 +54,4 @@ Copyright:
   GNU General Public License for more details.
                                                                                 
   On Debian systems, the complete text of the GNU General Public
-  License can be found in the /usr/share/common-licenses/GPL file.
+  License can be found in the /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/qgis-plugin-grass.install.in b/debian/qgis-plugin-grass.install.in
@@ -1,7 +1,7 @@
-usr/share/qgis/grass/modules/qgis.d.rast
-usr/share/qgis/grass/modules/qgis.g.info
-usr/share/qgis/grass/bin/qgis.g.browser
-usr/lib/qgis/libgrassplugin.so
-usr/lib/qgis/libgrassprovider.so
-usr/lib/qgis/libgrassrasterprovider.so
+usr/lib/qgis/grass/modules/qgis.d.rast
+usr/lib/qgis/grass/modules/qgis.g.info
+usr/lib/qgis/grass/bin/qgis.g.browser
+usr/lib/qgis/plugins/libgrassplugin.so
+usr/lib/qgis/plugins/libgrassprovider.so
+usr/lib/qgis/plugins/libgrassrasterprovider.so
 usr/lib/libqgisgrass.so.{QGIS_ABI}
diff --git a/debian/qgis.install b/debian/qgis.install
@@ -1,31 +1,31 @@
 usr/bin/qgis_help
-usr/lib/qgis/libcopyrightlabelplugin.so
-usr/lib/qgis/libdelimitedtextplugin.so
-usr/lib/qgis/libdelimitedtextprovider.so
-usr/lib/qgis/libgeorefplugin.so
-usr/lib/qgis/libgpsimporterplugin.so
-usr/lib/qgis/libgpxprovider.so
-usr/lib/qgis/libnortharrowplugin.so
-usr/lib/qgis/libogrprovider.so
-usr/lib/qgis/libpostgresprovider.so
-usr/lib/qgis/libquickprintplugin.so
-usr/lib/qgis/libscalebarplugin.so
-usr/lib/qgis/libspitplugin.so
-usr/lib/qgis/libwfsplugin.so
-usr/lib/qgis/libwfsprovider.so
-usr/lib/qgis/libwmsprovider.so
-usr/lib/qgis/libmemoryprovider.so
-usr/lib/qgis/libdxf2shpconverterplugin.so
-usr/lib/qgis/libinterpolationplugin.so 
-usr/lib/qgis/libogrconverterplugin.so
-usr/lib/qgis/libcoordinatecaptureplugin.so
-usr/lib/qgis/libspatialiteprovider.so
-usr/lib/qgis/liboracleplugin.so
-usr/lib/qgis/libdiagramoverlay.so 
-usr/lib/qgis/libevis.so 
-usr/lib/qgis/libosmprovider.so 
-usr/lib/qgis/librasterterrainplugin.so
-usr/lib/qgis/libspatialqueryplugin.so
+usr/lib/qgis/plugins/libcopyrightlabelplugin.so
+usr/lib/qgis/plugins/libdelimitedtextplugin.so
+usr/lib/qgis/plugins/libdelimitedtextprovider.so
+usr/lib/qgis/plugins/libgeorefplugin.so
+usr/lib/qgis/plugins/libgpsimporterplugin.so
+usr/lib/qgis/plugins/libgpxprovider.so
+usr/lib/qgis/plugins/libnortharrowplugin.so
+usr/lib/qgis/plugins/libogrprovider.so
+usr/lib/qgis/plugins/libpostgresprovider.so
+usr/lib/qgis/plugins/libquickprintplugin.so
+usr/lib/qgis/plugins/libscalebarplugin.so
+usr/lib/qgis/plugins/libspitplugin.so
+usr/lib/qgis/plugins/libwfsplugin.so
+usr/lib/qgis/plugins/libwfsprovider.so
+usr/lib/qgis/plugins/libwmsprovider.so
+usr/lib/qgis/plugins/libmemoryprovider.so
+usr/lib/qgis/plugins/libdxf2shpconverterplugin.so
+usr/lib/qgis/plugins/libinterpolationplugin.so 
+usr/lib/qgis/plugins/libogrconverterplugin.so
+usr/lib/qgis/plugins/libcoordinatecaptureplugin.so
+usr/lib/qgis/plugins/libspatialiteprovider.so
+usr/lib/qgis/plugins/liboracleplugin.so
+usr/lib/qgis/plugins/libdiagramoverlay.so 
+usr/lib/qgis/plugins/libevis.so 
+usr/lib/qgis/plugins/libosmprovider.so 
+usr/lib/qgis/plugins/librasterterrainplugin.so
+usr/lib/qgis/plugins/libspatialqueryplugin.so
 usr/share/pixmaps/qgis-icon.xpm
 usr/share/pixmaps/qgis-mime-icon.png
 usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes
