diff --git a/CMakeLists.txt b/CMakeLists.txt index bdcc5628fe7..1ae3be95d83 100644 --- 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 index d387408a015..d527ee72e4b 100644 --- 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 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 index 4bbb27cda7b..b595a37cd8e 100644 --- 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. - . - Home page: http://qgis.org/ -Package: libqgis1 +Package: libqgis-core0.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 core 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 core library that provides an interface for plugins. + +Package: libqgis-gui0.9 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: qgis (<=0.9.2rc1) +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. . - Home page: http://qgis.org/ + 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. + . + 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 index 49079ed4297..b65d309fb1a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,19 +2,23 @@ This package was debianized by Steve Halasz 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 deleted file mode 100644 index 00b627d9cb6..00000000000 --- a/debian/gridmaker.1 +++ /dev/null @@ -1,11 +0,0 @@ -.TH gridmaker 1 "August 2004" "gridmaker" "User Commands" -.SH NAME -gridmaker \- Graticule builder -.SH SYNOPSIS -.PP -.B gridmaker -[OPTIONS] -.SH DESCRIPTION -.PP -The \fIgridmaker\fP qgis plugin will help you to build a graticule shapefile -that you can use as an overlay within your qgis map viewer. diff --git a/debian/libqgis-core0.9.install b/debian/libqgis-core0.9.install new file mode 100644 index 00000000000..fdecba8685c --- /dev/null +++ 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 new file mode 100644 index 00000000000..60205a819d9 --- /dev/null +++ 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 index de341076854..083830001d4 100644 --- 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 deleted file mode 100644 index d5449255dd8..00000000000 --- a/debian/libqgis1.install +++ /dev/null @@ -1,5 +0,0 @@ -#usr/lib/libqgis_composer.so* -usr/lib/libqgis_core.so* -/usr/lib/libqgis_gui.so -#usr/lib/libqgis_legend.so* -#usr/lib/libqgis_raster.so* diff --git a/debian/libqgisgrass0.9.install b/debian/libqgisgrass0.9.install new file mode 100644 index 00000000000..4b3ca23b0f1 --- /dev/null +++ b/debian/libqgisgrass0.9.install @@ -0,0 +1 @@ +usr/lib/libqgisgrass.so.* diff --git a/debian/python-qgis.install b/debian/python-qgis.install new file mode 100644 index 00000000000..1a81b223b9a --- /dev/null +++ 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 deleted file mode 100644 index 914762c0aa6..00000000000 --- a/debian/qgis-config.1 +++ /dev/null @@ -1,44 +0,0 @@ -.TH qgis-config 1 "August 2004" "qgis-config" "User Commands" -.SH NAME -qgis-config \- returns information about installed qgis libraries and binaries -.SH SYNOPSIS -.PP -.B qgis-config -[OPTIONS] -.SH DESCRIPTION -.PP -The \fIqgis-config\fP shell script is designed to retrieve the -configuration information about the libraries and binaries dealing with -QGIS - -.SH OPTIONS -.TP -\fB\-\-cflags\fR -print the prefix used by qgis -.TP -\fB\-\-bindir\fR -print destination of executable(s) -.TP -\fB\-\-cflags\fR -print the compiler flags that are necessary to compile a -plug-inshow location of C++ header files -.TP -\fB\-\-libs\fR -print the linker flags that are necessary to link a plug-in -.TP -\fB\-\-plugindir\fR -print the path where the plugins are installed -.TP -\fB\-\-major_version\fR -print major version of qgis -.TP -\fB\-\-minor_version\fR -print minor version of qgis -.TP -\fB\-\-micro_version\fR -print micro version of qgis -.TP -\fB\-\-extra_version\fR -print extra version of qgis -\fB\-\-help\fR -show help, then exit diff --git a/debian/qgis-icon.png b/debian/qgis-icon.png deleted file mode 100644 index a55bd79a49a..00000000000 Binary files a/debian/qgis-icon.png and /dev/null differ diff --git a/debian/qgis-icon.xpm b/debian/qgis-icon.xpm new file mode 100644 index 00000000000..362e385ab17 --- /dev/null +++ b/debian/qgis-icon.xpm @@ -0,0 +1,170 @@ +/* XPM */ +static char *qgis_icon[] = { +/* columns rows colors chars-per-pixel */ +"32 32 132 2", +" c #070C05", +". c #0B2605", +"X c #072E01", +"o c #0A2F04", +"O c #063300", +"+ c #083602", +"@ c #1F3E11", +"# c #203115", +"$ c #0A4301", +"% c #094A00", +"& c #1A4A0D", +"* c #095100", +"= c #0A5B00", +"- c #1C550D", +"; c #1E4810", +": c #31431F", +"> c #0B6300", +", c #0C6A00", +"< c #156707", +"1 c #1C660B", +"2 c #1A6A09", +"3 c #0E7400", +"4 c #0F7B00", +"5 c #147605", +"6 c #147A04", +"7 c #187D07", +"8 c #20720F", +"9 c #266614", +"0 c #267B11", +"q c #327A1A", +"w c #364E21", +"e c #44472C", +"r c #505334", +"t c #555837", +"y c #5C5F3C", +"u c #426E26", +"i c #427F26", +"p c #47722B", +"a c #646740", +"s c #6C6F48", +"d c #717549", +"f c #74794A", +"g c #797E4E", +"h c #7B7E51", +"j c #7C7E5B", +"k c #0F8001", +"l c #118401", +"z c #118A01", +"x c #1A8C07", +"c c #1C8109", +"v c #1C8B09", +"b c #2D8E15", +"n c #2F9315", +"m c #549431", +"M c #67903F", +"N c #53A62F", +"B c #60A738", +"V c #6A8F41", +"C c #728D47", +"Z c #78914F", +"A c #7E8251", +"S c #7DAD57", +"D c #7CB255", +"F c #808352", +"G c #858A56", +"H c #91975E", +"J c #959D5F", +"K c #83AD51", +"L c #90A75C", +"P c #94A85E", +"I c #969A60", +"U c #9EA266", +"Y c #95A866", +"T c #9BAC62", +"R c #A2AA69", +"E c #A1B866", +"W c #A6B36A", +"Q c #ACB26F", +"! c #A9AD73", +"~ c #ACB672", +"^ c #B1B477", +"/ c #B7BE77", +"( c #B8BE76", +") c #B9BF79", +"_ c #B9C476", +"` c #BCC47A", +"' c #BCCD79", +"] c #C3CB7D", +"[ c #BCBF86", +"{ c #B9C887", +"} c #BEC98B", +"| c #C1C483", +" . c #C7CE80", +".. c #C8CF80", +"X. c #C4CA8D", +"o. c #CCD383", +"O. c #C7DC80", +"+. c #D0D786", +"@. c #D2DB87", +"#. c #D2D788", +"$. c #D4DC88", +"%. c #C6C792", +"&. c #D1D396", +"*. c #D9DE93", +"=. c #DCDE9B", +"-. c #DCE38D", +";. c #DEE491", +":. c #DEE19B", +">. c #E4EC93", +",. c #E4E69D", +"<. c #E7E89E", +"1. c #E8E99C", +"2. c #EAF296", +"3. c #EDF599", +"4. c #F1F69D", +"5. c #F5F99F", +"6. c #D5D6A0", +"7. c #DADBA2", +"8. c #ECEEA1", +"9. c #E2E4AD", +"0. c #EEF2A3", +"q. c #F2F7A3", +"w. c #F5F9A3", +"e. c #FAFCA4", +"r. c #F2F5AB", +"t. c #F7FBAA", +"y. c #F9FAAC", +"u. c #F9FCB1", +"i. c #F3F4BA", +"p. c #FAFBBB", +"a. c #FCFCC4", +"s. c None", +/* pixels */ +"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.", +"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.", +"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.", +"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.", +"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.", +"s.s.s.s.s.s.s.s.s.s.s.s.s.9.6.%.&.=.:.Z 9 = 3 , > % s.s.s.s.s.s.", +"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.", +"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.", +"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.", +"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.", +"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.", +"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.", +"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.", +"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.", +"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.", +"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.", +"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.", +"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.", +"s.s.s.s.s.s.2.2.3.3.2.-.` { } X.,.<.8.y.q.3.3.-.` e s.s.s.s.s.s.", +"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.", +"s.s.s.s.s.s.s.-.>.2.2.-._ @ . s.s.>.5.3.3.2.-.U f s.s.s.s.s.s.s.", +"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.", +"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.", +"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.", +"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.", +"s.s.s.s.s.s.$ $ % = % ; t G U ^ [ *.4.3.-.] s.s.s.i.j s.s.s.s.s.", +"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.", +"s.s.s.s.s.s.s.s.s.> $ s.s.s.s.s.s.+.-.>.>.>.3.*.| h s.s.s.s.s.s.", +"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.", +"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.", +"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.", +"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." +}; diff --git a/debian/qgis-plugin-grass.install b/debian/qgis-plugin-grass.install index 9bbe379eca2..487ec639e28 100644 --- a/debian/qgis-plugin-grass.install +++ b/debian/qgis-plugin-grass.install @@ -1,4 +1,3 @@ -usr/lib/libqgisgrass.so* usr/lib/qgis/libgrassplugin.so usr/lib/qgis/libgrassprovider.so usr/share/qgis/grass/* diff --git a/debian/qgis.1 b/debian/qgis.1 deleted file mode 100644 index 4e3dbd7ed92..00000000000 --- a/debian/qgis.1 +++ /dev/null @@ -1,35 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH QGIS 1 "Januray 6, 2004" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -qgis \- geographic data viewer -.SH SYNOPSIS -.B qgis [project-file.qgs] | [shapefile.shp] [raster-file.tif] ... -.br -.SH DESCRIPTION -This manual page documents briefly the -.B qgis -command. -This manual page was written for the Debian distribution -because the original program does not have a manual page. -.PP -\fBqgis\fP displays shapefiles, georeferenced raster files, and digital elevation models. You can specify a QGIS project file on the command line to be displayed at startup. Or you can specify a combination of multiple shapefiles and/or raster files to be displayed at startup. -.SH SEE ALSO -HTML and PDF documentation in /usr/share/doc/qgis and at http://qgis.sourceforge.net/docs/ -.SH AUTHOR -This manual page was written by Steve Halasz , -for the Debian project (but may be used by others). diff --git a/debian/qgis.install b/debian/qgis.install index c0b4da32c24..76d0ea5d41e 100644 --- a/debian/qgis.install +++ b/debian/qgis.install @@ -1,29 +1,26 @@ -#usr/bin/gridmaker usr/bin/qgis usr/bin/qgis_help +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 +usr/share/pixmaps/* +usr/share/qgis/i18n/* +usr/share/qgis/images/* +usr/share/qgis/resources/* +usr/share/qgis/svg/* +usr/share/qgis/themes/* usr/lib/qgis/libcopyrightlabelplugin.so usr/lib/qgis/libdelimitedtextplugin.so +usr/lib/qgis/libdelimitedtextprovider.so usr/lib/qgis/libgeorefplugin.so usr/lib/qgis/libgpsimporterplugin.so usr/lib/qgis/libgpxprovider.so usr/lib/qgis/libgridmakerplugin.so -#usr/lib/qgis/liblauncherplugin.so usr/lib/qgis/libnortharrowplugin.so usr/lib/qgis/libogrprovider.so usr/lib/qgis/libpggeoprocessingplugin.so usr/lib/qgis/libpostgresprovider.so +usr/lib/qgis/libquickprintplugin.so usr/lib/qgis/libscalebarplugin.so usr/lib/qgis/libspitplugin.so usr/lib/qgis/libwfsplugin.so usr/lib/qgis/libwfsprovider.so usr/lib/qgis/libwmsprovider.so -usr/share/qgis/doc/* usr/share/doc/qgis -#usr/share/man/* -usr/share/pixmaps/* -usr/share/qgis/doc/* -usr/share/qgis/i18n/* -usr/share/qgis/images/* -/usr/share/qgis/python/* -usr/share/qgis/resources/* -usr/share/qgis/svg/* -usr/share/qgis/themes/* diff --git a/debian/qgis.menu b/debian/qgis.menu index 23a509d2463..61e696c324d 100644 --- a/debian/qgis.menu +++ b/debian/qgis.menu @@ -1,3 +1,3 @@ -?package(qgis):needs="X11" section="Apps"\ - icon="/usr/share/pixmaps/qgis-icon.png" title="QGIS"\ +?package(qgis):needs="X11" section="Applications/Science/Geoscience"\ + icon="/usr/share/pixmaps/qgis-icon.xpm" title="Quantum GIS"\ command="/usr/bin/qgis" diff --git a/debian/qgis.postinst.debhelper b/debian/qgis.postinst.debhelper deleted file mode 100644 index 8637a4e4475..00000000000 --- a/debian/qgis.postinst.debhelper +++ /dev/null @@ -1,5 +0,0 @@ -# Automatically added by dh_installmenu -if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then - update-menus -fi -# End automatically added section diff --git a/debian/qgis.postrm.debhelper b/debian/qgis.postrm.debhelper deleted file mode 100644 index 2b4be4f2702..00000000000 --- a/debian/qgis.postrm.debhelper +++ /dev/null @@ -1,3 +0,0 @@ -# Automatically added by dh_installmenu -if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi -# End automatically added section diff --git a/debian/rules b/debian/rules index 4f3734c920f..a9659e70f8b 100755 --- a/debian/rules +++ b/debian/rules @@ -25,20 +25,25 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif -CMakeCache.txt: CMakeLists.txt +debian/build/CMakeCache.txt: CMakeLists.txt dh_testdir # Add here commands to configure the package. uudecode -o $(CURDIR)/src/plugins/georeferencer/pencil.png $(CURDIR)/debian/pencil.uu - cmake -D CMAKE_INSTALL_PREFIX=/usr \ - . + [ -d debian/build ] || mkdir debian/build + [ ! -e CMakeCache.txt ] || rm CMakeCache.txt + cd debian/build; cmake \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_SKIP_RPATH=TRUE \ + -D BINDINGS_GLOBAL_INSTALL=TRUE \ + ../.. build: patch build-stamp -build-stamp: CMakeCache.txt +build-stamp: debian/build/CMakeCache.txt dh_testdir # Add here commands to compile the package. - $(MAKE) + $(MAKE) -C debian/build touch build-stamp @@ -51,9 +56,8 @@ clean-patched: rm -rf debian/tmp # Add here commands to clean up after the build process. - -$(MAKE) clean + rm -rf debian/build - rm -f CMakeCache.txt rm -f $(CURDIR)/src/plugins/georeferencer/pencil.png dh_clean @@ -65,11 +69,11 @@ install: build dh_installdirs # Add here commands to install the package into debian/tmp. - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + $(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/tmp # Install menu pixmap install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps - install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-icon.png + install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-icon.xpm # Build architecture-independent files here. binary-indep: build install @@ -83,11 +87,12 @@ binary-arch: build install dh_installdocs dh_installexamples dh_install --sourcedir=debian/tmp + dh_pycentral dh_installmenu dh_icons dh_desktop - dh_installman -pqgis debian/gridmaker.1 - dh_installman -plibqgis1-dev debian/qgis-config.1 + dh_installman -pqgis qgis.man + dh_installman -pqgis qgis_help.man dh_installmime -pqgis dh_link dh_strip diff --git a/python/plugins/plugin_installer/qgis_plugins.py b/python/plugins/plugin_installer/qgis_plugins.py index 28c3899ebd5..4b6330d58b5 100644 --- a/python/plugins/plugin_installer/qgis_plugins.py +++ b/python/plugins/plugin_installer/qgis_plugins.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python """ qgis_plugins.py author: Matthew Perry diff --git a/qgis.man b/qgis.man index 1bab7377a02..b92f6e82794 100644 --- a/qgis.man +++ b/qgis.man @@ -1,6 +1,6 @@ -.TH "Quantum GIS" 1 "October 2004" +.TH QGIS 1 "April 13, 2008" .SH NAME -Quantum GIS \- A Geographic Information System +qgis \- Quantum GIS Geographic Information System .SH SYNOPSIS .B qgis [--snapshot .I filename] @@ -11,6 +11,9 @@ Quantum GIS \- A Geographic Information System .B " [--project" .I projectfile] .br +.B " [--extent" +.I xmin,ymin,xmax,ymax] +.br .B " [--help]" .br .B " [file]..." diff --git a/qgis_help.man b/qgis_help.man new file mode 100644 index 00000000000..31a1161fb56 --- /dev/null +++ b/qgis_help.man @@ -0,0 +1,15 @@ +.TH QGIS_HELP 1 "April 13, 2008" +.SH NAME +qgis_help \- help viewer for qgis, the geographic data viewer +.SH SYNOPSIS +.B qgis_help [helpfile] +.br +.SH DESCRIPTION +.B qgis_help +is internally used by +.B qgis +to view help files. +.SH SEE ALSO +qgis(1) +.SH AUTHOR +This manual page was written by Jürgen Fischer . diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 969a88bc732..6820768cab7 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -112,7 +112,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} renderer symbology spatialindex/include - ${QT_QTSVG_INCLUDE_DIR} ${PROJ_INCLUDE_DIR} ${GEOS_INCLUDE_DIR} ${GDAL_INCLUDE_DIR} @@ -159,6 +158,10 @@ PATH_PREFIX(INDEX_SRC spatialindex ${SPINDEX_SRC}) ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${INDEX_SRC}) +SET_TARGET_PROPERTIES(qgis_core PROPERTIES + VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR} + SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}) + # make sure to create qgssvnversion.h before compiling ADD_DEPENDENCIES(qgis_core svnversion) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 7dc97cab378..688b14b5dda 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -65,6 +65,10 @@ ENDIF (WIN32) ADD_LIBRARY(qgis_gui SHARED ${QGIS_GUI_SRCS} ${QGIS_GUI_MOC_SRCS}) +SET_TARGET_PROPERTIES(qgis_gui PROPERTIES + VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR} + SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}) + # make sure that UI files will be processed first ADD_DEPENDENCIES(qgis_gui ui) diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt index bf05627c3f6..b3b3e7a3af0 100644 --- a/src/providers/grass/CMakeLists.txt +++ b/src/providers/grass/CMakeLists.txt @@ -32,6 +32,10 @@ INCLUDE_DIRECTORIES ( ADD_LIBRARY (qgisgrass SHARED ${GRASS_LIB_SRCS}) +SET_TARGET_PROPERTIES(qgisgrass PROPERTIES + VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR} + SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}) + IF (WIN32) SET_TARGET_PROPERTIES(qgisgrass PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=__declspec(dllexport)\"" ) ELSE (WIN32)