Skip to content

Commit 8cc505f

Browse files
author
jef
committed
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/qgis@8351 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 548e680 commit 8cc505f

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.

0 commit comments

Comments
 (0)