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
qgis · Apr 14, 2008 · 7f56f55 · 7f56f55
1 parent b423edd
commit 7f56f55
Show file tree

Hide file tree

Showing 27 changed files with 327 additions and 197 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,11 @@
-PROJECT(qgis0.9.2)
+SET(CPACK_PACKAGE_VERSION_MAJOR "0")
+SET(CPACK_PACKAGE_VERSION_MINOR "9")
+SET(CPACK_PACKAGE_VERSION_PATCH "2")
+
+SET(PROJECT_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
+
+PROJECT(qgis${PROJECT_VERSION})
+
 
 # TODO:
 # - install includes for libs
@@ -164,10 +171,10 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES Debug)
 
 IF (WIN32)
   SET (DEFAULT_BIN_SUBDIR     .)
-  SET (DEFAULT_LIB_SUBDIR     .)
+  SET (DEFAULT_LIB_SUBDIR     lib)
   SET (DEFAULT_DATA_SUBDIR    .)
   SET (DEFAULT_PLUGIN_SUBDIR  plugins)
-  SET (DEFAULT_INCLUDE_SUBDIR	include)
+  SET (DEFAULT_INCLUDE_SUBDIR include)
 
   IF (MSVC)
     # Python parts need to be build with nmake not vcexpress
@@ -178,12 +185,12 @@ IF (WIN32)
     # put all the build products into a single directory
     # under build (doesnt affect install target) to make for
     # easier debugging.
-    SET(OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)
-    SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-    SET(LIBRARY_OUTPUT_PATH ${OUTPUT_DIR})
+    # SET(OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)
+    # SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+    # SET(LIBRARY_OUTPUT_PATH ${OUTPUT_DIR})
     #tell msvc compiler to use main instead of winmain as the
     #application entry point
-    SET(QT_USE_QTMAIN TRUE) 
+    #SET(QT_USE_QTMAIN TRUE) 
     # Turn on defines for non standard maths stuff
     ADD_DEFINITIONS(-D_USE_MATH_DEFINES)
 
@@ -197,8 +204,9 @@ IF (WIN32)
     ADD_DEFINITIONS(-DW_OK=2)
     ADD_DEFINITIONS(-DR_OK=4)
 
-    FILE(GLOB files "${CMAKE_SOURCE_DIR}/win_build/vcdeps/*.*")
-    INSTALL(FILES ${files} DESTINATION .)
+    ADD_DEFINITIONS(-DQGISDEBUG=1)
+
+    INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/win_build/vcdeps/. DESTINATION .)
   ENDIF(MSVC)
 ELSE (WIN32)
 
@@ -258,11 +266,11 @@ SET (QGIS_INCLUDE_SUBDIR ${DEFAULT_INCLUDE_SUBDIR} CACHE STRING "Subdirectory wh
 MARK_AS_ADVANCED (QGIS_BIN_SUBDIR QGIS_LIB_SUBDIR QGIS_DATA_SUBDIR QGIS_PLUGIN_SUBDIR QGIS_INCLUDE_SUBDIR)
 
 # full paths for the installation
-SET (QGIS_BIN_DIR     ${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_SUBDIR})
-SET (QGIS_LIB_DIR     ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_SUBDIR})
-SET (QGIS_DATA_DIR    ${CMAKE_INSTALL_PREFIX}/${QGIS_DATA_SUBDIR})
-SET (QGIS_PLUGIN_DIR  ${CMAKE_INSTALL_PREFIX}/${QGIS_PLUGIN_SUBDIR})
-SET (QGIS_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_INCLUDE_SUBDIR})
+SET (QGIS_BIN_DIR     ${QGIS_BIN_SUBDIR})
+SET (QGIS_LIB_DIR     ${QGIS_LIB_SUBDIR})
+SET (QGIS_DATA_DIR    ${QGIS_DATA_SUBDIR})
+SET (QGIS_PLUGIN_DIR  ${QGIS_PLUGIN_SUBDIR})
+SET (QGIS_INCLUDE_DIR ${QGIS_INCLUDE_SUBDIR})
 
 # manual page - makes sense only on unix systems
 IF (UNIX)
@@ -348,16 +356,13 @@ ADD_CUSTOM_TARGET(uninstall
 INCLUDE(InstallRequiredSystemLibraries)
 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Quantum GIS")
-SET(CPACK_PACKAGE_VENDOR "Tim Sutton")
+SET(CPACK_PACKAGE_VENDOR "Open Source Geospatial Foundation")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
-SET(CPACK_PACKAGE_VERSION_MAJOR "0")
-SET(CPACK_PACKAGE_VERSION_MINOR "9")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Quantum GIS ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
 IF(WIN32 AND NOT UNIX)
   # There is a bug in NSI that does not handle full unix paths properly. Make
-  # sure there is at least one set of four (4) backlasshes.
+  # sure there is at least one set of four (4) backslashes.
   SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/win_build\\\\sidebar.bmp")
   SET(CPACK_NSIS_INSTALLED_ICON_NAME "\\\\qgis.exe")
   SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} Quantum GIS")
@@ -373,4 +378,3 @@ ELSE(WIN32 AND NOT UNIX)
 ENDIF(WIN32 AND NOT UNIX)
 SET(CPACK_PACKAGE_EXECUTABLES "qgis" "QGIS")
 INCLUDE(CPack)
-
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (0.9.2test2) unstable; urgency=low
+
+  * fixed various packaging bugs
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Sun, 13 Apr 2008 03:51:14 +0200
+
 qgis (0.9.2test1) gutsy; urgency=low
 
   * Testing package to see if icons deploy 

diff --git a/debian/control b/debian/control
@@ -9,11 +9,14 @@ Build-Depends: debhelper (>= 5.0.0), libgdal1-dev | libgdal1-1.3.2-dev | libgdal
  sharutils, sip4 (>= 4.4), 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)
 Standards-Version: 3.7.2
+XS-Python-Version: current
+Homepage: http://qgis.org/
 
 Package: qgis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqgis1
-Suggests: qgis-plugin-grass, python, python-qt4, python-sip4
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqgis-core0.9, libqgis-gui0.9
+Suggests: qgis-plugin-grass, python-qgis
+XB-Python-Version: ${python:Versions}
 Description: Geographic Information System (GIS)
  A Geographic Information System (GIS) manages,
  analyzes, and displays databases of geographic
@@ -25,26 +28,51 @@ Description: Geographic Information System (GIS)
  of various georeferenced raster and Digital
  Elevation Model (DEM) formats including
  GeoTIFF, Arc/Info ASCII Grid, and USGS ASCII DEM.
+
+Package: libqgis-core0.9
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: qgis (<=0.9.2rc1)
+Conflicts: libqgis1
+Description: QGIS Geographic Information System - shared core library
+ QGIS is a Geographic Information System (GIS)
+ which manages, analyzes and display databases of
+ geographic information.
  .
-  Home page: http://qgis.org/
+ This package contains the shared core library that
+ provides an interface for plugins.
 
-Package: libqgis1
+Package: libqgis-gui0.9
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: qgis (<=0.9.2rc1)
-Description: QGIS Geographic Information System - shared library
+Conflicts: libqgis1
+Description: QGIS Geographic Information System - shared gui library
  QGIS is a Geographic Information System (GIS)
  which manages, analyzes and display databases of
  geographic information.
  .
- This package contains the shared library that
+ This package contains the shared gui library that
  provides an interface for plugins.
+
+Package: python-qgis
+Architecture: any
+Section: python
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libqgis-core0.9, libqgis-gui0.9
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: QGIS Geographic Information System - Python bindings and plugins
+ QGIS is a Geographic Information System (GIS)
+ which manages, analyzes and display databases of
+ geographic information.
  .
-  Home page: http://qgis.org/
+ This package contains the Python bindings and
+ plugins.
 
 Package: libqgis1-dev
 Architecture: any
-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)
+Section: libdevel
+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)
 Provides: libqgis-dev
 Conflicts: libqgis-dev, qgis-dev
 Replaces: qgis-dev
@@ -56,14 +84,20 @@ Description: QGIS Geographic Information System - development files
  .
  This package contains the headers and libraries
  needed to develop plugins for QGIS.
- .
-  Home page: http://qgis.org/
 
 Package: qgis-plugin-grass
 Architecture: any
-Depends: qgis (= ${Source-Version}), libgdal1-1.4.0-grass | libgdal1-1.3.2-grass
+Depends: qgis (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.3.2-grass, libqgisgrass0.9
 Description: Plugin for accessing GRASS data from QGIS
  This plugin enables a GRASS data access toolbox in the QGIS
  geographic data viewer.
+
+Package: libqgisgrass0.9
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: QGIS Geographic Information System - shared grass library
+ QGIS is a Geographic Information System (GIS)
+ which manages, analyzes and display databases of
+ geographic information.
  .
-  Home page: http://qgis.org/
+ This package contains the shared library for the grass plugin.
diff --git a/debian/copyright b/debian/copyright
@@ -2,19 +2,23 @@ This package was debianized by Steve Halasz <debian@adkgis.org> on
 Wed, 31 Dec 2003 10:07:40 -0500.
 
 It was downloaded from:
- http://qgis.sourceforge.net/downloads.html
+ https://svn.osgeo.org/qgis/trunk/qgis
 
 The upstream contributors are listed in the AUTHORS file.
+
+Copyright:
+
+  (C) 2008 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
-published by the Free Software Foundation; either version 2 of
-the License, or (at your option) any later version.
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of
+  the License, or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  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 file.
+  On Debian systems, the complete text of the GNU General Public
+  License can be found in the /usr/share/common-licenses/GPL file.
diff --git a/debian/gridmaker.1 b/debian/gridmaker.1
diff --git a/debian/libqgis-core0.9.install b/debian/libqgis-core0.9.install
@@ -0,0 +1 @@
+usr/lib/libqgis_core.so.*
diff --git a/debian/libqgis-gui0.9.install b/debian/libqgis-gui0.9.install
@@ -0,0 +1 @@
+usr/lib/libqgis_gui.so.*
diff --git a/debian/libqgis1-dev.install b/debian/libqgis1-dev.install
@@ -1,22 +1 @@
-#usr/bin/qgis-config
-#usr/lib/libqgis*a
 usr/include/qgis/*
-#usr/share/aclocal/qgis.m4
-#usr/lib/qgis/copyrightlabelplugin.a   
-#usr/lib/qgis/libqgsprojectionselector.a
-#usr/lib/qgis/delimitedtextplugin.a    
-#usr/lib/qgis/northarrowplugin.a
-#usr/lib/qgis/delimitedtextprovider.a  
-#usr/lib/qgis/ogrprovider.a
-#usr/lib/qgis/georefplugin.a           
-#usr/lib/qgis/pggeoprocessingplugin.a
-#usr/lib/qgis/gpsimporterplugin.a      
-#usr/lib/qgis/postgresprovider.a
-#usr/lib/qgis/gpxprovider.a            
-#usr/lib/qgis/scalebarplugin.a
-#usr/lib/qgis/grassplugin.a            
-#usr/lib/qgis/spitplugin.a
-#usr/lib/qgis/grassprovider.a          
-#usr/lib/qgis/wmsprovider.a
-#usr/lib/qgis/gridmakerplugin.a
-
diff --git a/debian/libqgis1.install b/debian/libqgis1.install
diff --git a/debian/libqgisgrass0.9.install b/debian/libqgisgrass0.9.install
@@ -0,0 +1 @@
+usr/lib/libqgisgrass.so.*
diff --git a/debian/python-qgis.install b/debian/python-qgis.install
@@ -0,0 +1,4 @@
+usr/share/qgis/python/*
+usr/lib/python*/site-packages/qgis/__init__.py
+usr/lib/python*/site-packages/qgis/qgisconfig.py
+usr/lib/python*/site-packages/qgis/*.so
diff --git a/debian/qgis-config.1 b/debian/qgis-config.1
diff --git a/debian/qgis-icon.png b/debian/qgis-icon.png