Skip to content

Commit f261270

Browse files
jef-njef-n
committed
debian packaging update (fixes #12954)
1 parent 084c455 commit f261270

26 files changed

+468
-3
lines changed

‎debian/changelog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ qgis (2.9.0) UNRELEASED; urgency=medium
66
* merge downstream addition of debug package
77
* make build directory configurable
88
* include links to qt4 documentation in api docs
9+
* include browser icons
910

10-
-- Jürgen E. Fischer <jef@norbit.de> Tue, 02 Jun 2015 22:54:19 +0200
11+
-- Jürgen E. Fischer <jef@norbit.de> Sun, 14 Jun 2015 22:35:11 +0200
1112

1213
qgis (2.8.0) unstable; urgency=medium
1314

‎debian/qbrowser-icon.xpm

Lines changed: 232 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,232 @@
1+
/* XPM */
2+
static char *qbrowser_icon[] = {
3+
/* columns rows colors chars-per-pixel */
4+
"32 32 194 2 ",
5+
" c #0B953EA40070",
6+
". c #0CA44351000B",
7+
"X c #0C034C020008",
8+
"o c #108444CE01AE",
9+
"O c #15524F3B0BA7",
10+
"+ c #14DB4888078E",
11+
"@ c #0C7B542F0010",
12+
"# c #054758750000",
13+
"$ c #0C845C090021",
14+
"% c #065656340000",
15+
"& c #122A535303A9",
16+
"* c #12175B1B0413",
17+
"= c #17DE5D490617",
18+
"- c #1F9D58D1089C",
19+
"; c #220852A40910",
20+
": c #29C35CDF0D65",
21+
"> c #261E4CBA1C6D",
22+
", c #22FA5579173C",
23+
"< c #0DB162A5016C",
24+
"1 c #0B426A9B01CD",
25+
"2 c #116C640E045E",
26+
"3 c #10836A3704AE",
27+
"4 c #173C673309EE",
28+
"5 c #1C09641A09F2",
29+
"6 c #1D396A530BC9",
30+
"7 c #231D66060D53",
31+
"8 c #2D8865250F19",
32+
"9 c #233869A00F0C",
33+
"0 c #24146BFF111D",
34+
"q c #2B5768BF13A1",
35+
"w c #37B26B58138F",
36+
"e c #2C00754A1971",
37+
"r c #26E678F018C1",
38+
"t c #3B51754C16C8",
39+
"y c #361978501BF7",
40+
"u c #36707591199F",
41+
"i c #37BC56E22FBB",
42+
"p c #2EA0790A243B",
43+
"a c #36157EBA22AE",
44+
"s c #3CFA7D9433A5",
45+
"d c #421F7458187E",
46+
"f c #4B9578E01C7F",
47+
"g c #43EB61613C9F",
48+
"h c #43666477285D",
49+
"j c #48B2740D4025",
50+
"k c #50DF7C6448BD",
51+
"l c #68AD7A1A6420",
52+
"z c #369584932834",
53+
"x c #502282981ECD",
54+
"c c #45C885282AC0",
55+
"v c #49B8847B273A",
56+
"b c #582A883F257E",
57+
"n c #4B138B593290",
58+
"m c #460689A037E6",
59+
"M c #536B8F3332D5",
60+
"N c #59EF95773FB2",
61+
"B c #5453914139D8",
62+
"V c #609A8B4826BC",
63+
"C c #68E993212A3A",
64+
"Z c #615882C13595",
65+
"A c #657997FA387D",
66+
"S c #786A9ED0315F",
67+
"D c #7D4AA3E735ED",
68+
"F c #4D328C724069",
69+
"G c #5C6299CF44B1",
70+
"H c #5A0297714A7C",
71+
"J c #643C99575CEC",
72+
"K c #721DA3F54EDD",
73+
"L c #7B60A84A4A3A",
74+
"P c #6A62A1DD5489",
75+
"I c #6E96A62A58A9",
76+
"U c #7C0DAC965E3E",
77+
"Y c #7A20A8CA5136",
78+
"T c #74DB8D4A6025",
79+
"R c #75179B0A6EB4",
80+
"E c #79D08CBF7579",
81+
"W c #7E66AFD769DF",
82+
"Q c #7E91B10B6AEC",
83+
"! c #7F60A32E7990",
84+
"~ c #8341A81A3709",
85+
"^ c #8FF7B1F43E5F",
86+
"/ c #939BB3753E18",
87+
"( c #80C3A9044375",
88+
") c #8DADABEC438A",
89+
"_ c #8ACDAF404A16",
90+
"` c #9AC8B66543EE",
91+
"' c #9C5BBB714238",
92+
"] c #83D2AE2C584F",
93+
"[ c #9CDAAC985CC1",
94+
"{ c #8909B0F751BF",
95+
"} c #979FB97A539D",
96+
"| c #A4BABBD94DDD",
97+
" . c #8320ADE564E5",
98+
".. c #9B69AE445FF3",
99+
"X. c #86D4B2FC67AE",
100+
"o. c #838CA8C87E83",
101+
"O. c #86E6B5F372B9",
102+
"+. c #951BBB586DB0",
103+
"@. c #AD0EB81F7FA7",
104+
"#. c #AB62C74B4A14",
105+
"$. c #AF92C91C4AAB",
106+
"%. c #B416CD294D03",
107+
"&. c #A858C5B353A9",
108+
"*. c #BE43D64957C4",
109+
"=. c #B477CADD65A3",
110+
"-. c #BDADD5AB6EDA",
111+
";. c #A994C8AA7744",
112+
":. c #B7F8CBD07D0F",
113+
">. c #AC2DC8C262FE",
114+
",. c #C6D2DBD8554F",
115+
"<. c #CA61DED85698",
116+
"1. c #C46FDB2F5C4E",
117+
"2. c #CD4FE17F5883",
118+
"3. c #D37EE63B5CA2",
119+
"4. c #DBC2ECBC5EB6",
120+
"5. c #CB3DD9DC63C9",
121+
"6. c #CF12DAC8681F",
122+
"7. c #C073CA3C722A",
123+
"8. c #DD46EC286353",
124+
"9. c #D89CE70A6839",
125+
"0. c #DE1AEC50714D",
126+
"q. c #D33AE5587304",
127+
"w. c #E153F0166205",
128+
"e. c #E56EF469639B",
129+
"r. c #E8CEF712651B",
130+
"t. c #E6F3F5176CD3",
131+
"y. c #EAC8F8066E10",
132+
"u. c #E8E9F60F74DF",
133+
"i. c #EA7EF6F47B6B",
134+
"p. c #E574F2E3796A",
135+
"a. c #8C0D9EBC8822",
136+
"s. c #914999848E39",
137+
"d. c #8602A44580BC",
138+
"f. c #936FB4148EDE",
139+
"g. c #9CD0A9239A32",
140+
"h. c #99DDB4CC9598",
141+
"j. c #B7B3BCF68963",
142+
"k. c #A368B7119FE5",
143+
"l. c #A472ADACA233",
144+
"z. c #AEA0B789AB46",
145+
"x. c #B338B799AA92",
146+
"c. c #B672BB69B5C0",
147+
"v. c #BF95C6C38E07",
148+
"b. c #A990CB69921B",
149+
"n. c #A27BC6898833",
150+
"m. c #BD96C7FFABE2",
151+
"M. c #B853D527A8C3",
152+
"N. c #BF33C77EBDCD",
153+
"B. c #C730DCE585F4",
154+
"V. c #D6BEE027884C",
155+
"C. c #CBA1D9499A2A",
156+
"Z. c #CFDDE237989C",
157+
"A. c #DAE9E2AF981B",
158+
"S. c #E604EF688FC4",
159+
"D. c #EE65F7839477",
160+
"F. c #C4FCC974A7CB",
161+
"G. c #CD03D611A665",
162+
"H. c #C246C47CB53D",
163+
"J. c #C61BC973BB0C",
164+
"K. c #CB81D715BA18",
165+
"L. c #D5E3D965B9B9",
166+
"P. c #D8B5E8E9ABC2",
167+
"I. c #DEF0EC9BB7D6",
168+
"U. c #E604F16DAFD9",
169+
"Y. c #E221E684BC86",
170+
"T. c #ECF3F60EB38F",
171+
"R. c #EF9CF79FBC83",
172+
"E. c #F50FFB6FBA6A",
173+
"W. c #F204F9B9B16F",
174+
"Q. c #BF9FC456C04A",
175+
"!. c #C7EFC966C330",
176+
"~. c #C8E9D2B7C5E2",
177+
"^. c #C942DF64C18D",
178+
"/. c #D0CBDA9ECF92",
179+
"(. c #D52DD9DED46A",
180+
"). c #D94BDA22DA14",
181+
"_. c #D9EAE42DC51C",
182+
"`. c #DD03E201DC47",
183+
"'. c #F57AFB53C363",
184+
"]. c #F66DFB99CCA3",
185+
"[. c #E2B6E3CFDA7B",
186+
"{. c #F975FD04DA78",
187+
"}. c #F66DFB20D9D5",
188+
"|. c #E3E7E4EEE3E6",
189+
" X c #EAAFEAD7EB45",
190+
".X c #FB77FE18E330",
191+
"XX c #F823FBAAE92E",
192+
"oX c #F07AEFD5F09C",
193+
"OX c #F524F4DEF68F",
194+
"+X c #FEE1FF87F5A7",
195+
"@X c #F7A5F786F8DA",
196+
"#X c #F96FF83EF9DE",
197+
"$X c #FBFFFB41FC4C",
198+
"%X c None",
199+
/* pixels */
200+
"%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X",
201+
"%X%X%X%X%X%X%X%X%X%X%X%X%X$XOXOXOX@X$X%X%X%X%X%X%X%X%X%X%X%X%X%X",
202+
"%X%X%X%X%X%X%X%X%X%X@X|.~.K.M.G.Y./._.[. XOX%X%X%X%X%X%X%X%X%X%X",
203+
"%X%X%X%X%X%X%X%X#X/.! m .X.Y Y { q.D.S.A.L.[.OX%X%X%X%X%X%X%X%X",
204+
"%X%X%X%X%X%X%X Xf.F P P r < $ $ $ v { -.S.p.V.L. X%X%X%X%X%X%X%X",
205+
"%X%X%X%X%X%X`.J 1 Q .XQ 1 < < $ $ * & a } i.p.t.G.|.%X%X%X%X%X%X",
206+
"%X%X%X%X%X(.H 1 z _.}.W m a G n e 5 5 * v q.u.t.e.C.|.%X%X%X%X%X",
207+
"%X%X%X%X XJ 1 z ^.$X}.b.J G X.T.;.5 * q =.q.u.t.e.w.G. X%X%X%X%X",
208+
"%X%X%X#Xf.3 r M.$X+XXXK.W P n T.Z.0 % 7 >.=.0.t.t.e.9.J.#X%X%X%X",
209+
"%X%X%X(.a r M.XX+XXXQ B I U n U.] y 7 @ ( _ &.y.3.,.e.7.`.%X%X%X",
210+
"%X%X#Xo.3 n..X.XXXXXP H O.r c +.2 0 5 * 9 b *.u.| ~ e.| x.#X%X%X",
211+
"%X%X|.z r I.{.{.}.}.b.P.Y.z < 4 $ $ $ 7 A ( u.8.,.#.,.,.j. X%X%X",
212+
"%X%XN.4 B '.].].].].].'.P.G < < $ $ $ = u &.0.^ S d V 4.>.(.%X%X",
213+
"%X$Xh.$ K R.E.'.'.'.E.C.G n < $ $ $ $ @ $ D ^ 8 : : $.#.) Q.$X%X",
214+
"%X$Xo.# Y W.U.E.E.P.U z 6 4 < $ $ $ @ @ 8 ,.~ ~ S ' e.4.| c.#X%X",
215+
"%X$XR % Y ;.M :.B.n < < < < $ $ @ $ @ @ & b %.w.r.r.e.e.4.F.@X%X",
216+
"%X#XR % A A # y z $ < $ * $ $ $ $ $ @ & X x w.e.e.e.e.e.8.F.OX%X",
217+
"%X$Xd.% 0 _ M 6 7 $ $ $ $ $ $ $ @ @ @ @ & / e.e.e.e.e.e.9.m.@X%X",
218+
"%X$Xk.* $ v L 7 u 2 $ $ $ $ $ @ @ @ @ X 8 <.r.e.e.e.e.e.6.!.$X%X",
219+
"%X%X!.q $ * A 5 7 u * $ @ @ @ & @ @ X X d 4.e.e.e.e.e.e.7.).%X%X",
220+
"%X%X Xk % @ q w t 5 @ $ @ @ @ @ @ @ X X 8 3.r.r.3.%.4.e.j. X%X%X",
221+
"%X%X$Xg.& @ @ b 2.#.V = % % @ X X X & X + ~ 3.%.f : ,.6.H.@X%X%X",
222+
"%X%X%X`.j % * / r.r.e.~ : X X & & X X X X & 8 ; ) j.|.%X%X%X",
223+
"%X%X%X$Xz., @ / r.e.e.e.,.t X X X X X . . . . ; [ !.@X%X%X%X",
224+
"%X%X%X%XoXa.O w 3.r.e.e.e.%.V w ; X . . . o h x.oX%X%X%X%X",
225+
"%X%X%X%X%X XE O f 3.e.e.e.e.e.4./ + . o . o > s. X%X%X%X%X%X",
226+
"%X%X%X%X%X%X Xd.> C e.w.e.e.r.4.b X . . . i g. X%X%X%X%X%X%X",
227+
"%X%X%X%X%X%X%XOXc.T 1.4.e.4.$.C o . . > l Q.oX%X%X%X%X%X%X%X",
228+
"%X%X%X%X%X%X%X%X$X|.J.C.[ k , + + O > j E x.|.$X%X%X%X%X%X%X%X%X",
229+
"%X%X%X%X%X%X%X%X%X%X$X X).Q.z.l.l.x.!.).oX$X%X%X%X%X%X%X%X%X%X%X",
230+
"%X%X%X%X%X%X%X%X%X%X%X%X%X+X$X$X$X$X$X%X%X%X%X%X%X%X%X%X%X%X%X%X",
231+
"%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X"
232+
};

‎debian/qbrowser-icon128x128.png

54.5 KB
Loading

‎debian/qbrowser-icon16x16.png

4.34 KB
Loading

‎debian/qbrowser-icon192x192.png

101 KB
Loading

‎debian/qbrowser-icon22x22.png

5.46 KB
Loading

‎debian/qbrowser-icon24x24.png

5.86 KB
Loading

‎debian/qbrowser-icon256x256.png

158 KB
Loading

‎debian/qbrowser-icon32x32.png

7.92 KB
Loading

‎debian/qbrowser-icon36x36.png

9.08 KB
Loading

‎debian/qbrowser-icon42x42.png

11.1 KB
Loading

‎debian/qbrowser-icon48x48.png

13.1 KB
Loading

‎debian/qbrowser-icon512x512.png

434 KB
Loading

‎debian/qbrowser-icon64x64.png

19.4 KB
Loading

‎debian/qbrowser-icon72x72.png

22.9 KB
Loading

‎debian/qbrowser-icon80x80.png

26.8 KB
Loading

‎debian/qbrowser-icon8x8.png

3.15 KB
Loading

‎debian/qbrowser-icon96x96.png

35.2 KB
Loading

‎debian/qbrowser.desktop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ GenericName[th]=ระบบสารสนเทศภูมิศาสตร
4747
GenericName[tr]=Coğrafi bilgi sistemi
4848
GenericName[uk]=Геоінформаційна система
4949
GenericName[uz]=Geografik axborot tizimi
50-
Icon=qgis
50+
Icon=qbrowser
5151
TryExec=/usr/bin/qbrowser
5252
Exec=/usr/bin/qbrowser %F
5353
Terminal=false

‎debian/qbrowser.menu

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
?package(qgis):needs="X11" section="Applications/Science/Geoscience"\
2+
icon="/usr/share/pixmaps/qbrowser.xpm" title="QGIS Browser"\
3+
command="/usr/bin/qbrowser"

‎debian/qgis.menu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
?package(qgis):needs="X11" section="Applications/Science/Geoscience"\
2-
icon="/usr/share/pixmaps/qgis.xpm" title="QGIS"\
2+
icon="/usr/share/pixmaps/qgis.xpm" title="QGIS Desktop"\
33
command="/usr/bin/qgis"

‎debian/rules

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,18 +193,23 @@ override_dh_auto_install:
193193
# Install menu pixmap
194194
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
195195
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.svg
196+
install -o root -g root -m 644 $(CURDIR)/images/icons/qbrowser_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qbrowser.svg
196197
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.png
198+
install -o root -g root -m 644 $(CURDIR)/images/icons/qbrowser-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qbrowser.png
197199
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-mime.png
198200
install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.xpm
201+
install -o root -g root -m 644 $(CURDIR)/debian/qbrowser-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/qbrowser.xpm
199202

200203
# Install application icon
201204
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do \
202205
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps ; \
203206
install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps/qgis.png ; \
207+
install -o root -g root -m 644 $(CURDIR)/debian/qbrowser-icon$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps/qbrowser.png ; \
204208
done
205209

206210
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/scalable/apps
207211
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/icons/scalable/apps/qgis.svg
212+
install -o root -g root -m 644 $(CURDIR)/images/icons/qbrowser_icon.svg $(CURDIR)/debian/tmp/usr/share/icons/scalable/apps/qbrowser.svg
208213

209214
# Install desktop files
210215
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/applications

‎images/icons/qbrowser-icon.png

434 KB
Loading

0 commit comments

Comments
 (0)