debian packaging update

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12881 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 4, 2010 · 4a2d088 · 4a2d088
1 parent 9941d4a
commit 4a2d088
Show file tree

Hide file tree

Showing 17 changed files with 102 additions and 45 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,12 @@
 qgis (1.5.0) UNRELEASED; urgency=low
 
   * new development version after 1.5 branch
+  * adapted Francesco Paolo Lovergine's updates to Debian qgis 1.4 package
+  * require CMake >2.6 and Qt 4.4 for sid
+  * remove circular dependencies
+  * integrate new GRASS raster provider
 
- -- Jürgen E. Fischer <jef@norbit.de>  Mon, 28 Dec 2009 23:44:41 +0100
+ -- Jürgen E. Fischer <jef@norbit.de>  Thu, 04 Feb 2010 23:20:29 +0100
 
 qgis (1.4.0) UNRELEASED; urgency=low
 

diff --git a/debian/compat → debian/compat.hardy b/debian/compat → debian/compat.hardy
diff --git a/debian/compat.intrepid b/debian/compat.intrepid
@@ -0,0 +1 @@
+5
diff --git a/debian/compat.jaunty b/debian/compat.jaunty
@@ -0,0 +1 @@
+5
diff --git a/debian/compat.karmic b/debian/compat.karmic
@@ -0,0 +1 @@
+5
diff --git a/debian/compat.lenny b/debian/compat.lenny
@@ -0,0 +1 @@
+5
diff --git a/debian/compat.sid b/debian/compat.sid
@@ -0,0 +1 @@
+7
diff --git a/debian/control.sid b/debian/control.sid
@@ -2,15 +2,15 @@ Source: qgis
 Section: science
 Priority: extra
 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),
- libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
+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-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),
+ 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
 Build-Conflicts: libqgis-dev, qgis-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 XS-Python-Version: current
 Homepage: http://qgis.org/
 
@@ -31,7 +31,7 @@ Description: Geographic Information System (GIS)
 
 Package: qgis-common
 Architecture: all
-Depends: qgis (>= ${source:Version})
+Depends: qgis (>= ${binary:Version})
 Description: Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -55,10 +55,9 @@ Architecture: any
 Section: libdevel
 Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
  libpq-dev, libgeos-dev (>= 3.0.0), grass-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)
+ libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, 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), qt4-designer (>=4.4.0)
 Provides: qgis-dev
 Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
 Description: Quantum GIS - development files
@@ -80,7 +79,7 @@ Description: GRASS plugin for Quantum GIS
 
 Package: qgis-plugin-grass-common
 Architecture: all
-Depends: qgis-plugin-grass (>= ${source:Version}), python
+Depends: python
 Description: GRASS plugin for Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -103,7 +102,6 @@ Description: Python bindings to Quantum GIS
 Package: python-qgis-common
 Section: python
 Architecture: all
-Depends: python-qgis (>= ${source:Version})
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS - architecture-independent files

diff --git a/debian/copyright b/debian/copyright
@@ -4,11 +4,43 @@ Wed, 31 Dec 2003 10:07:40 -0500.
 It was downloaded from:
  https://svn.osgeo.org/qgis/trunk/qgis
 
-The upstream contributors are listed in the AUTHORS file.
+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>
+	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>
+	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>
+	Carson J. Q. Farmer	<carson dot farmer at gmail dot com>
+	Lorenzo Masini	<lorenxo86@gmail.com>
+	Werner Macho	<werner.macho@gmail.com>
 
 Copyright:
 
-  (C) 2008 the authors
+  Copyright (C) 2003-2010 the authors
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@@ -21,4 +53,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-2 file.
+  License can be found in the /usr/share/common-licenses/GPL file.
diff --git a/debian/python-qgis.install.in b/debian/python-qgis.install.in
@@ -1,3 +1,3 @@
-usr/lib/python*/{dist,site}-packages/qgis/*.py
-usr/lib/python*/{dist,site}-packages/qgis/*.so
+usr/lib/python*/*-packages/qgis/*.py
+usr/lib/python*/*-packages/qgis/*.so
 usr/lib/libqgispython.so.{QGIS_ABI}
diff --git a/debian/qgis-plugin-grass-common.install b/debian/qgis-plugin-grass-common.install
@@ -1 +1,7 @@
-usr/share/qgis/grass/*
+usr/share/qgis/grass/locations.gml
+usr/share/qgis/grass/world.png
+usr/share/qgis/grass/config
+usr/share/qgis/grass/modules/*.png
+usr/share/qgis/grass/modules/*.qgm
+usr/share/qgis/grass/modules/*.svg
+usr/share/qgis/grass/scripts/*.py
diff --git a/debian/qgis-plugin-grass.install.in b/debian/qgis-plugin-grass.install.in
@@ -1,3 +1,6 @@
+usr/share/qgis/grass/modules/qgis.d.rast
+usr/share/qgis/grass/modules/qgis.g.info
 usr/lib/qgis/libgrassplugin.so
 usr/lib/qgis/libgrassprovider.so
+usr/lib/qgis/libgrassrasterprovider.so
 usr/lib/libqgisgrass.so.{QGIS_ABI}
diff --git a/debian/qgis-plugin-grass.preinst b/debian/qgis-plugin-grass.preinst
@@ -6,4 +6,7 @@ if [ "$1" = "install" -o "$1" = "upgrade" ]; then
 	dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
 fi
 
+#DEBHELPER#
+
 exit 0
+
diff --git a/debian/qgis.sh b/debian/qgis.sh
diff --git a/debian/qgis.sh.in b/debian/qgis.sh.in
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [ "$LD_LIBRARY_PATH" = "" ]; then
+	LD_LIBRARY_PATH=/usr/lib/{GRASS}/lib
+else
+	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/{GRASS}/lib
+fi
+
+export LD_LIBRARY_PATH
+
+exec $0.bin "$@"
diff --git a/debian/rules b/debian/rules
@@ -19,6 +19,7 @@ QGIS_MINOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MINOR "\([0-9]*\)")/\1/p
 QGIS_PATCH=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")/\1/p' CMakeLists.txt)
 QGIS_ABI=$(QGIS_MAJOR).$(QGIS_MINOR).$(QGIS_PATCH)
 GRASS_ABI=$(subst .,,$(shell pkg-config --modversion grass|sed -e "s/\.//g" -e "s/RC/-/"))
+GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
 
 CMAKE_OPTS := \
 	-Wno-dev \
@@ -31,7 +32,7 @@ CMAKE_OPTS := \
 	-D WITH_INTERNAL_SPATIALITE=TRUE
 
 ifeq ($(DISTRIBUTION),sid)
-# depend on python 2.5 while transition to python 2.6 is on
+# use on python 2.5 while transition to python 2.6 is on
 CMAKE_OPTS += -D PYTHON_EXECUTABLE=/usr/bin/python2.5
 endif
 
@@ -64,6 +65,7 @@ define gentemplate
 $(2): $(1)
 	sed \
 		-e "s/{QGIS_ABI}/$(QGIS_ABI)/g" \
+		-e "s/{GRASS}/$(GRASS)/g" \
 		-e "s/{GRASS_ABI}/$(GRASS_ABI)/g" $$^ >$$@
 endef
 
@@ -105,7 +107,11 @@ clean: $(TEMPLATES)
 install: build
 	dh_testdir
 	dh_testroot
+ifneq (,$(findstring $(DISTRIBUTION),"lenny hardy"))
 	dh_clean -k 
+else
+	dh_prep
+endif
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp.
@@ -152,7 +158,7 @@ endif
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb
-	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/lib/grass/lib:/usr/lib/grass64/lib dh_shlibdeps
+	dh_shlibdeps -l/usr/lib/$(GRASS)/lib
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

diff --git a/src/plugins/grass/qtermwidget/kpty.cpp b/src/plugins/grass/qtermwidget/kpty.cpp
@@ -109,24 +109,24 @@ extern "C"
 # define _NEW_TTY_CTRL
 #endif
 
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
+#if defined(HAVE_TCGETATTR)
+# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
+#elif defined(TIOCGETA)
 # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
+#elif defined(TCGETS)
+# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
 #else
-# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__)
-#  define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
-# else
-#  define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
-# endif
+# error HAVE_TCGETATTR || TIOCGETA || TCGETS required
 #endif
 
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
+#if defined(HAVE_TCSETATTR) && defined(TCSANOW)
+# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
+#elif defined(TIOCSETA)
 # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
+#elif defined(TCSETS)
+# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
 #else
-# if defined(_HPUX_SOURCE) || defined(__CYGWIN__)
-#  define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
-# else
-#  define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
-# endif
+# error (HAVE_TCSETATTR && TCSANOW) || TIOCSETA || TCSETS required
 #endif
 
 //#include <kdebug.h>