diff --git a/debian/changelog b/debian/changelog index 57a6cc02fcb..67ca8e4b62a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,22 @@ -qgis (1.0.0-1) experimental; urgency=low +qgis (1.1.0) UNRELEASED; urgency=low * gridmaker plugin removed from package * updated mime support + * sync with debian-gis debian/ tree + - introduce arch-independant qgis-comman and + qgis-plugin-grass-common + - policy updated to 3.8.0 + - join libqgis1-core and libqgis1-gui to libqgis1 + - add debian/watch + - dh_lintian overrides + - compat 5=>6 + - fix qgis.desktop + - fix license reference in copyright + * introduce arch-independant python-qgis-comman + * added sharedmimeinfo + * remove dpatch - -- Jürgen E. Fischer Sat, 31 Jan 2009 17:21:47 +0100 + -- Jürgen E. Fischer Fri, 13 Feb 2009 22:03:25 +0100 qgis (1.0.0) experimental; urgency=low diff --git a/debian/compat b/debian/compat index 7ed6ff82de6..1e8b3149621 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +6 diff --git a/debian/control b/debian/control index 68f9667d7c8..6bf92688158 100644 --- a/debian/control +++ b/debian/control @@ -2,21 +2,21 @@ Source: qgis Section: science Priority: extra Maintainer: Quantum GIS developers -Build-Depends: debhelper (>= 5.0.0), libgdal1-dev, libpq-dev, - libgeos-dev (>= 2.0.1-1), dpatch, grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, +Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, + libgeos-dev (>= 2.0.1), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python, sharutils, sip4 (>= 4.5), 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.1.0), python-qt4-dev (>=4.1.0), python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev, libsm-dev Build-Conflicts: libqgis1-dev -Standards-Version: 3.7.3 +Standards-Version: 3.8.0 XS-Python-Version: current Homepage: http://qgis.org/ Package: qgis Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version}) Recommends: qgis-plugin-grass, python-qgis Suggests: gpsbabel Conflicts: uim-qt3 @@ -29,42 +29,38 @@ Description: Geographic Information System (GIS) Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid, and USGS ASCII DEM. -Package: libqgis-core1 -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: qgis (<=0.9.2rc1) -Conflicts: libqgis1, uim-qt3 -Description: Quantum GIS - shared core library +Package: qgis-common +Architecture: all +Depends: qgis (= ${binary:Version}) +Description: Quantum GIS - architecture-independent data Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. . - This package contains the shared core library that provides an interface for - plugins. + This package contains architecture-independent supporting data files for use + with Quantum GIS. -Package: libqgis-gui1 +Package: libqgis1 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: qgis (<=0.9.2rc1) -Conflicts: libqgis1, uim-qt3 -Description: Quantum GIS - shared gui library +Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0 +Description: Quantum GIS - shared libraries Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. . - This package contains the shared gui library that provides an interface for - plugins. + This package contains the shared core and gui library that provide an + interface for plugins and stand-alone applications. Package: libqgis1-dev Architecture: any 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, +Depends: libqgis1 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev, + libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.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.1.0), python-qt4-dev (>=4.1.0), - qt4-designer (>=4.2.0), libqgis-gui1, libqgis-core1 -Provides: libqgis-dev -Conflicts: libqgis-dev, qgis-dev -Replaces: qgis-dev + qt4-designer (>=4.2.0) +Provides: libqgis-dev, qgis-dev +Replaces: libqgis-dev, qgis-dev Description: Quantum GIS - development files Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. @@ -74,10 +70,23 @@ Description: Quantum GIS - development files Package: qgis-plugin-grass Architecture: any -Depends: qgis (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.5.0-grass -Description: Plugin for accessing GRASS data from Quantum GIS - This plugin enables a GRASS data access toolbox in the Quantum GIS geographic - data viewer. +Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.5.0-grass +Description: GRASS plugin for Quantum GIS + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This plugin enables GRASS data access in the Quantum GIS geographic data + viewer. + +Package: qgis-plugin-grass-common +Architecture: all +Depends: qgis-plugin-grass (= ${binary:Version}) +Description: GRASS plugin for Quantum GIS - architecture-independent data + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This package contains architecture-independent supporting data files for use + with the Quantum GIS GRASS plugin. Package: python-qgis Section: python @@ -91,3 +100,16 @@ Description: Python bindings to Quantum GIS . This package contains the files for the Python support. +Package: python-qgis-common +Section: python +Architecture: all +Depends: python-qgis (= ${binary:Version}) +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Python bindings to Quantum GIS - architecture-independent files + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This package contains architecture-independent files for the Quantum GIS + Python bindings. + diff --git a/debian/copyright b/debian/copyright index b65d309fb1a..7244dca72b7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -21,4 +21,4 @@ Copyright: 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. + License can be found in the /usr/share/common-licenses/GPL-2 file. diff --git a/debian/libqgis-gui1.install b/debian/libqgis-gui1.install deleted file mode 100644 index 60205a819d9..00000000000 --- a/debian/libqgis-gui1.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libqgis_gui.so.* diff --git a/debian/libqgis-core1.install b/debian/libqgis1.install similarity index 50% rename from debian/libqgis-core1.install rename to debian/libqgis1.install index fdecba8685c..be2e0d822ae 100644 --- a/debian/libqgis-core1.install +++ b/debian/libqgis1.install @@ -1 +1,2 @@ usr/lib/libqgis_core.so.* +usr/lib/libqgis_gui.so.* diff --git a/debian/libqgis1.lintian-overrides b/debian/libqgis1.lintian-overrides new file mode 100644 index 00000000000..8f4b3462cfb --- /dev/null +++ b/debian/libqgis1.lintian-overrides @@ -0,0 +1,4 @@ +libqgis1: shlib-calls-exit +libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.1 +libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.1 +libqgis1: package-name-doesnt-match-sonames libqgis-core1.1 libqgis-gui1.1 diff --git a/debian/python-qgis-common.install b/debian/python-qgis-common.install new file mode 100644 index 00000000000..b747b75fec0 --- /dev/null +++ b/debian/python-qgis-common.install @@ -0,0 +1 @@ +usr/share/qgis/python/* diff --git a/debian/python-qgis.install b/debian/python-qgis.install index 056ef120884..656a5cab5ca 100644 --- a/debian/python-qgis.install +++ b/debian/python-qgis.install @@ -1,4 +1,3 @@ -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/python-qgis.lintian-overrides b/debian/python-qgis.lintian-overrides new file mode 100644 index 00000000000..a2030b2f3d6 --- /dev/null +++ b/debian/python-qgis.lintian-overrides @@ -0,0 +1,3 @@ +python-qgis: package-name-doesnt-match-sonames +python-qgis: non-dev-pkg-with-shlib-symlink +python-qgis: no-symbols-control-file usr/lib/libqgispython.so.1.1 diff --git a/debian/qgis-common.install b/debian/qgis-common.install new file mode 100644 index 00000000000..2402f210964 --- /dev/null +++ b/debian/qgis-common.install @@ -0,0 +1,12 @@ +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/AUTHORS +usr/share/qgis/doc/SPONSORS +usr/share/qgis/doc/images +usr/share/qgis/i18n/* +usr/share/qgis/images/* +usr/share/qgis/resources/* +usr/share/qgis/svg/* +usr/share/qgis/themes/* diff --git a/debian/qgis-common.sharedmimeinfo b/debian/qgis-common.sharedmimeinfo new file mode 100644 index 00000000000..972ac9e27dc --- /dev/null +++ b/debian/qgis-common.sharedmimeinfo @@ -0,0 +1,52 @@ + + + + + Quantum GIS Project + + + + + ESRI shape file + + + + + MapInfo file + + + + + Geographic Markup Language + + + + + GEOTiff + + + + + + JPEG compress raster data + + + + + + JPEG 2000 compress raster data + + + + + + ECW compressed raster data + + + + + MrSID compress raster data + + + + diff --git a/debian/qgis-plugin-grass-common.install b/debian/qgis-plugin-grass-common.install new file mode 100644 index 00000000000..3f69754294b --- /dev/null +++ b/debian/qgis-plugin-grass-common.install @@ -0,0 +1 @@ +usr/share/qgis/grass/* diff --git a/debian/qgis-plugin-grass.install b/debian/qgis-plugin-grass.install index ae835e38b5d..baa951c7114 100644 --- a/debian/qgis-plugin-grass.install +++ b/debian/qgis-plugin-grass.install @@ -1,4 +1,3 @@ usr/lib/qgis/libgrassplugin.so usr/lib/qgis/libgrassprovider.so -usr/lib/libqgisgrass.so* -usr/share/qgis/grass/* +usr/lib/libqgisgrass.so.* diff --git a/debian/qgis-plugin-grass.lintian-overrides b/debian/qgis-plugin-grass.lintian-overrides new file mode 100644 index 00000000000..4bb94d0455c --- /dev/null +++ b/debian/qgis-plugin-grass.lintian-overrides @@ -0,0 +1,3 @@ +qgis-plugin-grass: binary-without-manpage +qgis-plugin-grass: package-name-doesnt-match-sonames +qgis-plugin-grass: no-symbols-control-file usr/lib/libqgisgrass.so.1.1 diff --git a/debian/qgis-plugin-grass.postrm b/debian/qgis-plugin-grass.postrm index 00047a36fd1..e874e711f62 100755 --- a/debian/qgis-plugin-grass.postrm +++ b/debian/qgis-plugin-grass.postrm @@ -4,7 +4,8 @@ set -e if [ "$1" = "remove" ]; then dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis - ldconfig fi +#DEBHELPER# + exit 0 diff --git a/debian/qgis.desktop b/debian/qgis.desktop index 2a349c4b27e..e53fd4b361a 100644 --- a/debian/qgis.desktop +++ b/debian/qgis.desktop @@ -7,8 +7,7 @@ GenericName[de]=Geographisches Informationssystem Icon=qgis-icon TryExec=/usr/bin/qgis Exec=/usr/bin/qgis %F -Encoding=UTF-8 Terminal=false StartupNotify=false -Categories=Qt;Science;GIS;OSGeo; +Categories=Education;Geography;Qt; 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; diff --git a/debian/qgis.dirs b/debian/qgis.dirs deleted file mode 100644 index c1da623a901..00000000000 --- a/debian/qgis.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/pixmaps diff --git a/debian/qgis.install b/debian/qgis.install index 5abf31c009d..f94dabbbf6d 100644 --- a/debian/qgis.install +++ b/debian/qgis.install @@ -1,17 +1,4 @@ usr/bin/qgis_help -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/AUTHORS -usr/share/qgis/doc/SPONSORS -usr/share/qgis/doc/images -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 @@ -32,6 +19,9 @@ usr/lib/qgis/libdxf2shpconverterplugin.so usr/lib/qgis/libinterpolationplugin.so usr/lib/qgis/libogrconverterplugin.so usr/lib/qgis/libcoordinatecaptureplugin.so +usr/share/pixmaps/qgis-icon.xpm +usr/share/pixmaps/qgis-mime-icon.png +usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes ../qgis.desktop usr/share/applications ../qgis.xml usr/share/mime/packages ../mime/application/x-esri-shape.desktop usr/share/mimelnk/application @@ -43,5 +33,3 @@ usr/lib/qgis/libcoordinatecaptureplugin.so ../mime/application/x-qgis-project.desktop usr/share/mimelnk/application ../mime/application/x-raster-mrsid.desktop usr/share/mimelnk/application ../mime/application/x-qgis-layer-settings.desktop usr/share/mimelnk/application -usr/share/pixmaps/qgis-mime-icon.png -usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes diff --git a/debian/rules b/debian/rules index b521fe8395a..d7ad0f14db5 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make - # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -44,12 +42,11 @@ endif 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 [ -d debian/build ] || mkdir debian/build [ ! -e CMakeCache.txt ] || rm CMakeCache.txt cd debian/build; cmake $(CMAKE_OPTS) ../.. -build: patch build-stamp +build: build-stamp build-stamp: debian/build/CMakeCache.txt dh_testdir @@ -59,8 +56,7 @@ build-stamp: debian/build/CMakeCache.txt touch build-stamp -clean: clean-patched unpatch -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp @@ -70,8 +66,6 @@ clean-patched: # Add here commands to clean up after the build process. rm -rf debian/build - rm -f $(CURDIR)/src/plugins/georeferencer/pencil.png - dh_clean install: build @@ -87,6 +81,7 @@ install: build install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps + install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps # Build architecture-independent files here. binary-indep: build install @@ -115,6 +110,7 @@ binary-arch: build install dh_installman -pqgis qgis_help.man dh_installmime -pqgis dh_link + dh_lintian dh_strip dh_compress --exclude=pdf dh_fixperms diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000000..d8a1c41b60f --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://download.osgeo.org/qgis/src/qgis_(.*).tar.gz