Skip to content

Commit 4a2d088

Browse files
author
jef
committedFeb 4, 2010
debian packaging update
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12881 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 9941d4a commit 4a2d088

17 files changed

+102
-45
lines changed
 

‎debian/changelog

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
qgis (1.5.0) UNRELEASED; urgency=low
22

33
* new development version after 1.5 branch
4+
* adapted Francesco Paolo Lovergine's updates to Debian qgis 1.4 package
5+
* require CMake >2.6 and Qt 4.4 for sid
6+
* remove circular dependencies
7+
* integrate new GRASS raster provider
48

5-
-- Jürgen E. Fischer <jef@norbit.de> Mon, 28 Dec 2009 23:44:41 +0100
9+
-- Jürgen E. Fischer <jef@norbit.de> Thu, 04 Feb 2010 23:20:29 +0100
610

711
qgis (1.4.0) UNRELEASED; urgency=low
812

‎debian/compat renamed to ‎debian/compat.hardy

File renamed without changes.

‎debian/compat.intrepid

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5

‎debian/compat.jaunty

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5

‎debian/compat.karmic

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5

‎debian/compat.lenny

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5

‎debian/compat.sid

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7

‎debian/control.sid

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ Source: qgis
22
Section: science
33
Priority: extra
44
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
5-
Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
6-
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
7-
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
8-
sharutils, sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
9-
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
5+
Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev,
6+
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev,
7+
flex, bison, python-dev, cmake (>= 2.6), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
8+
sharutils, sip4 (>= 4.5), libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
9+
libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
1010
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
1111
libsm-dev, pyqt4-dev-tools, libqwt5-qt4-dev
1212
Build-Conflicts: libqgis-dev, qgis-dev
13-
Standards-Version: 3.8.3
13+
Standards-Version: 3.8.4
1414
XS-Python-Version: current
1515
Homepage: http://qgis.org/
1616

@@ -31,7 +31,7 @@ Description: Geographic Information System (GIS)
3131

3232
Package: qgis-common
3333
Architecture: all
34-
Depends: qgis (>= ${source:Version})
34+
Depends: qgis (>= ${binary:Version})
3535
Description: Quantum GIS - architecture-independent data
3636
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
3737
and display databases of geographic information.
@@ -55,10 +55,9 @@ Architecture: any
5555
Section: libdevel
5656
Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
5757
libpq-dev, libgeos-dev (>= 3.0.0), grass-dev,
58-
libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0),
59-
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
60-
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
61-
qt4-designer (>=4.2.0)
58+
libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, libqt4-core (>=4.4.0),
59+
libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0),
60+
python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), qt4-designer (>=4.4.0)
6261
Provides: qgis-dev
6362
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
6463
Description: Quantum GIS - development files
@@ -80,7 +79,7 @@ Description: GRASS plugin for Quantum GIS
8079

8180
Package: qgis-plugin-grass-common
8281
Architecture: all
83-
Depends: qgis-plugin-grass (>= ${source:Version}), python
82+
Depends: python
8483
Description: GRASS plugin for Quantum GIS - architecture-independent data
8584
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
8685
and display databases of geographic information.
@@ -103,7 +102,6 @@ Description: Python bindings to Quantum GIS
103102
Package: python-qgis-common
104103
Section: python
105104
Architecture: all
106-
Depends: python-qgis (>= ${source:Version})
107105
Provides: ${python:Provides}
108106
XB-Python-Version: ${python:Versions}
109107
Description: Python bindings to Quantum GIS - architecture-independent files

‎debian/copyright

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,43 @@ Wed, 31 Dec 2003 10:07:40 -0500.
44
It was downloaded from:
55
https://svn.osgeo.org/qgis/trunk/qgis
66

7-
The upstream contributors are listed in the AUTHORS file.
7+
The upstream contributors are listed in the AUTHORS file and here
8+
reported:
9+
10+
Gary E.Sherman <sherman at mrcc dot com>
11+
Steve Halasz <stevehalasz at users.sourceforge.net>
12+
Marco Hugentobler <mhugent at users.sourceforge.net>
13+
Tim Sutton <tim at linfiniti.com>
14+
Denis Antipov <rawbytes at users.sourceforge.net>
15+
Mark Coletti <mcoletti at users.sourceforge.net>
16+
Lars Luthman <larsl at users.sourceforge.net>
17+
Jens Oberender <j.obi at troja.net>
18+
Christoph Spoerri <spoerri at users.sourceforge.net>
19+
Carl Anderson <>
20+
Gavin Macaulay <g_j_m at users.sourceforge.net>
21+
Masaru Hoshi <hoshi at users.sourceforge.net>
22+
Peter Brewer <p.w.brewer at rdg dot ac dot uk>
23+
Radim Blazek <blazek at itc.it>
24+
Tom Elwertowski <telwertowski at users.sourceforge.net>
25+
Godofredo Contreras <frdcn athotmail.com>
26+
Martin Dobias <wonder.sk at gmail.com>
27+
Brendan Morley <morb at beagle.com.au>
28+
Magnus Homann <magnus at homann.se>
29+
Jürgen E. Fischer <jef@norbit.de>
30+
Tisham Dhar <tisham at apogee.com.au>
31+
Leonardo Lami <lami@faunalia.it>
32+
Marco Pasetti <marco.pasetti@alice.it>
33+
Mateusz Loskot <mateusz at loskot dot net>
34+
Peter Ersts <ersts at amnh.org>
35+
Borys Jurgiel <borysiasty at aster.pl>
36+
Paolo Cavallini <cavallini at faunalia.it>
37+
Carson J. Q. Farmer <carson dot farmer at gmail dot com>
38+
Lorenzo Masini <lorenxo86@gmail.com>
39+
Werner Macho <werner.macho@gmail.com>
840

941
Copyright:
1042

11-
(C) 2008 the authors
43+
Copyright (C) 2003-2010 the authors
1244

1345
This program is free software; you can redistribute it and/or
1446
modify it under the terms of the GNU General Public License as
@@ -21,4 +53,4 @@ Copyright:
2153
GNU General Public License for more details.
2254

2355
On Debian systems, the complete text of the GNU General Public
24-
License can be found in the /usr/share/common-licenses/GPL-2 file.
56+
License can be found in the /usr/share/common-licenses/GPL file.

‎debian/python-qgis.install.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
usr/lib/python*/{dist,site}-packages/qgis/*.py
2-
usr/lib/python*/{dist,site}-packages/qgis/*.so
1+
usr/lib/python*/*-packages/qgis/*.py
2+
usr/lib/python*/*-packages/qgis/*.so
33
usr/lib/libqgispython.so.{QGIS_ABI}

‎debian/qgis-plugin-grass-common.install

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
usr/share/qgis/grass/*
1+
usr/share/qgis/grass/locations.gml
2+
usr/share/qgis/grass/world.png
3+
usr/share/qgis/grass/config
4+
usr/share/qgis/grass/modules/*.png
5+
usr/share/qgis/grass/modules/*.qgm
6+
usr/share/qgis/grass/modules/*.svg
7+
usr/share/qgis/grass/scripts/*.py

‎debian/qgis-plugin-grass.install.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
usr/share/qgis/grass/modules/qgis.d.rast
2+
usr/share/qgis/grass/modules/qgis.g.info
13
usr/lib/qgis/libgrassplugin.so
24
usr/lib/qgis/libgrassprovider.so
5+
usr/lib/qgis/libgrassrasterprovider.so
36
usr/lib/libqgisgrass.so.{QGIS_ABI}

‎debian/qgis-plugin-grass.preinst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,7 @@ if [ "$1" = "install" -o "$1" = "upgrade" ]; then
66
dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
77
fi
88

9+
#DEBHELPER#
10+
911
exit 0
12+

‎debian/qgis.sh

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎debian/qgis.sh.in

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/sh
2+
3+
if [ "$LD_LIBRARY_PATH" = "" ]; then
4+
LD_LIBRARY_PATH=/usr/lib/{GRASS}/lib
5+
else
6+
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/{GRASS}/lib
7+
fi
8+
9+
export LD_LIBRARY_PATH
10+
11+
exec $0.bin "$@"

‎debian/rules

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ QGIS_MINOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MINOR "\([0-9]*\)")/\1/p
1919
QGIS_PATCH=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")/\1/p' CMakeLists.txt)
2020
QGIS_ABI=$(QGIS_MAJOR).$(QGIS_MINOR).$(QGIS_PATCH)
2121
GRASS_ABI=$(subst .,,$(shell pkg-config --modversion grass|sed -e "s/\.//g" -e "s/RC/-/"))
22+
GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
2223

2324
CMAKE_OPTS := \
2425
-Wno-dev \
@@ -31,7 +32,7 @@ CMAKE_OPTS := \
3132
-D WITH_INTERNAL_SPATIALITE=TRUE
3233

3334
ifeq ($(DISTRIBUTION),sid)
34-
# depend on python 2.5 while transition to python 2.6 is on
35+
# use on python 2.5 while transition to python 2.6 is on
3536
CMAKE_OPTS += -D PYTHON_EXECUTABLE=/usr/bin/python2.5
3637
endif
3738

@@ -64,6 +65,7 @@ define gentemplate
6465
$(2): $(1)
6566
sed \
6667
-e "s/{QGIS_ABI}/$(QGIS_ABI)/g" \
68+
-e "s/{GRASS}/$(GRASS)/g" \
6769
-e "s/{GRASS_ABI}/$(GRASS_ABI)/g" $$^ >$$@
6870
endef
6971

@@ -105,7 +107,11 @@ clean: $(TEMPLATES)
105107
install: build
106108
dh_testdir
107109
dh_testroot
110+
ifneq (,$(findstring $(DISTRIBUTION),"lenny hardy"))
108111
dh_clean -k
112+
else
113+
dh_prep
114+
endif
109115
dh_installdirs
110116

111117
# Add here commands to install the package into debian/tmp.
@@ -152,7 +158,7 @@ endif
152158
dh_fixperms
153159
dh_makeshlibs
154160
dh_installdeb
155-
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/lib/grass/lib:/usr/lib/grass64/lib dh_shlibdeps
161+
dh_shlibdeps -l/usr/lib/$(GRASS)/lib
156162
dh_gencontrol
157163
dh_md5sums
158164
dh_builddeb

‎src/plugins/grass/qtermwidget/kpty.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -109,24 +109,24 @@ extern "C"
109109
# define _NEW_TTY_CTRL
110110
#endif
111111

112-
#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
112+
#if defined(HAVE_TCGETATTR)
113+
# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
114+
#elif defined(TIOCGETA)
113115
# define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
116+
#elif defined(TCGETS)
117+
# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
114118
#else
115-
# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__)
116-
# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
117-
# else
118-
# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
119-
# endif
119+
# error HAVE_TCGETATTR || TIOCGETA || TCGETS required
120120
#endif
121121

122-
#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
122+
#if defined(HAVE_TCSETATTR) && defined(TCSANOW)
123+
# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
124+
#elif defined(TIOCSETA)
123125
# define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
126+
#elif defined(TCSETS)
127+
# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
124128
#else
125-
# if defined(_HPUX_SOURCE) || defined(__CYGWIN__)
126-
# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
127-
# else
128-
# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
129-
# endif
129+
# error (HAVE_TCSETATTR && TCSANOW) || TIOCSETA || TCSETS required
130130
#endif
131131

132132
//#include <kdebug.h>

0 commit comments

Comments
 (0)
Please sign in to comment.