Skip to content

Commit 7f56f55

Browse files
author
jef
committedApr 14, 2008
debian packaging update
- update for next release - removed some temporary files in debian/ - add version number to shared libraries names and split them into libqgis-core0.9, libqgis-gui0.9 and libqgisgrass0.9 (fixes #36) - split python binding and plugins into separate package python-qgis - merge some changes from the DebianGIS repository - build in debian/build - updated menu and icon - use qgis man pages (qgis_help added) - build on Debian unstable is lintian clean (may fix #1028) - build also tested on OSX (Tim Sutton), MinGW (Marco Pasetti) and with MSVC git-svn-id: http://svn.osgeo.org/qgis/trunk@8351 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent b423edd commit 7f56f55

27 files changed

+327
-197
lines changed
 

‎CMakeLists.txt

+24-20
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
PROJECT(qgis0.9.2)
1+
SET(CPACK_PACKAGE_VERSION_MAJOR "0")
2+
SET(CPACK_PACKAGE_VERSION_MINOR "9")
3+
SET(CPACK_PACKAGE_VERSION_PATCH "2")
4+
5+
SET(PROJECT_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
6+
7+
PROJECT(qgis${PROJECT_VERSION})
8+
29

310
# TODO:
411
# - install includes for libs
@@ -164,10 +171,10 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES Debug)
164171

165172
IF (WIN32)
166173
SET (DEFAULT_BIN_SUBDIR .)
167-
SET (DEFAULT_LIB_SUBDIR .)
174+
SET (DEFAULT_LIB_SUBDIR lib)
168175
SET (DEFAULT_DATA_SUBDIR .)
169176
SET (DEFAULT_PLUGIN_SUBDIR plugins)
170-
SET (DEFAULT_INCLUDE_SUBDIR include)
177+
SET (DEFAULT_INCLUDE_SUBDIR include)
171178

172179
IF (MSVC)
173180
# Python parts need to be build with nmake not vcexpress
@@ -178,12 +185,12 @@ IF (WIN32)
178185
# put all the build products into a single directory
179186
# under build (doesnt affect install target) to make for
180187
# easier debugging.
181-
SET(OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)
182-
SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
183-
SET(LIBRARY_OUTPUT_PATH ${OUTPUT_DIR})
188+
# SET(OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)
189+
# SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
190+
# SET(LIBRARY_OUTPUT_PATH ${OUTPUT_DIR})
184191
#tell msvc compiler to use main instead of winmain as the
185192
#application entry point
186-
SET(QT_USE_QTMAIN TRUE)
193+
#SET(QT_USE_QTMAIN TRUE)
187194
# Turn on defines for non standard maths stuff
188195
ADD_DEFINITIONS(-D_USE_MATH_DEFINES)
189196

@@ -197,8 +204,9 @@ IF (WIN32)
197204
ADD_DEFINITIONS(-DW_OK=2)
198205
ADD_DEFINITIONS(-DR_OK=4)
199206

200-
FILE(GLOB files "${CMAKE_SOURCE_DIR}/win_build/vcdeps/*.*")
201-
INSTALL(FILES ${files} DESTINATION .)
207+
ADD_DEFINITIONS(-DQGISDEBUG=1)
208+
209+
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/win_build/vcdeps/. DESTINATION .)
202210
ENDIF(MSVC)
203211
ELSE (WIN32)
204212

@@ -258,11 +266,11 @@ SET (QGIS_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING "Subdirectory wh
258266
MARK_AS_ADVANCED (QGIS_BIN_SUBDIR QGIS_LIB_SUBDIR QGIS_DATA_SUBDIR QGIS_PLUGIN_SUBDIR QGIS_INCLUDE_SUBDIR)
259267

260268
# full paths for the installation
261-
SET (QGIS_BIN_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_SUBDIR})
262-
SET (QGIS_LIB_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_SUBDIR})
263-
SET (QGIS_DATA_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_DATA_SUBDIR})
264-
SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_PLUGIN_SUBDIR})
265-
SET (QGIS_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_INCLUDE_SUBDIR})
269+
SET (QGIS_BIN_DIR ${QGIS_BIN_SUBDIR})
270+
SET (QGIS_LIB_DIR ${QGIS_LIB_SUBDIR})
271+
SET (QGIS_DATA_DIR ${QGIS_DATA_SUBDIR})
272+
SET (QGIS_PLUGIN_DIR ${QGIS_PLUGIN_SUBDIR})
273+
SET (QGIS_INCLUDE_DIR ${QGIS_INCLUDE_SUBDIR})
266274

267275
# manual page - makes sense only on unix systems
268276
IF (UNIX)
@@ -348,16 +356,13 @@ ADD_CUSTOM_TARGET(uninstall
348356
INCLUDE(InstallRequiredSystemLibraries)
349357

350358
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Quantum GIS")
351-
SET(CPACK_PACKAGE_VENDOR "Tim Sutton")
359+
SET(CPACK_PACKAGE_VENDOR "Open Source Geospatial Foundation")
352360
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
353361
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
354-
SET(CPACK_PACKAGE_VERSION_MAJOR "0")
355-
SET(CPACK_PACKAGE_VERSION_MINOR "9")
356-
SET(CPACK_PACKAGE_VERSION_PATCH "1")
357362
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Quantum GIS ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
358363
IF(WIN32 AND NOT UNIX)
359364
# There is a bug in NSI that does not handle full unix paths properly. Make
360-
# sure there is at least one set of four (4) backlasshes.
365+
# sure there is at least one set of four (4) backslashes.
361366
SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/win_build\\\\sidebar.bmp")
362367
SET(CPACK_NSIS_INSTALLED_ICON_NAME "\\\\qgis.exe")
363368
SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} Quantum GIS")
@@ -373,4 +378,3 @@ ELSE(WIN32 AND NOT UNIX)
373378
ENDIF(WIN32 AND NOT UNIX)
374379
SET(CPACK_PACKAGE_EXECUTABLES "qgis" "QGIS")
375380
INCLUDE(CPack)
376-

‎debian/changelog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
qgis (0.9.2test2) unstable; urgency=low
2+
3+
* fixed various packaging bugs
4+
5+
-- Jürgen E. Fischer <jef@norbit.de> Sun, 13 Apr 2008 03:51:14 +0200
6+
17
qgis (0.9.2test1) gutsy; urgency=low
28

39
* Testing package to see if icons deploy

‎debian/control

+46-12
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ Build-Depends: debhelper (>= 5.0.0), libgdal1-dev | libgdal1-1.3.2-dev | libgdal
99
sharutils, sip4 (>= 4.4), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
1010
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.0.0), python-qt4-dev (>=4.0.0)
1111
Standards-Version: 3.7.2
12+
XS-Python-Version: current
13+
Homepage: http://qgis.org/
1214

1315
Package: qgis
1416
Architecture: any
15-
Depends: ${shlibs:Depends}, ${misc:Depends}, libqgis1
16-
Suggests: qgis-plugin-grass, python, python-qt4, python-sip4
17+
Depends: ${shlibs:Depends}, ${misc:Depends}, libqgis-core0.9, libqgis-gui0.9
18+
Suggests: qgis-plugin-grass, python-qgis
19+
XB-Python-Version: ${python:Versions}
1720
Description: Geographic Information System (GIS)
1821
A Geographic Information System (GIS) manages,
1922
analyzes, and displays databases of geographic
@@ -25,26 +28,51 @@ Description: Geographic Information System (GIS)
2528
of various georeferenced raster and Digital
2629
Elevation Model (DEM) formats including
2730
GeoTIFF, Arc/Info ASCII Grid, and USGS ASCII DEM.
31+
32+
Package: libqgis-core0.9
33+
Architecture: any
34+
Depends: ${shlibs:Depends}, ${misc:Depends}
35+
Replaces: qgis (<=0.9.2rc1)
36+
Conflicts: libqgis1
37+
Description: QGIS Geographic Information System - shared core library
38+
QGIS is a Geographic Information System (GIS)
39+
which manages, analyzes and display databases of
40+
geographic information.
2841
.
29-
Home page: http://qgis.org/
42+
This package contains the shared core library that
43+
provides an interface for plugins.
3044

31-
Package: libqgis1
45+
Package: libqgis-gui0.9
3246
Architecture: any
3347
Depends: ${shlibs:Depends}, ${misc:Depends}
3448
Replaces: qgis (<=0.9.2rc1)
35-
Description: QGIS Geographic Information System - shared library
49+
Conflicts: libqgis1
50+
Description: QGIS Geographic Information System - shared gui library
3651
QGIS is a Geographic Information System (GIS)
3752
which manages, analyzes and display databases of
3853
geographic information.
3954
.
40-
This package contains the shared library that
55+
This package contains the shared gui library that
4156
provides an interface for plugins.
57+
58+
Package: python-qgis
59+
Architecture: any
60+
Section: python
61+
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libqgis-core0.9, libqgis-gui0.9
62+
Provides: ${python:Provides}
63+
XB-Python-Version: ${python:Versions}
64+
Description: QGIS Geographic Information System - Python bindings and plugins
65+
QGIS is a Geographic Information System (GIS)
66+
which manages, analyzes and display databases of
67+
geographic information.
4268
.
43-
Home page: http://qgis.org/
69+
This package contains the Python bindings and
70+
plugins.
4471

4572
Package: libqgis1-dev
4673
Architecture: any
47-
Depends: qgis (= ${Source-Version}), libgdal1-dev | libgdal1-1.3.2-dev , libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), 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.0.0), python-qt4-dev (>=4.0.0), qt4-designer (>=4.2.0)
74+
Section: libdevel
75+
Depends: qgis (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev , libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), 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.0.0), python-qt4-dev (>=4.0.0), qt4-designer (>=4.2.0)
4876
Provides: libqgis-dev
4977
Conflicts: libqgis-dev, qgis-dev
5078
Replaces: qgis-dev
@@ -56,14 +84,20 @@ Description: QGIS Geographic Information System - development files
5684
.
5785
This package contains the headers and libraries
5886
needed to develop plugins for QGIS.
59-
.
60-
Home page: http://qgis.org/
6187

6288
Package: qgis-plugin-grass
6389
Architecture: any
64-
Depends: qgis (= ${Source-Version}), libgdal1-1.4.0-grass | libgdal1-1.3.2-grass
90+
Depends: qgis (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.3.2-grass, libqgisgrass0.9
6591
Description: Plugin for accessing GRASS data from QGIS
6692
This plugin enables a GRASS data access toolbox in the QGIS
6793
geographic data viewer.
94+
95+
Package: libqgisgrass0.9
96+
Architecture: any
97+
Depends: ${shlibs:Depends}, ${misc:Depends}
98+
Description: QGIS Geographic Information System - shared grass library
99+
QGIS is a Geographic Information System (GIS)
100+
which manages, analyzes and display databases of
101+
geographic information.
68102
.
69-
Home page: http://qgis.org/
103+
This package contains the shared library for the grass plugin.

‎debian/copyright

+15-11
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,23 @@ This package was debianized by Steve Halasz <debian@adkgis.org> on
22
Wed, 31 Dec 2003 10:07:40 -0500.
33

44
It was downloaded from:
5-
http://qgis.sourceforge.net/downloads.html
5+
https://svn.osgeo.org/qgis/trunk/qgis
66

77
The upstream contributors are listed in the AUTHORS file.
8+
9+
Copyright:
10+
11+
(C) 2008 the authors
812

9-
This program is free software; you can redistribute it and/or
10-
modify it under the terms of the GNU General Public License as
11-
published by the Free Software Foundation; either version 2 of
12-
the License, or (at your option) any later version.
13+
This program is free software; you can redistribute it and/or
14+
modify it under the terms of the GNU General Public License as
15+
published by the Free Software Foundation; either version 2 of
16+
the License, or (at your option) any later version.
1317

14-
This program is distributed in the hope that it will be useful,
15-
but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
GNU General Public License for more details.
18+
This program is distributed in the hope that it will be useful,
19+
but WITHOUT ANY WARRANTY; without even the implied warranty of
20+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21+
GNU General Public License for more details.
1822

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

‎debian/gridmaker.1

-11
This file was deleted.

‎debian/libqgis-core0.9.install

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/lib/libqgis_core.so.*

‎debian/libqgis-gui0.9.install

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/lib/libqgis_gui.so.*

‎debian/libqgis1-dev.install

-21
Original file line numberDiff line numberDiff line change
@@ -1,22 +1 @@
1-
#usr/bin/qgis-config
2-
#usr/lib/libqgis*a
31
usr/include/qgis/*
4-
#usr/share/aclocal/qgis.m4
5-
#usr/lib/qgis/copyrightlabelplugin.a
6-
#usr/lib/qgis/libqgsprojectionselector.a
7-
#usr/lib/qgis/delimitedtextplugin.a
8-
#usr/lib/qgis/northarrowplugin.a
9-
#usr/lib/qgis/delimitedtextprovider.a
10-
#usr/lib/qgis/ogrprovider.a
11-
#usr/lib/qgis/georefplugin.a
12-
#usr/lib/qgis/pggeoprocessingplugin.a
13-
#usr/lib/qgis/gpsimporterplugin.a
14-
#usr/lib/qgis/postgresprovider.a
15-
#usr/lib/qgis/gpxprovider.a
16-
#usr/lib/qgis/scalebarplugin.a
17-
#usr/lib/qgis/grassplugin.a
18-
#usr/lib/qgis/spitplugin.a
19-
#usr/lib/qgis/grassprovider.a
20-
#usr/lib/qgis/wmsprovider.a
21-
#usr/lib/qgis/gridmakerplugin.a
22-

‎debian/libqgis1.install

-5
This file was deleted.

‎debian/libqgisgrass0.9.install

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/lib/libqgisgrass.so.*

‎debian/python-qgis.install

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
usr/share/qgis/python/*
2+
usr/lib/python*/site-packages/qgis/__init__.py
3+
usr/lib/python*/site-packages/qgis/qgisconfig.py
4+
usr/lib/python*/site-packages/qgis/*.so

‎debian/qgis-config.1

-44
This file was deleted.

‎debian/qgis-icon.png

-5.1 KB
Binary file not shown.

‎debian/qgis-icon.xpm

+170
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
/* XPM */
2+
static char *qgis_icon[] = {
3+
/* columns rows colors chars-per-pixel */
4+
"32 32 132 2",
5+
" c #070C05",
6+
". c #0B2605",
7+
"X c #072E01",
8+
"o c #0A2F04",
9+
"O c #063300",
10+
"+ c #083602",
11+
"@ c #1F3E11",
12+
"# c #203115",
13+
"$ c #0A4301",
14+
"% c #094A00",
15+
"& c #1A4A0D",
16+
"* c #095100",
17+
"= c #0A5B00",
18+
"- c #1C550D",
19+
"; c #1E4810",
20+
": c #31431F",
21+
"> c #0B6300",
22+
", c #0C6A00",
23+
"< c #156707",
24+
"1 c #1C660B",
25+
"2 c #1A6A09",
26+
"3 c #0E7400",
27+
"4 c #0F7B00",
28+
"5 c #147605",
29+
"6 c #147A04",
30+
"7 c #187D07",
31+
"8 c #20720F",
32+
"9 c #266614",
33+
"0 c #267B11",
34+
"q c #327A1A",
35+
"w c #364E21",
36+
"e c #44472C",
37+
"r c #505334",
38+
"t c #555837",
39+
"y c #5C5F3C",
40+
"u c #426E26",
41+
"i c #427F26",
42+
"p c #47722B",
43+
"a c #646740",
44+
"s c #6C6F48",
45+
"d c #717549",
46+
"f c #74794A",
47+
"g c #797E4E",
48+
"h c #7B7E51",
49+
"j c #7C7E5B",
50+
"k c #0F8001",
51+
"l c #118401",
52+
"z c #118A01",
53+
"x c #1A8C07",
54+
"c c #1C8109",
55+
"v c #1C8B09",
56+
"b c #2D8E15",
57+
"n c #2F9315",
58+
"m c #549431",
59+
"M c #67903F",
60+
"N c #53A62F",
61+
"B c #60A738",
62+
"V c #6A8F41",
63+
"C c #728D47",
64+
"Z c #78914F",
65+
"A c #7E8251",
66+
"S c #7DAD57",
67+
"D c #7CB255",
68+
"F c #808352",
69+
"G c #858A56",
70+
"H c #91975E",
71+
"J c #959D5F",
72+
"K c #83AD51",
73+
"L c #90A75C",
74+
"P c #94A85E",
75+
"I c #969A60",
76+
"U c #9EA266",
77+
"Y c #95A866",
78+
"T c #9BAC62",
79+
"R c #A2AA69",
80+
"E c #A1B866",
81+
"W c #A6B36A",
82+
"Q c #ACB26F",
83+
"! c #A9AD73",
84+
"~ c #ACB672",
85+
"^ c #B1B477",
86+
"/ c #B7BE77",
87+
"( c #B8BE76",
88+
") c #B9BF79",
89+
"_ c #B9C476",
90+
"` c #BCC47A",
91+
"' c #BCCD79",
92+
"] c #C3CB7D",
93+
"[ c #BCBF86",
94+
"{ c #B9C887",
95+
"} c #BEC98B",
96+
"| c #C1C483",
97+
" . c #C7CE80",
98+
".. c #C8CF80",
99+
"X. c #C4CA8D",
100+
"o. c #CCD383",
101+
"O. c #C7DC80",
102+
"+. c #D0D786",
103+
"@. c #D2DB87",
104+
"#. c #D2D788",
105+
"$. c #D4DC88",
106+
"%. c #C6C792",
107+
"&. c #D1D396",
108+
"*. c #D9DE93",
109+
"=. c #DCDE9B",
110+
"-. c #DCE38D",
111+
";. c #DEE491",
112+
":. c #DEE19B",
113+
">. c #E4EC93",
114+
",. c #E4E69D",
115+
"<. c #E7E89E",
116+
"1. c #E8E99C",
117+
"2. c #EAF296",
118+
"3. c #EDF599",
119+
"4. c #F1F69D",
120+
"5. c #F5F99F",
121+
"6. c #D5D6A0",
122+
"7. c #DADBA2",
123+
"8. c #ECEEA1",
124+
"9. c #E2E4AD",
125+
"0. c #EEF2A3",
126+
"q. c #F2F7A3",
127+
"w. c #F5F9A3",
128+
"e. c #FAFCA4",
129+
"r. c #F2F5AB",
130+
"t. c #F7FBAA",
131+
"y. c #F9FAAC",
132+
"u. c #F9FCB1",
133+
"i. c #F3F4BA",
134+
"p. c #FAFBBB",
135+
"a. c #FCFCC4",
136+
"s. c None",
137+
/* pixels */
138+
"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.l s.s.s.s.s.s.",
139+
"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.z z 4 s.s.s.s.s.s.",
140+
"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.z z z 3 s.s.s.s.s.s.",
141+
"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.4 z z z 4 3 = s.s.s.s.s.s.",
142+
"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.< , 4 3 , * s.s.s.s.s.s.",
143+
"s.s.s.s.s.s.s.s.s.s.s.s.s.9.6.%.&.=.:.Z 9 = 3 , > % s.s.s.s.s.s.",
144+
"s.s.s.s.s.s.s.s.s.s.a.p.u.! h s.s.` ;.O.N l 4 > * O s.s.s.s.s.s.",
145+
"s.s.s.s.s.s.s.s.s.a.u.0.;.s s.s.s.s.' B n l 1 $ X s.s.s.s.s.s.s.",
146+
"s.s.s.s.s.s.s.s.p.p.w.>.o.e s.s.s.s.K n v c u w s.s.s.s.s.s.s.s.",
147+
"s.s.s.s.s.s.s.a.p.w.3.$.Q s.s.s.s.s.5 z 7 q J H s.s.s.s.s.s.s.s.",
148+
"s.s.s.s.s.s.s.u.t.3.2.o.H s.s.s.s.l l l i C o.o.` s.s.s.s.s.s.s.",
149+
"s.s.s.s.s.s.p.y.w.3.2.o.G s.s.s.s.l l 0 M T >.-. .s.s.s.s.s.s.s.",
150+
"s.s.s.s.s.s.p.w.4.3.2...g s.s.s.4 l x p T o.3.>.+.s.s.s.s.s.s.s.",
151+
"s.s.s.s.s.s.u.4.3.3.2...d s.s.3 z 3 2 U o.>.3.2.@.A s.s.s.s.s.s.",
152+
"s.s.s.s.s.s.y.4.3.3.2...d s.s.k l , - | ;.3.3.2.@.G s.s.s.s.s.s.",
153+
"s.s.s.s.s.s.e.4.3.3.2...d s.6 z 4 * # 1.3.3.3.2.$.G s.s.s.s.s.s.",
154+
"s.s.s.s.s.s.w.3.3.3.2.] f 5 l x + s.s.y.4.3.3.2.o.d s.s.s.s.s.s.",
155+
"s.s.s.s.s.s.4.3.3.3.2.@.R S D D Y ~ s.y.4.3.3.>...y s.s.s.s.s.s.",
156+
"s.s.s.s.s.s.2.2.3.3.2.-.` { } X.,.<.8.y.q.3.3.-.` e s.s.s.s.s.s.",
157+
"s.s.s.s.s.s.s.>.3.3.3.@.W & o I #.5.w.3.3.2.] U s.s.s.s.s.s.s.",
158+
"s.s.s.s.s.s.s.-.>.2.2.-._ @ . s.s.>.5.3.3.2.-.U f s.s.s.s.s.s.s.",
159+
"s.s.s.s.s.s.s.] @.>.2.-.o.: s.s.s.4.w.3.2.>.o.A s.s.s.s.s.s.s.s.",
160+
"s.s.s.s.s.s.s.s.L o.>.>.>.A s.s.s.w.w.3.>.o.g s.s.s.s.s.s.s.s.s.",
161+
"s.s.s.s.s.s.z x b m E ] -.] / s.s.q.w.3.o.~ s.s.s.s.s.s.s.s.s.s.",
162+
"s.s.s.s.s.s.4 4 6 8 V P ] ] ) s.7.8.w.3.o.Q s.s.s.s.s.s.s.s.s.s.",
163+
"s.s.s.s.s.s.$ $ % = % ; t G U ^ [ *.4.3.-.] s.s.s.i.j s.s.s.s.s.",
164+
"s.s.s.s.s.s.s.s.s.= $ s.s.s.s.s.s.-.3.3.>.>.3.r.:.! s.s.s.s.s.s.",
165+
"s.s.s.s.s.s.s.s.s.> $ s.s.s.s.s.s.+.-.>.>.>.3.*.| h s.s.s.s.s.s.",
166+
"s.s.s.s.s.s.s.s.s.> s.s.s.s.s.s.s.s.( $.-.-.$.R F s.s.s.s.s.s.s.",
167+
"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.a a r s.s.s.s.s.s.s.s.s.",
168+
"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.",
169+
"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s."
170+
};

‎debian/qgis-plugin-grass.install

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
usr/lib/libqgisgrass.so*
21
usr/lib/qgis/libgrassplugin.so
32
usr/lib/qgis/libgrassprovider.so
43
usr/share/qgis/grass/*

‎debian/qgis.1

-35
This file was deleted.

‎debian/qgis.install

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
1-
#usr/bin/gridmaker
21
usr/bin/qgis
32
usr/bin/qgis_help
3+
usr/share/qgis/doc/AUTHORS usr/share/qgis/doc/SPONSORS usr/share/qgis/doc/CODING usr/share/qgis/doc/favicon.ico usr/share/qgis/doc/index.html usr/share/qgis/doc/qgisdoc.css usr/share/qgis/doc/userguide.pdf usr/share/qgis/doc/images usr/share/doc/qgis
4+
usr/share/pixmaps/*
5+
usr/share/qgis/i18n/*
6+
usr/share/qgis/images/*
7+
usr/share/qgis/resources/*
8+
usr/share/qgis/svg/*
9+
usr/share/qgis/themes/*
410
usr/lib/qgis/libcopyrightlabelplugin.so
511
usr/lib/qgis/libdelimitedtextplugin.so
12+
usr/lib/qgis/libdelimitedtextprovider.so
613
usr/lib/qgis/libgeorefplugin.so
714
usr/lib/qgis/libgpsimporterplugin.so
815
usr/lib/qgis/libgpxprovider.so
916
usr/lib/qgis/libgridmakerplugin.so
10-
#usr/lib/qgis/liblauncherplugin.so
1117
usr/lib/qgis/libnortharrowplugin.so
1218
usr/lib/qgis/libogrprovider.so
1319
usr/lib/qgis/libpggeoprocessingplugin.so
1420
usr/lib/qgis/libpostgresprovider.so
21+
usr/lib/qgis/libquickprintplugin.so
1522
usr/lib/qgis/libscalebarplugin.so
1623
usr/lib/qgis/libspitplugin.so
1724
usr/lib/qgis/libwfsplugin.so
1825
usr/lib/qgis/libwfsprovider.so
1926
usr/lib/qgis/libwmsprovider.so
20-
usr/share/qgis/doc/* usr/share/doc/qgis
21-
#usr/share/man/*
22-
usr/share/pixmaps/*
23-
usr/share/qgis/doc/*
24-
usr/share/qgis/i18n/*
25-
usr/share/qgis/images/*
26-
/usr/share/qgis/python/*
27-
usr/share/qgis/resources/*
28-
usr/share/qgis/svg/*
29-
usr/share/qgis/themes/*

‎debian/qgis.menu

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
?package(qgis):needs="X11" section="Apps"\
2-
icon="/usr/share/pixmaps/qgis-icon.png" title="QGIS"\
1+
?package(qgis):needs="X11" section="Applications/Science/Geoscience"\
2+
icon="/usr/share/pixmaps/qgis-icon.xpm" title="Quantum GIS"\
33
command="/usr/bin/qgis"

‎debian/qgis.postinst.debhelper

-5
This file was deleted.

‎debian/qgis.postrm.debhelper

-3
This file was deleted.

‎debian/rules

+16-11
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,25 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
2525
INSTALL_PROGRAM += -s
2626
endif
2727

28-
CMakeCache.txt: CMakeLists.txt
28+
debian/build/CMakeCache.txt: CMakeLists.txt
2929
dh_testdir
3030
# Add here commands to configure the package.
3131
uudecode -o $(CURDIR)/src/plugins/georeferencer/pencil.png $(CURDIR)/debian/pencil.uu
32-
cmake -D CMAKE_INSTALL_PREFIX=/usr \
33-
.
32+
[ -d debian/build ] || mkdir debian/build
33+
[ ! -e CMakeCache.txt ] || rm CMakeCache.txt
34+
cd debian/build; cmake \
35+
-D CMAKE_INSTALL_PREFIX=/usr \
36+
-D CMAKE_SKIP_RPATH=TRUE \
37+
-D BINDINGS_GLOBAL_INSTALL=TRUE \
38+
../..
3439

3540
build: patch build-stamp
3641

37-
build-stamp: CMakeCache.txt
42+
build-stamp: debian/build/CMakeCache.txt
3843
dh_testdir
3944

4045
# Add here commands to compile the package.
41-
$(MAKE)
46+
$(MAKE) -C debian/build
4247

4348
touch build-stamp
4449

@@ -51,9 +56,8 @@ clean-patched:
5156
rm -rf debian/tmp
5257

5358
# Add here commands to clean up after the build process.
54-
-$(MAKE) clean
59+
rm -rf debian/build
5560

56-
rm -f CMakeCache.txt
5761
rm -f $(CURDIR)/src/plugins/georeferencer/pencil.png
5862

5963
dh_clean
@@ -65,11 +69,11 @@ install: build
6569
dh_installdirs
6670

6771
# Add here commands to install the package into debian/tmp.
68-
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
72+
$(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/tmp
6973

7074
# Install menu pixmap
7175
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
72-
install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-icon.png
76+
install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-icon.xpm
7377

7478
# Build architecture-independent files here.
7579
binary-indep: build install
@@ -83,11 +87,12 @@ binary-arch: build install
8387
dh_installdocs
8488
dh_installexamples
8589
dh_install --sourcedir=debian/tmp
90+
dh_pycentral
8691
dh_installmenu
8792
dh_icons
8893
dh_desktop
89-
dh_installman -pqgis debian/gridmaker.1
90-
dh_installman -plibqgis1-dev debian/qgis-config.1
94+
dh_installman -pqgis qgis.man
95+
dh_installman -pqgis qgis_help.man
9196
dh_installmime -pqgis
9297
dh_link
9398
dh_strip

‎python/plugins/plugin_installer/qgis_plugins.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env python
21
"""
32
qgis_plugins.py
43
author: Matthew Perry

‎qgis.man

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
.TH "Quantum GIS" 1 "October 2004"
1+
.TH QGIS 1 "April 13, 2008"
22
.SH NAME
3-
Quantum GIS \- A Geographic Information System
3+
qgis \- Quantum GIS Geographic Information System
44
.SH SYNOPSIS
55
.B qgis [--snapshot
66
.I filename]
@@ -11,6 +11,9 @@ Quantum GIS \- A Geographic Information System
1111
.B " [--project"
1212
.I projectfile]
1313
.br
14+
.B " [--extent"
15+
.I xmin,ymin,xmax,ymax]
16+
.br
1417
.B " [--help]"
1518
.br
1619
.B " [file]..."

‎qgis_help.man

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
.TH QGIS_HELP 1 "April 13, 2008"
2+
.SH NAME
3+
qgis_help \- help viewer for qgis, the geographic data viewer
4+
.SH SYNOPSIS
5+
.B qgis_help [helpfile]
6+
.br
7+
.SH DESCRIPTION
8+
.B qgis_help
9+
is internally used by
10+
.B qgis
11+
to view help files.
12+
.SH SEE ALSO
13+
qgis(1)
14+
.SH AUTHOR
15+
This manual page was written by Jürgen Fischer <jef@norbit.de>.

‎src/core/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
112112
renderer
113113
symbology
114114
spatialindex/include
115-
${QT_QTSVG_INCLUDE_DIR}
116115
${PROJ_INCLUDE_DIR}
117116
${GEOS_INCLUDE_DIR}
118117
${GDAL_INCLUDE_DIR}
@@ -159,6 +158,10 @@ PATH_PREFIX(INDEX_SRC spatialindex ${SPINDEX_SRC})
159158

160159
ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${INDEX_SRC})
161160

161+
SET_TARGET_PROPERTIES(qgis_core PROPERTIES
162+
VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
163+
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
164+
162165
# make sure to create qgssvnversion.h before compiling
163166
ADD_DEPENDENCIES(qgis_core svnversion)
164167

‎src/gui/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ ENDIF (WIN32)
6565

6666
ADD_LIBRARY(qgis_gui SHARED ${QGIS_GUI_SRCS} ${QGIS_GUI_MOC_SRCS})
6767

68+
SET_TARGET_PROPERTIES(qgis_gui PROPERTIES
69+
VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
70+
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
71+
6872
# make sure that UI files will be processed first
6973
ADD_DEPENDENCIES(qgis_gui ui)
7074

‎src/providers/grass/CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ INCLUDE_DIRECTORIES (
3232

3333
ADD_LIBRARY (qgisgrass SHARED ${GRASS_LIB_SRCS})
3434

35+
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES
36+
VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
37+
SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
38+
3539
IF (WIN32)
3640
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=__declspec(dllexport)\"" )
3741
ELSE (WIN32)

0 commit comments

Comments
 (0)
Please sign in to comment.