Skip to content

Commit 02735f6

Browse files
author
jef
committed
update desktop integration in debian package
git-svn-id: http://svn.osgeo.org/qgis/trunk@10073 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 9e67c9d commit 02735f6

12 files changed

+31
-2
lines changed

debian/changelog

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
qgis (1.0.0-1) experimental; urgency=low
22

33
* gridmaker plugin removed from package
4+
* updated mime support
45

56
-- Jürgen E. Fischer <jef@norbit.de> Sat, 31 Jan 2009 17:21:47 +0100
67

debian/mime/application/x-esri-crs.desktop

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ Type=MimeType
33
MimeType=application/x-esri-crs
44
Hidden=false
55
Comment=ESRI coordinate reference system
6-
Comment[de]=ESRI-Koordinatenreferenzsystem
6+
Comment[de]=ESRI-Koordinatenbezugssystem
7+
Icon=qgis-mime-icon
78
Patterns=*.prj;

debian/mime/application/x-esri-shape.desktop

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ MimeType=application/x-esri-shape
44
Hidden=false
55
Comment=ESRI shape file
66
Comment[de]=ESRI-Shapedatei
7+
Icon=qgis-mime-icon
78
Patterns=*.shp;*.shx;

debian/mime/application/x-mapinfo-mif.desktop

+1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ Hidden=false
55
Comment=MapInfo file
66
Comment[de]=MapInfo-Datei
77
Patterns=*.mif;
8+
Icon=qgis-mime-icon
89
X-KDE-PatternsAccuracy=60

debian/mime/application/x-qgis-layer-settings.desktop

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ MimeType=application/x-qgis-layer-settings
44
Hidden=false
55
Comment=Quantum GIS layer settings
66
Comment[de]=Quantum GIS Layer Einstellungen
7+
Icon=qgis-mime-icon
78
Patterns=*.qml;

debian/mime/application/x-qgis-project.desktop

+1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ Hidden=false
55
Comment=Quantum GIS Project
66
Comment[de]=Quantum GIS-Projekt
77
Patterns=*.qgs;
8+
Icon=qgis-mime-icon
89
X-KDE-IsAlso=application/x-qgis

debian/mime/application/x-raster-aig.desktop

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ MimeType=application/x-raster-aig
44
Hidden=false
55
Comment=AIG raster data
66
Comment[de]=AIG-Rasterdaten
7+
Icon=qgis-mime-icon
78
Patterns=*.aig;

debian/mime/application/x-raster-ecw.desktop

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ MimeType=application/x-raster-ecw
44
Hidden=false
55
Comment=ECW raster data
66
Comment[de]=ECW-Rasterdaten
7+
Icon=qgis-mime-icon
78
Patterns=*.ecw;

debian/mime/application/x-raster-mrsid.desktop

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ MimeType=application/x-raster-mrsid
44
Hidden=false
55
Comment=MrSID raster data
66
Comment[de]=MrSID-Rasterdaten
7+
Icon=qgis-mime-icon
78
Patterns=*.sid;

debian/qgis.install

+2
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,5 @@ usr/lib/qgis/libcoordinatecaptureplugin.so
4343
../mime/application/x-qgis-project.desktop usr/share/mimelnk/application
4444
../mime/application/x-raster-mrsid.desktop usr/share/mimelnk/application
4545
../mime/application/x-qgis-layer-settings.desktop usr/share/mimelnk/application
46+
usr/share/pixmaps/qgis-mime-icon.png
47+
usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes

debian/qgis.xml

+11
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<comment xml:lang="de">Quantum GIS-Projekt</comment>
77
<sub-class-of type="application/xml"/>
88
<alias type="application/x-qgis"/>
9+
<icon name="qgis-mime-icon.png"/>
910
<magic priority="50">
1011
<match type="string" offset="0" value="&lt;!DOCTYPE qgis">
1112
<match type="string" offset="0:256" value="&lt;qgis projectname"/>
@@ -18,6 +19,7 @@
1819
<comment>Quantum GIS layer settings</comment>
1920
<comment xml:lang="de">Quantum GIS Layer Einstellungen</comment>
2021
<sub-class-of type="application/xml"/>
22+
<icon name="qgis-mime-icon.png"/>
2123
<magic priority="50">
2224
<match type="string" offset="0" value="&lt;!DOCTYPE qgis">
2325
<match type="string" offset="0:256" value="&lt;qgis version"/>
@@ -29,6 +31,7 @@
2931
<mime-type type="application/x-esri-shape">
3032
<comment>ESRI shape file</comment>
3133
<comment xml:lang="de">ESRI-Shapedatei</comment>
34+
<icon name="qgis-mime-icon.png"/>
3235
<magic priority="100">
3336
<match type="big32" offset="0" value="9994">
3437
<match type="big32" offset="4" value="0">
@@ -51,6 +54,7 @@
5154
<mime-type type="application/x-esri-crs">
5255
<comment>ESRI coordinate reference system</comment>
5356
<comment xml:lang="de">ESRI-Koordinatenreferenzsystem</comment>
57+
<icon name="qgis-mime-icon.png"/>
5458
<magic>
5559
<match type="string" offset="0" value="GEOGCS["/>
5660
<match type="string" offset="0" value="PROJCS["/>
@@ -62,6 +66,7 @@
6266
<mime-type type="image/tiff">
6367
<comment>TIFF raster data</comment>
6468
<comment xml:lang="de">TIFF-Rasterdaten</comment>
69+
<icon name="qgis-mime-icon.png"/>
6570
<magic priority="50">
6671
<match type="string" offset="0" value="MM">
6772
<match type="little16" offset="2" value="42"/>
@@ -77,6 +82,7 @@
7782
<mime-type type="image/jpeg">
7883
<comment>JPEG raster data</comment>
7984
<comment xml:lang="de">JPEG-Rasterdaten</comment>
85+
<icon name="qgis-mime-icon.png"/>
8086
<magic priority="50">
8187
<match type="big16" offset="0" value="65496"/>
8288
</magic>
@@ -87,6 +93,7 @@
8793
<mime-type type="image/jp2">
8894
<comment>JPEG2000 raster data</comment>
8995
<comment xml:lang="de">JPEG2000-Rasterdaten</comment>
96+
<icon name="qgis-mime-icon.png"/>
9097
<magic priority="50">
9198
<match type="little32" offset="0" value="12">
9299
<match type="string" offset="8" value="jP">
@@ -111,24 +118,28 @@
111118
<mime-type type="application/x-raster-aig">
112119
<comment>AIG raster data</comment>
113120
<comment xml:lang="de">AIG-Rasterdaten</comment>
121+
<icon name="qgis-mime-icon.png"/>
114122
<glob pattern="*.aig"/>
115123
</mime-type>
116124

117125
<mime-type type="application/x-raster-ecw">
118126
<comment>ECW raster data</comment>
119127
<comment xml:lang="de">ECW-Rasterdaten</comment>
128+
<icon name="qgis-mime-icon.png"/>
120129
<glob pattern="*.ecw"/>
121130
</mime-type>
122131

123132
<mime-type type="application/x-raster-mrsid">
124133
<comment>MrSID raster data</comment>
125134
<comment xml:lang="de">MrSID-Rasterdaten</comment>
135+
<icon name="qgis-mime-icon.png"/>
126136
<glob pattern="*.sid"/>
127137
</mime-type>
128138

129139
<mime-type type="application/x-mapinfo-mif">
130140
<comment>MapInfo file</comment>
131141
<comment xml:lang="de">MapInfo-Datei</comment>
142+
<icon name="qgis-mime-icon.png"/>
132143
<magic priority="51">
133144
<match type="string" offset="0" value="VERSION">
134145
<match type="string" offset="0:512" value="COLUMNS"/>

debian/rules

+8-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
3535
MAKEFLAGS += VERBOSE=YES
3636
endif
3737

38+
ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS)))
39+
CFLAGS += -pg
40+
CXXFLAGS += -pg
41+
LDFLAGS += -pg
42+
endif
43+
3844
debian/build/CMakeCache.txt: CMakeLists.txt
3945
dh_testdir
4046
# Add here commands to configure the package.
@@ -79,7 +85,8 @@ install: build
7985

8086
# Install menu pixmap
8187
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
82-
install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-icon.xpm
88+
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
89+
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
8390

8491
# Build architecture-independent files here.
8592
binary-indep: build install

0 commit comments

Comments
 (0)