debian packaging update (fixes #12954)

qgis · Jun 14, 2015 · f261270 · f261270
1 parent 084c455
commit f261270
Show file tree

Hide file tree

Showing 26 changed files with 468 additions and 3 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -6,8 +6,9 @@ qgis (2.9.0) UNRELEASED; urgency=medium
   * merge downstream addition of debug package
   * make build directory configurable
   * include links to qt4 documentation in api docs
+  * include browser icons
 
- -- Jürgen E. Fischer <jef@norbit.de>  Tue, 02 Jun 2015 22:54:19 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Sun, 14 Jun 2015 22:35:11 +0200
 
 qgis (2.8.0) unstable; urgency=medium
 

diff --git a/debian/qbrowser-icon.xpm b/debian/qbrowser-icon.xpm
@@ -0,0 +1,232 @@
+/* XPM */
+static char *qbrowser_icon[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 194 2 ",
+"   c #0B953EA40070",
+".  c #0CA44351000B",
+"X  c #0C034C020008",
+"o  c #108444CE01AE",
+"O  c #15524F3B0BA7",
+"+  c #14DB4888078E",
+"@  c #0C7B542F0010",
+"#  c #054758750000",
+"$  c #0C845C090021",
+"%  c #065656340000",
+"&  c #122A535303A9",
+"*  c #12175B1B0413",
+"=  c #17DE5D490617",
+"-  c #1F9D58D1089C",
+";  c #220852A40910",
+":  c #29C35CDF0D65",
+">  c #261E4CBA1C6D",
+",  c #22FA5579173C",
+"<  c #0DB162A5016C",
+"1  c #0B426A9B01CD",
+"2  c #116C640E045E",
+"3  c #10836A3704AE",
+"4  c #173C673309EE",
+"5  c #1C09641A09F2",
+"6  c #1D396A530BC9",
+"7  c #231D66060D53",
+"8  c #2D8865250F19",
+"9  c #233869A00F0C",
+"0  c #24146BFF111D",
+"q  c #2B5768BF13A1",
+"w  c #37B26B58138F",
+"e  c #2C00754A1971",
+"r  c #26E678F018C1",
+"t  c #3B51754C16C8",
+"y  c #361978501BF7",
+"u  c #36707591199F",
+"i  c #37BC56E22FBB",
+"p  c #2EA0790A243B",
+"a  c #36157EBA22AE",
+"s  c #3CFA7D9433A5",
+"d  c #421F7458187E",
+"f  c #4B9578E01C7F",
+"g  c #43EB61613C9F",
+"h  c #43666477285D",
+"j  c #48B2740D4025",
+"k  c #50DF7C6448BD",
+"l  c #68AD7A1A6420",
+"z  c #369584932834",
+"x  c #502282981ECD",
+"c  c #45C885282AC0",
+"v  c #49B8847B273A",
+"b  c #582A883F257E",
+"n  c #4B138B593290",
+"m  c #460689A037E6",
+"M  c #536B8F3332D5",
+"N  c #59EF95773FB2",
+"B  c #5453914139D8",
+"V  c #609A8B4826BC",
+"C  c #68E993212A3A",
+"Z  c #615882C13595",
+"A  c #657997FA387D",
+"S  c #786A9ED0315F",
+"D  c #7D4AA3E735ED",
+"F  c #4D328C724069",
+"G  c #5C6299CF44B1",
+"H  c #5A0297714A7C",
+"J  c #643C99575CEC",
+"K  c #721DA3F54EDD",
+"L  c #7B60A84A4A3A",
+"P  c #6A62A1DD5489",
+"I  c #6E96A62A58A9",
+"U  c #7C0DAC965E3E",
+"Y  c #7A20A8CA5136",
+"T  c #74DB8D4A6025",
+"R  c #75179B0A6EB4",
+"E  c #79D08CBF7579",
+"W  c #7E66AFD769DF",
+"Q  c #7E91B10B6AEC",
+"!  c #7F60A32E7990",
+"~  c #8341A81A3709",
+"^  c #8FF7B1F43E5F",
+"/  c #939BB3753E18",
+"(  c #80C3A9044375",
+")  c #8DADABEC438A",
+"_  c #8ACDAF404A16",
+"`  c #9AC8B66543EE",
+"'  c #9C5BBB714238",
+"]  c #83D2AE2C584F",
+"[  c #9CDAAC985CC1",
+"{  c #8909B0F751BF",
+"}  c #979FB97A539D",
+"|  c #A4BABBD94DDD",
+" . c #8320ADE564E5",
+".. c #9B69AE445FF3",
+"X. c #86D4B2FC67AE",
+"o. c #838CA8C87E83",
+"O. c #86E6B5F372B9",
+"+. c #951BBB586DB0",
+"@. c #AD0EB81F7FA7",
+"#. c #AB62C74B4A14",
+"$. c #AF92C91C4AAB",
+"%. c #B416CD294D03",
+"&. c #A858C5B353A9",
+"*. c #BE43D64957C4",
+"=. c #B477CADD65A3",
+"-. c #BDADD5AB6EDA",
+";. c #A994C8AA7744",
+":. c #B7F8CBD07D0F",
+">. c #AC2DC8C262FE",
+",. c #C6D2DBD8554F",
+"<. c #CA61DED85698",
+"1. c #C46FDB2F5C4E",
+"2. c #CD4FE17F5883",
+"3. c #D37EE63B5CA2",
+"4. c #DBC2ECBC5EB6",
+"5. c #CB3DD9DC63C9",
+"6. c #CF12DAC8681F",
+"7. c #C073CA3C722A",
+"8. c #DD46EC286353",
+"9. c #D89CE70A6839",
+"0. c #DE1AEC50714D",
+"q. c #D33AE5587304",
+"w. c #E153F0166205",
+"e. c #E56EF469639B",
+"r. c #E8CEF712651B",
+"t. c #E6F3F5176CD3",
+"y. c #EAC8F8066E10",
+"u. c #E8E9F60F74DF",
+"i. c #EA7EF6F47B6B",
+"p. c #E574F2E3796A",
+"a. c #8C0D9EBC8822",
+"s. c #914999848E39",
+"d. c #8602A44580BC",
+"f. c #936FB4148EDE",
+"g. c #9CD0A9239A32",
+"h. c #99DDB4CC9598",
+"j. c #B7B3BCF68963",
+"k. c #A368B7119FE5",
+"l. c #A472ADACA233",
+"z. c #AEA0B789AB46",
+"x. c #B338B799AA92",
+"c. c #B672BB69B5C0",
+"v. c #BF95C6C38E07",
+"b. c #A990CB69921B",
+"n. c #A27BC6898833",
+"m. c #BD96C7FFABE2",
+"M. c #B853D527A8C3",
+"N. c #BF33C77EBDCD",
+"B. c #C730DCE585F4",
+"V. c #D6BEE027884C",
+"C. c #CBA1D9499A2A",
+"Z. c #CFDDE237989C",
+"A. c #DAE9E2AF981B",
+"S. c #E604EF688FC4",
+"D. c #EE65F7839477",
+"F. c #C4FCC974A7CB",
+"G. c #CD03D611A665",
+"H. c #C246C47CB53D",
+"J. c #C61BC973BB0C",
+"K. c #CB81D715BA18",
+"L. c #D5E3D965B9B9",
+"P. c #D8B5E8E9ABC2",
+"I. c #DEF0EC9BB7D6",
+"U. c #E604F16DAFD9",
+"Y. c #E221E684BC86",
+"T. c #ECF3F60EB38F",
+"R. c #EF9CF79FBC83",
+"E. c #F50FFB6FBA6A",
+"W. c #F204F9B9B16F",
+"Q. c #BF9FC456C04A",
+"!. c #C7EFC966C330",
+"~. c #C8E9D2B7C5E2",
+"^. c #C942DF64C18D",
+"/. c #D0CBDA9ECF92",
+"(. c #D52DD9DED46A",
+"). c #D94BDA22DA14",
+"_. c #D9EAE42DC51C",
+"`. c #DD03E201DC47",
+"'. c #F57AFB53C363",
+"]. c #F66DFB99CCA3",
+"[. c #E2B6E3CFDA7B",
+"{. c #F975FD04DA78",
+"}. c #F66DFB20D9D5",
+"|. c #E3E7E4EEE3E6",
+" X c #EAAFEAD7EB45",
+".X c #FB77FE18E330",
+"XX c #F823FBAAE92E",
+"oX c #F07AEFD5F09C",
+"OX c #F524F4DEF68F",
+"+X c #FEE1FF87F5A7",
+"@X c #F7A5F786F8DA",
+"#X c #F96FF83EF9DE",
+"$X c #FBFFFB41FC4C",
+"%X c None",
+/* pixels */
+"%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",
+"%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",
+"%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",
+"%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",
+"%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",
+"%X%X%X%X%X%X`.J 1 Q .XQ 1 < < $ $ * & a } i.p.t.G.|.%X%X%X%X%X%X",
+"%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",
+"%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",
+"%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",
+"%X%X%X(.a r M.XX+XXXQ B I U n U.] y 7 @ ( _ &.y.3.,.e.7.`.%X%X%X",
+"%X%X#Xo.3 n..X.XXXXXP H O.r c +.2 0 5 * 9 b *.u.| ~ e.| x.#X%X%X",
+"%X%X|.z r I.{.{.}.}.b.P.Y.z < 4 $ $ $ 7 A ( u.8.,.#.,.,.j. X%X%X",
+"%X%XN.4 B '.].].].].].'.P.G < < $ $ $ = u &.0.^ S d V 4.>.(.%X%X",
+"%X$Xh.$ K R.E.'.'.'.E.C.G n < $ $ $ $ @ $ D ^ 8 : : $.#.) Q.$X%X",
+"%X$Xo.# Y W.U.E.E.P.U z 6 4 < $ $ $ @ @ 8 ,.~ ~ S ' e.4.| c.#X%X",
+"%X$XR % Y ;.M :.B.n < < < < $ $ @ $ @ @ & b %.w.r.r.e.e.4.F.@X%X",
+"%X#XR % A A # y z $ < $ * $ $ $ $ $ @ & X x w.e.e.e.e.e.8.F.OX%X",
+"%X$Xd.% 0 _ M 6 7 $ $ $ $ $ $ $ @ @ @ @ & / e.e.e.e.e.e.9.m.@X%X",
+"%X$Xk.* $ v L 7 u 2 $ $ $ $ $ @ @ @ @ X 8 <.r.e.e.e.e.e.6.!.$X%X",
+"%X%X!.q $ * A 5 7 u * $ @ @ @ & @ @ X X d 4.e.e.e.e.e.e.7.).%X%X",
+"%X%X Xk % @ q w t 5 @ $ @ @ @ @ @ @ X X 8 3.r.r.3.%.4.e.j. X%X%X",
+"%X%X$Xg.& @ @ b 2.#.V = % % @ X X X & X + ~ 3.%.f : ,.6.H.@X%X%X",
+"%X%X%X`.j % * / r.r.e.~ : X X & & X X X X & 8 ;     ) j.|.%X%X%X",
+"%X%X%X$Xz., @ / r.e.e.e.,.t X X X X X . . .   .   ; [ !.@X%X%X%X",
+"%X%X%X%XoXa.O w 3.r.e.e.e.%.V w ; X . . . o       h x.oX%X%X%X%X",
+"%X%X%X%X%X XE O f 3.e.e.e.e.e.4./ + . o . o     > s. X%X%X%X%X%X",
+"%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",
+"%X%X%X%X%X%X%XOXc.T 1.4.e.4.$.C o . .     > l Q.oX%X%X%X%X%X%X%X",
+"%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",
+"%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",
+"%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",
+"%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"
+};
diff --git a/debian/qbrowser-icon128x128.png b/debian/qbrowser-icon128x128.png
diff --git a/debian/qbrowser-icon16x16.png b/debian/qbrowser-icon16x16.png
diff --git a/debian/qbrowser-icon192x192.png b/debian/qbrowser-icon192x192.png
diff --git a/debian/qbrowser-icon22x22.png b/debian/qbrowser-icon22x22.png
diff --git a/debian/qbrowser-icon24x24.png b/debian/qbrowser-icon24x24.png
diff --git a/debian/qbrowser-icon256x256.png b/debian/qbrowser-icon256x256.png
diff --git a/debian/qbrowser-icon32x32.png b/debian/qbrowser-icon32x32.png
diff --git a/debian/qbrowser-icon36x36.png b/debian/qbrowser-icon36x36.png
diff --git a/debian/qbrowser-icon42x42.png b/debian/qbrowser-icon42x42.png
diff --git a/debian/qbrowser-icon48x48.png b/debian/qbrowser-icon48x48.png
diff --git a/debian/qbrowser-icon512x512.png b/debian/qbrowser-icon512x512.png
diff --git a/debian/qbrowser-icon64x64.png b/debian/qbrowser-icon64x64.png
diff --git a/debian/qbrowser-icon72x72.png b/debian/qbrowser-icon72x72.png
diff --git a/debian/qbrowser-icon80x80.png b/debian/qbrowser-icon80x80.png
diff --git a/debian/qbrowser-icon8x8.png b/debian/qbrowser-icon8x8.png
diff --git a/debian/qbrowser-icon96x96.png b/debian/qbrowser-icon96x96.png
diff --git a/debian/qbrowser.desktop b/debian/qbrowser.desktop
@@ -47,7 +47,7 @@ GenericName[th]=ระบบสารสนเทศภูมิศาสตร
 GenericName[tr]=Coğrafi bilgi sistemi
 GenericName[uk]=Геоінформаційна система
 GenericName[uz]=Geografik axborot tizimi
-Icon=qgis
+Icon=qbrowser
 TryExec=/usr/bin/qbrowser
 Exec=/usr/bin/qbrowser %F
 Terminal=false

diff --git a/debian/qbrowser.menu b/debian/qbrowser.menu
@@ -0,0 +1,3 @@
+?package(qgis):needs="X11" section="Applications/Science/Geoscience"\
+  icon="/usr/share/pixmaps/qbrowser.xpm" title="QGIS Browser"\
+  command="/usr/bin/qbrowser"
diff --git a/debian/qgis.menu b/debian/qgis.menu
@@ -1,3 +1,3 @@
 ?package(qgis):needs="X11" section="Applications/Science/Geoscience"\
-  icon="/usr/share/pixmaps/qgis.xpm" title="QGIS"\
+  icon="/usr/share/pixmaps/qgis.xpm" title="QGIS Desktop"\
   command="/usr/bin/qgis"
diff --git a/debian/rules b/debian/rules
@@ -193,18 +193,23 @@ override_dh_auto_install:
 	# Install menu pixmap
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
 	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.svg
+	install -o root -g root -m 644 $(CURDIR)/images/icons/qbrowser_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qbrowser.svg
 	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.png
+	install -o root -g root -m 644 $(CURDIR)/images/icons/qbrowser-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qbrowser.png
 	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-mime.png
 	install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.xpm
+	install -o root -g root -m 644 $(CURDIR)/debian/qbrowser-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/qbrowser.xpm
 
 	# Install application icon
 	for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do \
 		install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps ; \
 		install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps/qgis.png ; \
+		install -o root -g root -m 644 $(CURDIR)/debian/qbrowser-icon$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps/qbrowser.png ; \
 	done
 
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/scalable/apps
 	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/icons/scalable/apps/qgis.svg
+	install -o root -g root -m 644 $(CURDIR)/images/icons/qbrowser_icon.svg $(CURDIR)/debian/tmp/usr/share/icons/scalable/apps/qbrowser.svg
 
 	# Install desktop files
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/applications

diff --git a/images/icons/qbrowser-icon.png b/images/icons/qbrowser-icon.png