Skip to content

Commit ac0b428

Browse files
author
jef
committed
update debian packaging
git-svn-id: http://svn.osgeo.org/qgis/trunk@10166 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 96182a0 commit ac0b428

21 files changed

+158
-64
lines changed

‎debian/changelog

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
1-
qgis (1.0.0-1) experimental; urgency=low
1+
qgis (1.1.0) UNRELEASED; urgency=low
22

33
* gridmaker plugin removed from package
44
* updated mime support
5-
6-
-- Jürgen E. Fischer <jef@norbit.de> Sat, 31 Jan 2009 17:21:47 +0100
5+
* sync with debian-gis debian/ tree
6+
- introduce arch-independant qgis-comman and
7+
qgis-plugin-grass-common
8+
- policy updated to 3.8.0
9+
- join libqgis1-core and libqgis1-gui to libqgis1
10+
- add debian/watch
11+
- dh_lintian overrides
12+
- compat 5=>6
13+
- fix qgis.desktop
14+
- fix license reference in copyright
15+
* introduce arch-independant python-qgis-comman
16+
* added sharedmimeinfo
17+
* remove dpatch
18+
19+
-- Jürgen E. Fischer <jef@norbit.de> Fri, 13 Feb 2009 22:03:25 +0100
720

821
qgis (1.0.0) experimental; urgency=low
922

‎debian/compat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5
1+
6

‎debian/control

Lines changed: 50 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ Source: qgis
22
Section: science
33
Priority: extra
44
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
5-
Build-Depends: debhelper (>= 5.0.0), libgdal1-dev, libpq-dev,
6-
libgeos-dev (>= 2.0.1-1), dpatch, grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
5+
Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
6+
libgeos-dev (>= 2.0.1), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
77
flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
88
sharutils, sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
99
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.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
1212
Build-Conflicts: libqgis1-dev
13-
Standards-Version: 3.7.3
13+
Standards-Version: 3.8.0
1414
XS-Python-Version: current
1515
Homepage: http://qgis.org/
1616

1717
Package: qgis
1818
Architecture: any
19-
Depends: ${shlibs:Depends}, ${misc:Depends}
19+
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version})
2020
Recommends: qgis-plugin-grass, python-qgis
2121
Suggests: gpsbabel
2222
Conflicts: uim-qt3
@@ -29,42 +29,38 @@ Description: Geographic Information System (GIS)
2929
Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid,
3030
and USGS ASCII DEM.
3131

32-
Package: libqgis-core1
33-
Architecture: any
34-
Depends: ${shlibs:Depends}, ${misc:Depends}
35-
Replaces: qgis (<=0.9.2rc1)
36-
Conflicts: libqgis1, uim-qt3
37-
Description: Quantum GIS - shared core library
32+
Package: qgis-common
33+
Architecture: all
34+
Depends: qgis (= ${binary:Version})
35+
Description: Quantum GIS - architecture-independent data
3836
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
3937
and display databases of geographic information.
4038
.
41-
This package contains the shared core library that provides an interface for
42-
plugins.
39+
This package contains architecture-independent supporting data files for use
40+
with Quantum GIS.
4341

44-
Package: libqgis-gui1
42+
Package: libqgis1
4543
Architecture: any
4644
Depends: ${shlibs:Depends}, ${misc:Depends}
47-
Replaces: qgis (<=0.9.2rc1)
48-
Conflicts: libqgis1, uim-qt3
49-
Description: Quantum GIS - shared gui library
45+
Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0
46+
Description: Quantum GIS - shared libraries
5047
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
5148
and display databases of geographic information.
5249
.
53-
This package contains the shared gui library that provides an interface for
54-
plugins.
50+
This package contains the shared core and gui library that provide an
51+
interface for plugins and stand-alone applications.
5552

5653
Package: libqgis1-dev
5754
Architecture: any
5855
Section: libdevel
59-
Depends: qgis (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
60-
libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), grass-dev,
56+
Depends: libqgis1 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
57+
libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1), grass-dev,
6158
libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0),
6259
libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
6360
libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
64-
qt4-designer (>=4.2.0), libqgis-gui1, libqgis-core1
65-
Provides: libqgis-dev
66-
Conflicts: libqgis-dev, qgis-dev
67-
Replaces: qgis-dev
61+
qt4-designer (>=4.2.0)
62+
Provides: libqgis-dev, qgis-dev
63+
Replaces: libqgis-dev, qgis-dev
6864
Description: Quantum GIS - development files
6965
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
7066
and display databases of geographic information.
@@ -74,10 +70,23 @@ Description: Quantum GIS - development files
7470

7571
Package: qgis-plugin-grass
7672
Architecture: any
77-
Depends: qgis (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.5.0-grass
78-
Description: Plugin for accessing GRASS data from Quantum GIS
79-
This plugin enables a GRASS data access toolbox in the Quantum GIS geographic
80-
data viewer.
73+
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.5.0-grass
74+
Description: GRASS plugin for Quantum GIS
75+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
76+
and display databases of geographic information.
77+
.
78+
This plugin enables GRASS data access in the Quantum GIS geographic data
79+
viewer.
80+
81+
Package: qgis-plugin-grass-common
82+
Architecture: all
83+
Depends: qgis-plugin-grass (= ${binary:Version})
84+
Description: GRASS plugin for Quantum GIS - architecture-independent data
85+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
86+
and display databases of geographic information.
87+
.
88+
This package contains architecture-independent supporting data files for use
89+
with the Quantum GIS GRASS plugin.
8190

8291
Package: python-qgis
8392
Section: python
@@ -91,3 +100,16 @@ Description: Python bindings to Quantum GIS
91100
.
92101
This package contains the files for the Python support.
93102

103+
Package: python-qgis-common
104+
Section: python
105+
Architecture: all
106+
Depends: python-qgis (= ${binary:Version})
107+
Provides: ${python:Provides}
108+
XB-Python-Version: ${python:Versions}
109+
Description: Python bindings to Quantum GIS - architecture-independent files
110+
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
111+
and display databases of geographic information.
112+
.
113+
This package contains architecture-independent files for the Quantum GIS
114+
Python bindings.
115+

‎debian/copyright

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ Copyright:
2121
GNU General Public License for more details.
2222

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

‎debian/libqgis-gui1.install

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎debian/libqgis-core1.install renamed to ‎debian/libqgis1.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
usr/lib/libqgis_core.so.*
2+
usr/lib/libqgis_gui.so.*

‎debian/libqgis1.lintian-overrides

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
libqgis1: shlib-calls-exit
2+
libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.1
3+
libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.1
4+
libqgis1: package-name-doesnt-match-sonames libqgis-core1.1 libqgis-gui1.1

‎debian/python-qgis-common.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/share/qgis/python/*

‎debian/python-qgis.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
usr/share/qgis/python/*
21
usr/lib/python*/site-packages/qgis/__init__.py
32
usr/lib/python*/site-packages/qgis/qgisconfig.py
43
usr/lib/python*/site-packages/qgis/*.so

‎debian/python-qgis.lintian-overrides

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
python-qgis: package-name-doesnt-match-sonames
2+
python-qgis: non-dev-pkg-with-shlib-symlink
3+
python-qgis: no-symbols-control-file usr/lib/libqgispython.so.1.1

‎debian/qgis-common.install

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
usr/share/qgis/doc/CODING
2+
usr/share/qgis/doc/favicon.ico
3+
usr/share/qgis/doc/index.html
4+
usr/share/qgis/doc/qgisdoc.css
5+
usr/share/qgis/doc/AUTHORS
6+
usr/share/qgis/doc/SPONSORS
7+
usr/share/qgis/doc/images
8+
usr/share/qgis/i18n/*
9+
usr/share/qgis/images/*
10+
usr/share/qgis/resources/*
11+
usr/share/qgis/svg/*
12+
usr/share/qgis/themes/*

‎debian/qgis-common.sharedmimeinfo

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
4+
<mime-type type="application/x-qgis">
5+
<comment xml:lang="en">Quantum GIS Project</comment>
6+
<glob pattern="*.qgs"/>
7+
</mime-type>
8+
9+
<mime-type type="application/shapefile">
10+
<comment xml:lang="en">ESRI shape file</comment>
11+
<glob pattern="*.shp"/>
12+
</mime-type>
13+
14+
<mime-type type="application/mif">
15+
<comment xml:lang="en">MapInfo file</comment>
16+
<glob pattern="*.mif"/>
17+
</mime-type>
18+
19+
<mime-type type="application/gml">
20+
<comment xml:lang="en">Geographic Markup Language</comment>
21+
<glob pattern="*.gml"/>
22+
</mime-type>
23+
24+
<mime-type type="image/geotiff">
25+
<comment xml:lang="en">GEOTiff</comment>
26+
<glob pattern="*.tif"/>
27+
<glob pattern="*.tiff"/>
28+
</mime-type>
29+
30+
<mime-type type="image/jpeg">
31+
<comment xml:lang="en">JPEG compress raster data</comment>
32+
<glob pattern="*.jpg"/>
33+
<glob pattern="*.jpeg"/>
34+
</mime-type>
35+
36+
<mime-type type="image/jp2">
37+
<comment xml:lang="en">JPEG 2000 compress raster data</comment>
38+
<glob pattern="*.jp2"/>
39+
<glob pattern="*.j2k"/>
40+
</mime-type>
41+
42+
<mime-type type="image/ecw">
43+
<comment xml:lang="en">ECW compressed raster data</comment>
44+
<glob pattern="*.ecw"/>
45+
</mime-type>
46+
47+
<mime-type type="image/sid">
48+
<comment xml:lang="en">MrSID compress raster data</comment>
49+
<glob pattern="*.sid"/>
50+
</mime-type>
51+
52+
</mime-info>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/share/qgis/grass/*

‎debian/qgis-plugin-grass.install

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
usr/lib/qgis/libgrassplugin.so
22
usr/lib/qgis/libgrassprovider.so
3-
usr/lib/libqgisgrass.so*
4-
usr/share/qgis/grass/*
3+
usr/lib/libqgisgrass.so.*

‎debian/qgis-plugin-grass.lintian-overrides

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
qgis-plugin-grass: binary-without-manpage
2+
qgis-plugin-grass: package-name-doesnt-match-sonames
3+
qgis-plugin-grass: no-symbols-control-file usr/lib/libqgisgrass.so.1.1

‎debian/qgis-plugin-grass.postrm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ set -e
44

55
if [ "$1" = "remove" ]; then
66
dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
7-
ldconfig
87
fi
98

9+
#DEBHELPER#
10+
1011
exit 0

‎debian/qgis.desktop

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ GenericName[de]=Geographisches Informationssystem
77
Icon=qgis-icon
88
TryExec=/usr/bin/qgis
99
Exec=/usr/bin/qgis %F
10-
Encoding=UTF-8
1110
Terminal=false
1211
StartupNotify=false
13-
Categories=Qt;Science;GIS;OSGeo;
12+
Categories=Education;Geography;Qt;
1413
MimeType=application/x-qgis-project;image/tiff;image/jpeg;image/jp2;application/x-raster-aig;application/x-raster-ecw;application/x-raster-mrsid;application/x-mapinfo-mif;application/x-esri-shape;

‎debian/qgis.dirs

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎debian/qgis.install

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
11
usr/bin/qgis_help
2-
usr/share/qgis/doc/CODING
3-
usr/share/qgis/doc/favicon.ico
4-
usr/share/qgis/doc/index.html
5-
usr/share/qgis/doc/qgisdoc.css
6-
usr/share/qgis/doc/AUTHORS
7-
usr/share/qgis/doc/SPONSORS
8-
usr/share/qgis/doc/images
9-
usr/share/pixmaps/*
10-
usr/share/qgis/i18n/*
11-
usr/share/qgis/images/*
12-
usr/share/qgis/resources/*
13-
usr/share/qgis/svg/*
14-
usr/share/qgis/themes/*
152
usr/lib/qgis/libcopyrightlabelplugin.so
163
usr/lib/qgis/libdelimitedtextplugin.so
174
usr/lib/qgis/libdelimitedtextprovider.so
@@ -32,6 +19,9 @@ usr/lib/qgis/libdxf2shpconverterplugin.so
3219
usr/lib/qgis/libinterpolationplugin.so
3320
usr/lib/qgis/libogrconverterplugin.so
3421
usr/lib/qgis/libcoordinatecaptureplugin.so
22+
usr/share/pixmaps/qgis-icon.xpm
23+
usr/share/pixmaps/qgis-mime-icon.png
24+
usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes
3525
../qgis.desktop usr/share/applications
3626
../qgis.xml usr/share/mime/packages
3727
../mime/application/x-esri-shape.desktop usr/share/mimelnk/application
@@ -43,5 +33,3 @@ usr/lib/qgis/libcoordinatecaptureplugin.so
4333
../mime/application/x-qgis-project.desktop usr/share/mimelnk/application
4434
../mime/application/x-raster-mrsid.desktop usr/share/mimelnk/application
4535
../mime/application/x-qgis-layer-settings.desktop usr/share/mimelnk/application
46-
usr/share/pixmaps/qgis-mime-icon.png
47-
usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes

‎debian/rules

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
# Uncomment this to turn on verbose mode.
77
#export DH_VERBOSE=1
88

9-
include /usr/share/dpatch/dpatch.make
10-
119
# These are used for cross-compiling and for saving the configure script
1210
# from having to guess our platform (since we know it already)
1311
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -44,12 +42,11 @@ endif
4442
debian/build/CMakeCache.txt: CMakeLists.txt
4543
dh_testdir
4644
# Add here commands to configure the package.
47-
uudecode -o $(CURDIR)/src/plugins/georeferencer/pencil.png $(CURDIR)/debian/pencil.uu
4845
[ -d debian/build ] || mkdir debian/build
4946
[ ! -e CMakeCache.txt ] || rm CMakeCache.txt
5047
cd debian/build; cmake $(CMAKE_OPTS) ../..
5148

52-
build: patch build-stamp
49+
build: build-stamp
5350

5451
build-stamp: debian/build/CMakeCache.txt
5552
dh_testdir
@@ -59,8 +56,7 @@ build-stamp: debian/build/CMakeCache.txt
5956

6057
touch build-stamp
6158

62-
clean: clean-patched unpatch
63-
clean-patched:
59+
clean:
6460
dh_testdir
6561
dh_testroot
6662
rm -f build-stamp
@@ -70,8 +66,6 @@ clean-patched:
7066
# Add here commands to clean up after the build process.
7167
rm -rf debian/build
7268

73-
rm -f $(CURDIR)/src/plugins/georeferencer/pencil.png
74-
7569
dh_clean
7670

7771
install: build
@@ -87,6 +81,7 @@ install: build
8781
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
8882
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
8983
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
84+
install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps
9085

9186
# Build architecture-independent files here.
9287
binary-indep: build install
@@ -115,6 +110,7 @@ binary-arch: build install
115110
dh_installman -pqgis qgis_help.man
116111
dh_installmime -pqgis
117112
dh_link
113+
dh_lintian
118114
dh_strip
119115
dh_compress --exclude=pdf
120116
dh_fixperms

‎debian/watch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
version=3
2+
http://download.osgeo.org/qgis/src/qgis_(.*).tar.gz

0 commit comments

Comments
 (0)