[QGIS Commit] r10167 - in branches/Version-1_0/debian: . mime
mime/application
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Feb 13 19:27:08 EST 2009
Author: jef
Date: 2009-02-13 19:27:08 -0500 (Fri, 13 Feb 2009)
New Revision: 10167
Added:
branches/Version-1_0/debian/libqgis1.install
branches/Version-1_0/debian/libqgis1.lintian-overrides
branches/Version-1_0/debian/mime/
branches/Version-1_0/debian/mime/application/
branches/Version-1_0/debian/mime/application/x-adobe-mif.desktop
branches/Version-1_0/debian/mime/application/x-esri-crs.desktop
branches/Version-1_0/debian/mime/application/x-esri-shape.desktop
branches/Version-1_0/debian/mime/application/x-mapinfo-mif.desktop
branches/Version-1_0/debian/mime/application/x-qgis-layer-settings.desktop
branches/Version-1_0/debian/mime/application/x-qgis-project.desktop
branches/Version-1_0/debian/mime/application/x-raster-aig.desktop
branches/Version-1_0/debian/mime/application/x-raster-ecw.desktop
branches/Version-1_0/debian/mime/application/x-raster-mrsid.desktop
branches/Version-1_0/debian/python-qgis-common.install
branches/Version-1_0/debian/python-qgis.lintian-overrides
branches/Version-1_0/debian/qgis-common.install
branches/Version-1_0/debian/qgis-common.lintian-overrides
branches/Version-1_0/debian/qgis-common.sharedmimeinfo
branches/Version-1_0/debian/qgis-plugin-grass-common.install
branches/Version-1_0/debian/qgis-plugin-grass.lintian-overrides
branches/Version-1_0/debian/qgis.menu
branches/Version-1_0/debian/qgis.xml
branches/Version-1_0/debian/watch
Removed:
branches/Version-1_0/debian/libqgis-core1.install
branches/Version-1_0/debian/libqgis-gui1.install
branches/Version-1_0/debian/qgis.dirs
branches/Version-1_0/debian/qgis.menu
Modified:
branches/Version-1_0/debian/changelog
branches/Version-1_0/debian/compat
branches/Version-1_0/debian/control
branches/Version-1_0/debian/copyright
branches/Version-1_0/debian/python-qgis.install
branches/Version-1_0/debian/qgis-plugin-grass.install
branches/Version-1_0/debian/qgis-plugin-grass.postrm
branches/Version-1_0/debian/qgis.desktop
branches/Version-1_0/debian/qgis.install
branches/Version-1_0/debian/rules
Log:
update debian packaging
Modified: branches/Version-1_0/debian/changelog
===================================================================
--- branches/Version-1_0/debian/changelog 2009-02-14 00:26:03 UTC (rev 10166)
+++ branches/Version-1_0/debian/changelog 2009-02-14 00:27:08 UTC (rev 10167)
@@ -1,3 +1,22 @@
+qgis (1.0.1) experimental; urgency=low
+
+ * upstream bugfix release
+ * 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 <jef at norbit.de> Fri, 13 Feb 2009 21:08:52 +0100
+
qgis (1.0.0) experimental; urgency=low
* new upstream release
Modified: branches/Version-1_0/debian/compat
===================================================================
--- branches/Version-1_0/debian/compat 2009-02-14 00:26:03 UTC (rev 10166)
+++ branches/Version-1_0/debian/compat 2009-02-14 00:27:08 UTC (rev 10167)
@@ -1 +1 @@
-5
+6
Modified: branches/Version-1_0/debian/control
===================================================================
--- branches/Version-1_0/debian/control 2009-02-14 00:26:03 UTC (rev 10166)
+++ branches/Version-1_0/debian/control 2009-02-14 00:27:08 UTC (rev 10167)
@@ -2,69 +2,65 @@
Section: science
Priority: extra
Maintainer: Quantum GIS developers <qgis-developer at lists.osgeo.org>
-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
Description: Geographic Information System (GIS)
A Geographic Information System (GIS) manages, analyzes, and displays
- databases of geographic information. Quantum GIS (QGIS) supports shapefile
+ databases of geographic information. Quantum GIS (QGIS) supports shape file
viewing and editing, spatial data storage with PostgreSQL/PostGIS, projection
on-the-fly, map composition, and a number of other features via a plugin
interface. QGIS also supports display of various georeferenced raster and
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,11 +70,24 @@
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
Architecture: any
@@ -91,3 +100,16 @@
.
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.
+
Modified: branches/Version-1_0/debian/copyright
===================================================================
--- branches/Version-1_0/debian/copyright 2009-02-14 00:26:03 UTC (rev 10166)
+++ branches/Version-1_0/debian/copyright 2009-02-14 00:27:08 UTC (rev 10167)
@@ -21,4 +21,4 @@
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.
Deleted: branches/Version-1_0/debian/libqgis-core1.install
===================================================================
--- branches/Version-1_0/debian/libqgis-core1.install 2009-02-14 00:26:03 UTC (rev 10166)
+++ branches/Version-1_0/debian/libqgis-core1.install 2009-02-14 00:27:08 UTC (rev 10167)
@@ -1 +0,0 @@
-usr/lib/libqgis_core.so.*
Deleted: branches/Version-1_0/debian/libqgis-gui1.install
===================================================================
--- branches/Version-1_0/debian/libqgis-gui1.install 2009-02-14 00:26:03 UTC (rev 10166)
+++ branches/Version-1_0/debian/libqgis-gui1.install 2009-02-14 00:27:08 UTC (rev 10167)
@@ -1 +0,0 @@
-usr/lib/libqgis_gui.so.*
Added: branches/Version-1_0/debian/libqgis1.install
===================================================================
--- branches/Version-1_0/debian/libqgis1.install (rev 0)
+++ branches/Version-1_0/debian/libqgis1.install 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,2 @@
+usr/lib/libqgis_core.so.*
+usr/lib/libqgis_gui.so.*
Added: branches/Version-1_0/debian/libqgis1.lintian-overrides
===================================================================
--- branches/Version-1_0/debian/libqgis1.lintian-overrides (rev 0)
+++ branches/Version-1_0/debian/libqgis1.lintian-overrides 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,4 @@
+libqgis1: shlib-calls-exit
+libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.0
+libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.0
+libqgis1: package-name-doesnt-match-sonames libqgis-core1.0 libqgis-gui1.0
Added: branches/Version-1_0/debian/mime/application/x-adobe-mif.desktop
===================================================================
--- branches/Version-1_0/debian/mime/application/x-adobe-mif.desktop (rev 0)
+++ branches/Version-1_0/debian/mime/application/x-adobe-mif.desktop 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-adobe-mif
+Hidden=false
+Comment=Adobe FrameMaker MIF file
+Patterns=*.mif;
+X-KDE-PatternsAccuracy=51
+X-KDE-IsAlso=application/x-mif
Added: branches/Version-1_0/debian/mime/application/x-esri-crs.desktop
===================================================================
--- branches/Version-1_0/debian/mime/application/x-esri-crs.desktop (rev 0)
+++ branches/Version-1_0/debian/mime/application/x-esri-crs.desktop 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-esri-crs
+Hidden=false
+Comment=ESRI coordinate reference system
+Comment[de]=ESRI-Koordinatenbezugssystem
+Icon=qgis-mime-icon
+Patterns=*.prj;
Added: branches/Version-1_0/debian/mime/application/x-esri-shape.desktop
===================================================================
--- branches/Version-1_0/debian/mime/application/x-esri-shape.desktop (rev 0)
+++ branches/Version-1_0/debian/mime/application/x-esri-shape.desktop 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-esri-shape
+Hidden=false
+Comment=ESRI shape file
+Comment[de]=ESRI-Shapedatei
+Icon=qgis-mime-icon
+Patterns=*.shp;*.shx;
Added: branches/Version-1_0/debian/mime/application/x-mapinfo-mif.desktop
===================================================================
--- branches/Version-1_0/debian/mime/application/x-mapinfo-mif.desktop (rev 0)
+++ branches/Version-1_0/debian/mime/application/x-mapinfo-mif.desktop 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-mapinfo-mif
+Hidden=false
+Comment=MapInfo file
+Comment[de]=MapInfo-Datei
+Patterns=*.mif;
+Icon=qgis-mime-icon
+X-KDE-PatternsAccuracy=60
Added: branches/Version-1_0/debian/mime/application/x-qgis-layer-settings.desktop
===================================================================
--- branches/Version-1_0/debian/mime/application/x-qgis-layer-settings.desktop (rev 0)
+++ branches/Version-1_0/debian/mime/application/x-qgis-layer-settings.desktop 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-qgis-layer-settings
+Hidden=false
+Comment=Quantum GIS layer settings
+Comment[de]=Quantum GIS Layer Einstellungen
+Icon=qgis-mime-icon
+Patterns=*.qml;
Added: branches/Version-1_0/debian/mime/application/x-qgis-project.desktop
===================================================================
--- branches/Version-1_0/debian/mime/application/x-qgis-project.desktop (rev 0)
+++ branches/Version-1_0/debian/mime/application/x-qgis-project.desktop 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-qgis-project
+Hidden=false
+Comment=Quantum GIS Project
+Comment[de]=Quantum GIS-Projekt
+Patterns=*.qgs;
+Icon=qgis-mime-icon
+X-KDE-IsAlso=application/x-qgis
Added: branches/Version-1_0/debian/mime/application/x-raster-aig.desktop
===================================================================
--- branches/Version-1_0/debian/mime/application/x-raster-aig.desktop (rev 0)
+++ branches/Version-1_0/debian/mime/application/x-raster-aig.desktop 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-raster-aig
+Hidden=false
+Comment=AIG raster data
+Comment[de]=AIG-Rasterdaten
+Icon=qgis-mime-icon
+Patterns=*.aig;
Added: branches/Version-1_0/debian/mime/application/x-raster-ecw.desktop
===================================================================
--- branches/Version-1_0/debian/mime/application/x-raster-ecw.desktop (rev 0)
+++ branches/Version-1_0/debian/mime/application/x-raster-ecw.desktop 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-raster-ecw
+Hidden=false
+Comment=ECW raster data
+Comment[de]=ECW-Rasterdaten
+Icon=qgis-mime-icon
+Patterns=*.ecw;
Added: branches/Version-1_0/debian/mime/application/x-raster-mrsid.desktop
===================================================================
--- branches/Version-1_0/debian/mime/application/x-raster-mrsid.desktop (rev 0)
+++ branches/Version-1_0/debian/mime/application/x-raster-mrsid.desktop 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-raster-mrsid
+Hidden=false
+Comment=MrSID raster data
+Comment[de]=MrSID-Rasterdaten
+Icon=qgis-mime-icon
+Patterns=*.sid;
Added: branches/Version-1_0/debian/python-qgis-common.install
===================================================================
--- branches/Version-1_0/debian/python-qgis-common.install (rev 0)
+++ branches/Version-1_0/debian/python-qgis-common.install 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1 @@
+usr/share/qgis/python/*
Modified: branches/Version-1_0/debian/python-qgis.install
===================================================================
--- branches/Version-1_0/debian/python-qgis.install 2009-02-14 00:26:03 UTC (rev 10166)
+++ branches/Version-1_0/debian/python-qgis.install 2009-02-14 00:27:08 UTC (rev 10167)
@@ -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
Added: branches/Version-1_0/debian/python-qgis.lintian-overrides
===================================================================
--- branches/Version-1_0/debian/python-qgis.lintian-overrides (rev 0)
+++ branches/Version-1_0/debian/python-qgis.lintian-overrides 2009-02-14 00:27:08 UTC (rev 10167)
@@ -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.0
Added: branches/Version-1_0/debian/qgis-common.install
===================================================================
--- branches/Version-1_0/debian/qgis-common.install (rev 0)
+++ branches/Version-1_0/debian/qgis-common.install 2009-02-14 00:27:08 UTC (rev 10167)
@@ -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/*
Added: branches/Version-1_0/debian/qgis-common.lintian-overrides
===================================================================
--- branches/Version-1_0/debian/qgis-common.lintian-overrides (rev 0)
+++ branches/Version-1_0/debian/qgis-common.lintian-overrides 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1 @@
+qgis-common: desktop-command-not-in-package
Added: branches/Version-1_0/debian/qgis-common.sharedmimeinfo
===================================================================
--- branches/Version-1_0/debian/qgis-common.sharedmimeinfo (rev 0)
+++ branches/Version-1_0/debian/qgis-common.sharedmimeinfo 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+ <mime-type type="application/x-qgis">
+ <comment xml:lang="en">Quantum GIS Project</comment>
+ <glob pattern="*.qgs"/>
+ </mime-type>
+
+ <mime-type type="application/shapefile">
+ <comment xml:lang="en">ESRI shape file</comment>
+ <glob pattern="*.shp"/>
+ </mime-type>
+
+ <mime-type type="application/mif">
+ <comment xml:lang="en">MapInfo file</comment>
+ <glob pattern="*.mif"/>
+ </mime-type>
+
+ <mime-type type="application/gml">
+ <comment xml:lang="en">Geographic Markup Language</comment>
+ <glob pattern="*.gml"/>
+ </mime-type>
+
+ <mime-type type="image/geotiff">
+ <comment xml:lang="en">GEOTiff</comment>
+ <glob pattern="*.tif"/>
+ <glob pattern="*.tiff"/>
+ </mime-type>
+
+ <mime-type type="image/jpeg">
+ <comment xml:lang="en">JPEG compress raster data</comment>
+ <glob pattern="*.jpg"/>
+ <glob pattern="*.jpeg"/>
+ </mime-type>
+
+ <mime-type type="image/jp2">
+ <comment xml:lang="en">JPEG 2000 compress raster data</comment>
+ <glob pattern="*.jp2"/>
+ <glob pattern="*.j2k"/>
+ </mime-type>
+
+ <mime-type type="image/ecw">
+ <comment xml:lang="en">ECW compressed raster data</comment>
+ <glob pattern="*.ecw"/>
+ </mime-type>
+
+ <mime-type type="image/sid">
+ <comment xml:lang="en">MrSID compress raster data</comment>
+ <glob pattern="*.sid"/>
+ </mime-type>
+
+</mime-info>
Property changes on: branches/Version-1_0/debian/qgis-common.sharedmimeinfo
___________________________________________________________________
Name: svn:mergeinfo
+
Added: branches/Version-1_0/debian/qgis-plugin-grass-common.install
===================================================================
--- branches/Version-1_0/debian/qgis-plugin-grass-common.install (rev 0)
+++ branches/Version-1_0/debian/qgis-plugin-grass-common.install 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1 @@
+usr/share/qgis/grass/*
Modified: branches/Version-1_0/debian/qgis-plugin-grass.install
===================================================================
--- branches/Version-1_0/debian/qgis-plugin-grass.install 2009-02-14 00:26:03 UTC (rev 10166)
+++ branches/Version-1_0/debian/qgis-plugin-grass.install 2009-02-14 00:27:08 UTC (rev 10167)
@@ -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.*
Added: branches/Version-1_0/debian/qgis-plugin-grass.lintian-overrides
===================================================================
--- branches/Version-1_0/debian/qgis-plugin-grass.lintian-overrides (rev 0)
+++ branches/Version-1_0/debian/qgis-plugin-grass.lintian-overrides 2009-02-14 00:27:08 UTC (rev 10167)
@@ -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.0
Modified: branches/Version-1_0/debian/qgis-plugin-grass.postrm
===================================================================
--- branches/Version-1_0/debian/qgis-plugin-grass.postrm 2009-02-14 00:26:03 UTC (rev 10166)
+++ branches/Version-1_0/debian/qgis-plugin-grass.postrm 2009-02-14 00:27:08 UTC (rev 10167)
@@ -4,7 +4,8 @@
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
Modified: branches/Version-1_0/debian/qgis.desktop
===================================================================
--- branches/Version-1_0/debian/qgis.desktop 2009-02-14 00:26:03 UTC (rev 10166)
+++ branches/Version-1_0/debian/qgis.desktop 2009-02-14 00:27:08 UTC (rev 10167)
@@ -9,18 +9,5 @@
Exec=/usr/bin/qgis %F
Terminal=false
StartupNotify=false
-Categories=Qt;Science;GIS;OSGeo;
-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;
-[Desktop Entry]
-Type=Application
-Name=Quantum GIS
-Version=1.0
-GenericName=Geographical Information System
-GenericName[de]=Geographisches Informationssystem
-Icon=qgis-icon
-TryExec=/usr/bin/qgis
-Exec=/usr/bin/qgis %F
-Terminal=false
-StartupNotify=false
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;
Deleted: branches/Version-1_0/debian/qgis.dirs
===================================================================
--- branches/Version-1_0/debian/qgis.dirs 2009-02-14 00:26:03 UTC (rev 10166)
+++ branches/Version-1_0/debian/qgis.dirs 2009-02-14 00:27:08 UTC (rev 10167)
@@ -1 +0,0 @@
-usr/share/pixmaps
Modified: branches/Version-1_0/debian/qgis.install
===================================================================
--- branches/Version-1_0/debian/qgis.install 2009-02-14 00:26:03 UTC (rev 10166)
+++ branches/Version-1_0/debian/qgis.install 2009-02-14 00:27:08 UTC (rev 10167)
@@ -1,18 +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/qgis/doc/userguide.pdf 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
@@ -34,6 +20,9 @@
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
Deleted: branches/Version-1_0/debian/qgis.menu
===================================================================
--- branches/Version-1_0/debian/qgis.menu 2009-02-14 00:26:03 UTC (rev 10166)
+++ branches/Version-1_0/debian/qgis.menu 2009-02-14 00:27:08 UTC (rev 10167)
@@ -1,3 +0,0 @@
-?package(qgis):needs="X11" section="Applications/Science/Geoscience"\
- icon="/usr/share/pixmaps/qgis-icon.xpm" title="Quantum GIS"\
- command="/usr/bin/qgis"
Added: branches/Version-1_0/debian/qgis.menu
===================================================================
--- branches/Version-1_0/debian/qgis.menu (rev 0)
+++ branches/Version-1_0/debian/qgis.menu 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,3 @@
+?package(qgis):needs="X11" section="Applications/Science/Geoscience"\
+ icon="/usr/share/pixmaps/qgis-icon.xpm" title="Quantum GIS"\
+ command="/usr/bin/qgis"
Property changes on: branches/Version-1_0/debian/qgis.menu
___________________________________________________________________
Name: svn:mergeinfo
+
Added: branches/Version-1_0/debian/qgis.xml
===================================================================
--- branches/Version-1_0/debian/qgis.xml (rev 0)
+++ branches/Version-1_0/debian/qgis.xml 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+
+ <mime-type type="application/x-qgis-project">
+ <comment>Quantum GIS Project</comment>
+ <comment xml:lang="de">Quantum GIS-Projekt</comment>
+ <sub-class-of type="application/xml"/>
+ <alias type="application/x-qgis"/>
+ <icon name="qgis-mime-icon.png"/>
+ <magic priority="50">
+ <match type="string" offset="0" value="<!DOCTYPE qgis">
+ <match type="string" offset="0:256" value="<qgis projectname"/>
+ </match>
+ </magic>
+ <glob pattern="*.qgs"/>
+ </mime-type>
+
+ <mime-type type="application/x-qgis-layer-settings">
+ <comment>Quantum GIS layer settings</comment>
+ <comment xml:lang="de">Quantum GIS Layer Einstellungen</comment>
+ <sub-class-of type="application/xml"/>
+ <icon name="qgis-mime-icon.png"/>
+ <magic priority="50">
+ <match type="string" offset="0" value="<!DOCTYPE qgis">
+ <match type="string" offset="0:256" value="<qgis version"/>
+ </match>
+ </magic>
+ <glob pattern="*.qml"/>
+ </mime-type>
+
+ <mime-type type="application/x-esri-shape">
+ <comment>ESRI shape file</comment>
+ <comment xml:lang="de">ESRI-Shapedatei</comment>
+ <icon name="qgis-mime-icon.png"/>
+ <magic priority="100">
+ <match type="big32" offset="0" value="9994">
+ <match type="big32" offset="4" value="0">
+ <match type="big32" offset="8" value="0">
+ <match type="big32" offset="12" value="0">
+ <match type="big32" offset="16" value="0">
+ <match type="big32" offset="20" value="0">
+ <match type="big32" offset="28" value="1000"/>
+ </match>
+ </match>
+ </match>
+ </match>
+ </match>
+ </match>
+ </magic>
+ <glob pattern="*.shp"/>
+ <glob pattern="*.shx"/>
+ </mime-type>
+
+ <mime-type type="application/x-esri-crs">
+ <comment>ESRI coordinate reference system</comment>
+ <comment xml:lang="de">ESRI-Koordinatenreferenzsystem</comment>
+ <icon name="qgis-mime-icon.png"/>
+ <magic>
+ <match type="string" offset="0" value="GEOGCS["/>
+ <match type="string" offset="0" value="PROJCS["/>
+ <match type="string" offset="0" value="LOCAL_CS["/>
+ </magic>
+ <glob pattern="*.prj"/>
+ </mime-type>
+
+ <mime-type type="image/tiff">
+ <comment>TIFF raster data</comment>
+ <comment xml:lang="de">TIFF-Rasterdaten</comment>
+ <icon name="qgis-mime-icon.png"/>
+ <magic priority="50">
+ <match type="string" offset="0" value="MM">
+ <match type="little16" offset="2" value="42"/>
+ </match>
+ <match type="string" offset="0" value="MM">
+ <match type="big16" offset="2" value="42"/>
+ </match>
+ </magic>
+ <glob pattern="*.tiff"/>
+ <glob pattern="*.tif"/>
+ </mime-type>
+
+ <mime-type type="image/jpeg">
+ <comment>JPEG raster data</comment>
+ <comment xml:lang="de">JPEG-Rasterdaten</comment>
+ <icon name="qgis-mime-icon.png"/>
+ <magic priority="50">
+ <match type="big16" offset="0" value="65496"/>
+ </magic>
+ <glob pattern="*.jpeg"/>
+ <glob pattern="*.jpg"/>
+ </mime-type>
+
+ <mime-type type="image/jp2">
+ <comment>JPEG2000 raster data</comment>
+ <comment xml:lang="de">JPEG2000-Rasterdaten</comment>
+ <icon name="qgis-mime-icon.png"/>
+ <magic priority="50">
+ <match type="little32" offset="0" value="12">
+ <match type="string" offset="8" value="jP">
+ <match type="byte" offset="10" value="32">
+ <match type="byte" offset="11" value="32">
+ <match type="byte" offset="12" value="13">
+ <match type="byte" offset="13" value="10">
+ <match type="byte" offset="14" value="135">
+ <match type="byte" offset="13" value="10"/>
+ </match>
+ </match>
+ </match>
+ </match>
+ </match>
+ </match>
+ </match>
+ </magic>
+ <glob pattern="*.jp2"/>
+ <glob pattern="*.j2k"/>
+ </mime-type>
+
+ <mime-type type="application/x-raster-aig">
+ <comment>AIG raster data</comment>
+ <comment xml:lang="de">AIG-Rasterdaten</comment>
+ <icon name="qgis-mime-icon.png"/>
+ <glob pattern="*.aig"/>
+ </mime-type>
+
+ <mime-type type="application/x-raster-ecw">
+ <comment>ECW raster data</comment>
+ <comment xml:lang="de">ECW-Rasterdaten</comment>
+ <icon name="qgis-mime-icon.png"/>
+ <glob pattern="*.ecw"/>
+ </mime-type>
+
+ <mime-type type="application/x-raster-mrsid">
+ <comment>MrSID raster data</comment>
+ <comment xml:lang="de">MrSID-Rasterdaten</comment>
+ <icon name="qgis-mime-icon.png"/>
+ <glob pattern="*.sid"/>
+ </mime-type>
+
+ <mime-type type="application/x-mapinfo-mif">
+ <comment>MapInfo file</comment>
+ <comment xml:lang="de">MapInfo-Datei</comment>
+ <icon name="qgis-mime-icon.png"/>
+ <magic priority="51">
+ <match type="string" offset="0" value="VERSION">
+ <match type="string" offset="0:512" value="COLUMNS"/>
+ <match type="string" offset="0:512" value="DATA">
+ </match>
+ </match>
+ </magic>
+ <glob weight="60" pattern="*.mif"/>
+ </mime-type>
+
+ <!-- .mif is just not good enough -->
+ <mime-type type="application/x-adobe-mif">
+ <alias type="application/x-mif"/>
+ <comment>Adobe FrameMaker MIF file</comment>
+ <magic priority="100">
+ <match type="string" offset="0" value="<MIFFile"/>
+ </magic>
+ <glob weight="51" pattern="*.mif"/>
+ </mime-type>
+
+</mime-info>
Modified: branches/Version-1_0/debian/rules
===================================================================
--- branches/Version-1_0/debian/rules 2009-02-14 00:26:03 UTC (rev 10166)
+++ branches/Version-1_0/debian/rules 2009-02-14 00:27:08 UTC (rev 10167)
@@ -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)
@@ -38,12 +36,11 @@
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
@@ -53,8 +50,7 @@
touch build-stamp
-clean: clean-patched unpatch
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -64,8 +60,6 @@
# 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
@@ -79,7 +73,9 @@
# 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.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-icon.xpm
+ 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
@@ -108,6 +104,7 @@
dh_installman -pqgis qgis_help.man
dh_installmime -pqgis
dh_link
+ dh_lintian
dh_strip
dh_compress --exclude=pdf
dh_fixperms
Added: branches/Version-1_0/debian/watch
===================================================================
--- branches/Version-1_0/debian/watch (rev 0)
+++ branches/Version-1_0/debian/watch 2009-02-14 00:27:08 UTC (rev 10167)
@@ -0,0 +1,2 @@
+version=3
+http://download.osgeo.org/qgis/src/qgis_(.*).tar.gz
More information about the QGIS-commit
mailing list