[josm] 22/28: Use desktop file in favor of menu file per CTTE #741573.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Oct 9 22:27:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit fff04902eaa41951cea381f7cd8af48dac91c328
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Oct 9 22:07:17 2015 +0200
Use desktop file in favor of menu file per CTTE #741573.
---
debian/changelog | 1 +
debian/icons/josm-16.xpm | 220 ---------------------
debian/icons/josm-32.xpm | 294 -----------------------------
debian/icons/josm.png | 1 -
debian/josm.desktop | 13 --
debian/josm.menu | 2 -
debian/patches/08-josm-desktop-fixes.patch | 39 ++++
debian/patches/series | 1 +
debian/rules | 6 +-
9 files changed, 43 insertions(+), 534 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c5c4f2c..a09dd73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ josm (0.0.svn8800+dfsg2-1) UNRELEASED; urgency=medium
* Drop xjc command for removed wms-cache.xsd.
* Use embedded metadata-extractor for getFirstDirectoryOfType symbol.
* Add missing-sources for overpass-turbo-ffs.js & opening_hours.js.
+ * Use desktop file in favor of menu file per CTTE #741573.
-- Bas Couwenberg <sebastic at debian.org> Fri, 09 Oct 2015 15:24:23 +0200
diff --git a/debian/icons/josm-16.xpm b/debian/icons/josm-16.xpm
deleted file mode 100644
index 06c8e67..0000000
--- a/debian/icons/josm-16.xpm
+++ /dev/null
@@ -1,220 +0,0 @@
-/* XPM */
-static char *josm___[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 198 2",
-" c #513F11",
-". c #513E12",
-"X c #433426",
-"o c #493A2A",
-"O c #534113",
-"+ c #534014",
-"@ c #5C4711",
-"# c #5C4713",
-"$ c #684D10",
-"% c #694E11",
-"& c #604C19",
-"* c #644F19",
-"= c #5E4921",
-"- c #564F36",
-"; c #5D4933",
-": c #604426",
-"> c #6D4B28",
-", c #724D26",
-"< c #605021",
-"1 c #655121",
-"2 c #655324",
-"3 c #685923",
-"4 c #785E27",
-"5 c #776731",
-"6 c #716136",
-"7 c #7A6636",
-"8 c #7C713D",
-"9 c #7F743D",
-"0 c #474647",
-"q c #484946",
-"w c #4F4A44",
-"e c #4A494A",
-"r c #4B4E4A",
-"t c #4C4C4C",
-"y c #515051",
-"u c #575956",
-"i c #595A5A",
-"p c #5E5E5F",
-"a c #5D605A",
-"s c #5E635A",
-"d c #636F5B",
-"f c #646C5C",
-"g c #69775D",
-"h c #68785E",
-"j c #616161",
-"k c #6A6E65",
-"l c #6A6D66",
-"z c #6B6A6B",
-"x c #6B6F68",
-"c c #6B6F69",
-"v c #6D6C6D",
-"b c #6A7361",
-"n c #6A7362",
-"m c #6E7965",
-"M c #787162",
-"N c #747569",
-"B c #71786C",
-"V c #717372",
-"C c #757A72",
-"Z c #797F76",
-"A c #7F7D7C",
-"S c #80733F",
-"D c #806E44",
-"F c #827D7A",
-"G c #699746",
-"H c #678055",
-"J c #6C9B56",
-"K c #7A866D",
-"L c #7C8675",
-"P c #7C827B",
-"I c #7AAE68",
-"U c #75AA7B",
-"Y c #8A8F68",
-"T c #818F73",
-"R c #82877B",
-"E c #8F897A",
-"W c #908172",
-"Q c #8B9372",
-"! c #88967B",
-"~ c #899B79",
-"^ c #8A9A78",
-"/ c #8E997B",
-"( c #8F9D7F",
-") c #8F9F7F",
-"_ c #9A9871",
-"` c #86AA68",
-"' c #8CBD60",
-"] c #8FBD6C",
-"[ c #96B17E",
-"{ c #93C175",
-"} c #9DC07D",
-"| c #769683",
-" . c #6395B2",
-".. c #868D81",
-"X. c #8F9D83",
-"o. c #8F9D85",
-"O. c #919D88",
-"+. c #929291",
-"@. c #979A92",
-"#. c #AC9F84",
-"$. c #9CA282",
-"%. c #96A882",
-"&. c #9EAD8A",
-"*. c #9DAF8B",
-"=. c #9AA491",
-"-. c #9EA29C",
-";. c #AAAB87",
-":. c #ABAB89",
-">. c #BBAF85",
-",. c #A1BC85",
-"<. c #A1BD8D",
-"1. c #ADA49B",
-"2. c #ADA89A",
-"3. c #B5A697",
-"4. c #B6AA9F",
-"5. c #A9B593",
-"6. c #A5BD90",
-"7. c #A6BC93",
-"8. c #A9B892",
-"9. c #ACBD96",
-"0. c #87B0AB",
-"q. c #88AFB1",
-"w. c #A6A6A6",
-"e. c #A7A8A6",
-"r. c #AEAEAE",
-"t. c #B0BDA7",
-"y. c #B3B3B3",
-"u. c #B5B5B5",
-"i. c #BCB7B1",
-"p. c #BBBBBB",
-"a. c #BEBEBF",
-"s. c #C2BFAD",
-"d. c #A2C184",
-"f. c #ACCB8F",
-"g. c #A8C292",
-"h. c #ABC893",
-"j. c #AAC098",
-"k. c #ADC19A",
-"l. c #AEC699",
-"z. c #AFC19E",
-"x. c #ADC99A",
-"c. c #B0C798",
-"v. c #B1C59F",
-"b. c #B4CF9A",
-"n. c #B3CA9C",
-"m. c #BBDF98",
-"M. c #B5E78A",
-"N. c #ADC4A0",
-"B. c #B0C2A0",
-"V. c #B4C8A3",
-"C. c #B7CEA2",
-"Z. c #B6CBA4",
-"A. c #BED4A5",
-"S. c #B9D1AA",
-"D. c #CFC296",
-"F. c #C5D5A2",
-"G. c #C8D7AC",
-"H. c #C3D9A9",
-"J. c #DED8A7",
-"K. c #DFDFAC",
-"L. c #C3D3BA",
-"P. c #D5D9B0",
-"I. c #E2DCAA",
-"U. c #D1E0A6",
-"Y. c #DEE0AE",
-"T. c #D4E9B7",
-"R. c #DCE9B4",
-"E. c #DEE9B7",
-"W. c #DFEDB9",
-"Q. c #DFEEB9",
-"!. c #DCF0B6",
-"~. c #D8F4BA",
-"^. c #DCF7BF",
-"/. c #DEF9BF",
-"(. c #E5E2AF",
-"). c #E5E3B2",
-"_. c #E3E6B3",
-"`. c #E3EFB9",
-"'. c #E0F5BD",
-"]. c #C1C1C1",
-"[. c #CFCDC2",
-"{. c #C8C8C8",
-"}. c #CFD1C8",
-"|. c #D1D4CA",
-" X c #D1D0CF",
-".X c #D1D1D1",
-"XX c #D3D3D3",
-"oX c #D9D9D9",
-"OX c #D1E3C4",
-"+X c #DAF4C3",
-"@X c #E2F8C1",
-"#X c #E0FBC2",
-"$X c #E3FAC2",
-"%X c #E2E2E2",
-"&X c #E6E5E4",
-"*X c #EAEAEA",
-"=X c #FBFBFC",
-"-X c None",
-/* pixels */
-"-X-X-X-X-X-X-X-X-X-X0 e -X-X-X-X",
-"-X&.:./ ~ [ } T u n f b a t -X-X",
-"-X9.).E.^.M.` c %.L.h.,.*.B i -X",
-"-X) Q._.+Xm.h H h.OXS.j.C.7.c -X",
-"-X) (.Q.^.l.n G I { ] <.N.l.s p ",
-"-X5.I.'.+X<.m J .U ' g.Z.%.q z ",
-"-XA.'.I.!.b.P | q.0.d.B.Z.h t v ",
-"-XH.'.I.E.T.E L n.x.B.t.z.d j -X",
-"-Xk.$XK.D.#.C V K Q / X.=.l y -X",
-"-Xo.+XU.S = M Z N F @. at .e.E -X-X",
-"-X! F.8 @ 2 5.L.1.3.3.i.XXR -X",
-"-XY 9 @ % 5 G.1.> , : X A s.-X",
-"-X< + # % 4 >.P.[.W ; o t +..XXX",
-"7 + # % 3 _ ;.$.}.=X&X.X{.u.p.{.",
-"D & % * - -X-X-X-X%X*XoX].r.-X-X",
-"-X6 1 -X-X-X-X-X-X-Xy.w.-X-X-X-X"
-};
diff --git a/debian/icons/josm-32.xpm b/debian/icons/josm-32.xpm
deleted file mode 100644
index 2f4db3f..0000000
--- a/debian/icons/josm-32.xpm
+++ /dev/null
@@ -1,294 +0,0 @@
-/* XPM */
-static char *josm___[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 256 2",
-" c #0F0F0F",
-". c #14100D",
-"X c #190D01",
-"o c #2C1A08",
-"O c #3E2205",
-"+ c #21251E",
-"@ c #362412",
-"# c #222322",
-"$ c #262A25",
-"% c #333433",
-"& c #363932",
-"* c #393A37",
-"= c #3D3D3E",
-"- c #383638",
-"; c #333A2E",
-": c #44280B",
-"> c #50300E",
-", c #4E3B12",
-"< c #4B3B1B",
-"1 c #503E15",
-"2 c #5D3710",
-"3 c #532E08",
-"4 c #613A12",
-"5 c #4B3F38",
-"6 c #30422C",
-"7 c #3E413B",
-"8 c #554412",
-"9 c #5D4813",
-"0 c #5E4B18",
-"q c #5C4613",
-"w c #6D550F",
-"e c #70540F",
-"r c #634B13",
-"t c #6B4F12",
-"y c #614A18",
-"u c #6D5A1D",
-"i c #6B5010",
-"p c #715311",
-"a c #5C4B29",
-"s c #5C522F",
-"d c #41433C",
-"f c #444A3C",
-"g c #4B453B",
-"h c #574A3A",
-"j c #465D38",
-"k c #625120",
-"l c #6D5823",
-"z c #715D22",
-"x c #634F3B",
-"c c #635338",
-"v c #795A3A",
-"b c #6F603A",
-"n c #736029",
-"m c #454546",
-"M c #464A42",
-"N c #4A4A4A",
-"B c #504E4F",
-"V c #5A4642",
-"C c #4D514E",
-"Z c #525A4C",
-"A c #53584D",
-"S c #4F4D50",
-"D c #535253",
-"F c #555D52",
-"G c #595D55",
-"H c #5C5C5A",
-"J c #5C5653",
-"K c #635940",
-"L c #645D55",
-"P c #53614D",
-"I c #5A6453",
-"U c #5D625D",
-"Y c #5B6A50",
-"T c #587840",
-"R c #776B44",
-"E c #626B5B",
-"W c #646559",
-"Q c #796C59",
-"! c #6D7B5F",
-"~ c #5C5D60",
-"^ c #5F6560",
-"/ c #616261",
-"( c #69696A",
-") c #686A65",
-"_ c #6E7962",
-"` c #6C7266",
-"' c #737C66",
-"] c #73766D",
-"[ c #6F6E70",
-"{ c #60767F",
-"} c #727473",
-"| c #7B7B7B",
-" . c #777878",
-".. c #736D69",
-"X. c #84592C",
-"o. c #8D6339",
-"O. c #876A48",
-"+. c #877A5B",
-"@. c #806867",
-"#. c #689844",
-"$. c #6B8555",
-"%. c #75A74A",
-"&. c #7AAB53",
-"*. c #7EB551",
-"=. c #6FA358",
-"-. c #7A856D",
-";. c #78876A",
-":. c #7B9566",
-">. c #7C8B75",
-",. c #709279",
-"<. c #6B8F73",
-"1. c #77AE7F",
-"2. c #71A971",
-"3. c #848357",
-"4. c #928054",
-"5. c #84B55B",
-"6. c #808163",
-"7. c #988666",
-"8. c #82877D",
-"9. c #998876",
-"0. c #8B9B7B",
-"q. c #869578",
-"w. c #8B9872",
-"e. c #AE977E",
-"r. c #A7856A",
-"t. c #86B764",
-"y. c #92B96D",
-"u. c #8DA07E",
-"i. c #90A17F",
-"p. c #94B977",
-"a. c #87A76D",
-"s. c #B1AA76",
-"d. c #B8BA7D",
-"f. c #8AC657",
-"g. c #91C467",
-"h. c #99C276",
-"j. c #96D663",
-"k. c #A1DC6C",
-"l. c #A0CD73",
-"z. c #BFC27E",
-"x. c #A6DD7A",
-"c. c #7E7E81",
-"v. c #6091BB",
-"b. c #709BB9",
-"n. c #669AA1",
-"m. c #70A0B6",
-"M. c #6BA0B7",
-"N. c #5B8ACE",
-"B. c #6091CB",
-"V. c #848384",
-"C. c #8B8B8B",
-"Z. c #898685",
-"A. c #99978C",
-"S. c #929294",
-"D. c #9B9B9B",
-"F. c #969398",
-"G. c #A79A8E",
-"H. c #91A281",
-"J. c #95AC82",
-"K. c #98AA86",
-"L. c #9BAB8A",
-"P. c #97A389",
-"I. c #9CB28C",
-"U. c #98B382",
-"Y. c #A4A68C",
-"T. c #A5BA8D",
-"R. c #A2AF9B",
-"E. c #A3B396",
-"W. c #A6BA98",
-"Q. c #BCBE96",
-"!. c #8FAFA3",
-"~. c #96B8A3",
-"^. c #ABABAB",
-"/. c #A5A5A5",
-"(. c #B1BEA6",
-"). c #B8B6A7",
-"_. c #B2B2B2",
-"`. c #BCBCBC",
-"'. c #BFBAB5",
-"]. c #B0B4A4",
-"[. c #D6B994",
-"{. c #E0BB91",
-"}. c #A7C78B",
-"|. c #ACC395",
-" X c #AEC29A",
-".X c #B1C59C",
-"XX c #B4C99D",
-"oX c #B5C899",
-"OX c #B2D192",
-"+X c #B1E286",
-"@X c #9FC0AB",
-"#X c #A7C6A8",
-"$X c #B2C5A3",
-"%X c #B5CBA3",
-"&X c #B9CDA2",
-"*X c #B7C8AA",
-"=X c #BDD4A4",
-"-X c #B8D5AA",
-";X c #BDCBB5",
-":X c #DBCD9D",
-">X c #D6C497",
-",X c #CAC69A",
-"<X c #E3CC9D",
-"1X c #D9C6A0",
-"2X c #C2DBAB",
-"3X c #C4D7AB",
-"4X c #DDD2A3",
-"5X c #DFDCA8",
-"6X c #C9C5BA",
-"7X c #C3D3B6",
-"8X c #C9DBB8",
-"9X c #C8CBA8",
-"0X c #E3CEA2",
-"qX c #E1D3A3",
-"wX c #E3DAAA",
-"eX c #E8D6A5",
-"rX c #C2E7A4",
-"tX c #D9E0AE",
-"yX c #CEF1AB",
-"uX c #D1F3AE",
-"iX c #CDE4B6",
-"pX c #D3EBBB",
-"aX c #DBECBB",
-"sX c #D5E8B6",
-"dX c #D3F3B2",
-"fX c #DBF5BD",
-"gX c #DCF8BC",
-"hX c #D9F3B8",
-"jX c #E0E4AF",
-"kX c #E4EAB7",
-"lX c #E5F5BE",
-"zX c #E2FABE",
-"xX c #C3C3C3",
-"cX c #CCCCCC",
-"vX c #C9C9C5",
-"bX c #CDD7C6",
-"nX c #D1DEC3",
-"mX c #D3D3D3",
-"MX c #DCDCDC",
-"NX c #DAD8D6",
-"BX c #D5EAC7",
-"VX c #DCF5C2",
-"CX c #DFFAC2",
-"ZX c #D3E0D2",
-"AX c #CDE1C5",
-"SX c #E3FBC4",
-"DX c #E4FFC9",
-"FX c #E7FBC8",
-"GX c #E0EADB",
-"HX c #E4E5E4",
-"JX c #ECECEC",
-"KX c #E8E8E7",
-"LX c #F4F5F5",
-"PX c #FEFEFE",
-"IX c #E7F2E1",
-"UX c None",
-/* pixels */
-"UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX",
-"UX& ; UXUXUXUXUXUXUXUXUXUX6 f M UXUX* m N C N m % UX& UXUXUXUXUX",
-"UX* 0.A._ g d UXUX7 Z ;.:.t.oX6.% H ( / D B H ^ ( B f & UXUXUXUX",
-"UXUXK.FXlX[..XH.u. XrXrX+XyXL.U } G E -.I ;.;.;.A / ( = UXUXUXUX",
-"UXUX' SXwX0XFXDXCXgX+Xj.k.U.U ] D q.;X8X|.h.y.}.W.;.F .N UXUXUX",
-"UXUXZ sXSX0X0XSXgXCXdXk.*.P .Z T.;XZXBX-X}.T.}.&X%X0.I .= UXUX",
-"UXUXM XXDXlX<XSXgXCXhXx.T .P :.=XiXGXIXAX;XXXoX|.2XXXu.( ( UXUX",
-"UXUXUXH.DXlX<XFXCXgXgXOXI .7 %.t.}.8XAX&X|.#XI.$X8X-X-XI c.5 UX",
-"UXUXUXH.zX4XqXCXVXhXgXa.` W #.#.%.5.h.}.p.t.U.$XI.#XT.2XZ ` H UX",
-"UXUXd &XkX<XSXgXhXpXVX:.8.Z %.%.*.n.f.g.t.f.p.XXW.&X=X2X; D } UX",
-"UXUXI pXeXkXDXDXVXVXdX;.C.Z %.#.M.B.2.*.5.h.U.&XW.iX.XL.# S c.UX",
-"UXUX' CXeXwXSXzXgXVXyX$.C.Y =.=.v.N.n.5.*.g.|.(. X%X=X! # D V.UX",
-"UXUXi.SXlX:X<XjXVXhXyX:.C.` ,.2.M.B.B.#Xy.5.}.(.$X.XXXf # [ .UX",
-"UX7 oXFXSXSXkX{.tXuXyXXXV.c.{ !.-X~.m. at X|.XX*X*XW.2XJ.+ S./ UX",
-"UXM 3XgXgXzXwX<XaXzXSXpX] F.P X=X-X}.OX$X$X6X(.$X Xu.$ m D.m UX",
-"UX7 W.SXfXaX>XsXpXtXhXFXL.} ( _ =X}.&X&X|.-XR.(.R.$X0.& | / UXUX",
-"UXUXw.DXSXzX4X:X1X[.1X9XP.C C.C w.T.U.I.w.I.0.E.(.$X] / ( - UXUX",
-"UXUXE pXSXFXSX:X1X[.r...C } V.| G E 6.+.;.u.;.L.A.8. .~ - UXUXUX",
-"UXUXC *XVXSXzXSXQ.z y k .S.C.G U ( J V ` 8.) } V.S.] h 5 UXUXUX",
-"UXUX7 E.BXVXFXz.u , 1 9 b Z.^ >.0.L F.^._.`.xXxXcX_.Y.,XW UXUXUX",
-"UXUXUX0.VXiXT.u , , 8 8 r a >.8X4X).xX`.`.xXcXcXNXKXHXnX_ UXUXUX",
-"UXUXUXL.gXd.u , 8 8 9 r i 0 Y.VX6XxXD.r.r.e.G.+.9.].KXKX| UXUXUX",
-"UXUXd &Xz.u , , 8 0 r i p y |.aXvXS.v X.o.O.o.v x 5 ) mX`.UXUXUX",
-"UXUXI s.l , 8 8 q r i w r 3.aXsXvXO.3 2 4 2 > : @ o . C.`.UXUXUX",
-"UXUXs u 1 1 8 q r t p r O.9XpXAXcX'.c : : O o o X N _.mXmXcXUX",
-"UX4.0 , 1 1 q r i e r O.>X:X>X>X6XLXNXA.L h 5 g H C.^.`.cXMXKXxX",
-"s.z , 1 8 q r t w 9 3.<X5XiXoXtX8XLXPXPXJXMXmXmXmXvX`.^.`.`.mXUX",
-"7.r 1 8 q r p p r R W.0.Q Z M F 8.HXPXPXPXLXHXMXmXxX`.^._.xX`.UX",
-"UXl 8 9 r t i r < M f UXUXUXUXUXUXvXJXPXPXLXJXHXNXcX_./._.UXUXUX",
-"UX7.y r p p 0 s UXUXUXUXUXUXUXUXUXUX`.NXHXHXMXmX`./.^.UXUXUXUXUX",
-"UXUX+.y t y a UXUXUXUXUXUXUXUXUXUXUXUX_._.^.D.D.D.UXUXUXUXUXUXUX",
-"UXUXUXUXc K UXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUX"
-};
diff --git a/debian/icons/josm.png b/debian/icons/josm.png
deleted file mode 120000
index e018c55..0000000
--- a/debian/icons/josm.png
+++ /dev/null
@@ -1 +0,0 @@
-../../images/logo.png
\ No newline at end of file
diff --git a/debian/josm.desktop b/debian/josm.desktop
deleted file mode 100644
index 30805d1..0000000
--- a/debian/josm.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Josm
-GenericName=Java OpenStreetMap Editor
-Comment=Editor for OpenStreetMap.org
-Exec=josm
-Icon=josm
-StartupNotify=false
-Terminal=false
-Type=Application
-Categories=Education;Geography;
-StartupWMClass=org-openstreetmap-josm-Main
-Keywords=OpenStreetMap;OSM
diff --git a/debian/josm.menu b/debian/josm.menu
deleted file mode 100644
index 21e8a17..0000000
--- a/debian/josm.menu
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(josm): needs="X11" section="Applications/Science/Geoscience" title="Josm" command="/usr/bin/josm"\
-icon16x16="/usr/share/pixmaps/josm-16.xpm" icon32x32="/usr/share/pixmaps/josm-32.xpm"
diff --git a/debian/patches/08-josm-desktop-fixes.patch b/debian/patches/08-josm-desktop-fixes.patch
new file mode 100644
index 0000000..4b14a34
--- /dev/null
+++ b/debian/patches/08-josm-desktop-fixes.patch
@@ -0,0 +1,39 @@
+Description: Add Keywords to josm{,-latest}.desktop + validation fixes.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://josm.openstreetmap.de/ticket/11952
+Applied-Upstream: https://josm.openstreetmap.de/changeset/8841/josm
+
+--- a/linux/latest/usr/share/applications/josm-latest.desktop
++++ b/linux/latest/usr/share/applications/josm-latest.desktop
+@@ -4,10 +4,11 @@ Version=1.0
+ Name=JOSM (latest snapshot)
+ GenericName=Java OpenStreetMap Editor (latest)
+ Comment=Extensible off-line editor for OpenStreetMap (OSM)
+-Icon=josm-latest.png
++Icon=josm-latest
+ Exec=josm-latest %F
+ Terminal=false
+-MimeType=application/x-osm+xml;application/x-gpx+xml
++MimeType=application/x-osm+xml;application/x-gpx+xml;
+ StartupNotify=true
+-Categories=Education;Geoscience;Maps
++Categories=Education;Geoscience;Maps;
+ StartupWMClass=org-openstreetmap-josm-Main
++Keywords=OpenStreetMap;OSM;
+--- a/linux/tested/usr/share/applications/josm.desktop
++++ b/linux/tested/usr/share/applications/josm.desktop
+@@ -4,10 +4,11 @@ Version=1.0
+ Name=JOSM
+ GenericName=Java OpenStreetMap Editor
+ Comment=Extensible off-line editor for OpenStreetMap (OSM)
+-Icon=josm.png
++Icon=josm
+ Exec=josm %F
+ Terminal=false
+-MimeType=application/x-osm+xml;application/x-gpx+xml
++MimeType=application/x-osm+xml;application/x-gpx+xml;
+ StartupNotify=true
+-Categories=Education;Geoscience;Maps
++Categories=Education;Geoscience;Maps;
+ StartupWMClass=org-openstreetmap-josm-Main
++Keywords=OpenStreetMap;OSM;
diff --git a/debian/patches/series b/debian/patches/series
index cc73016..c7490a9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
05-fix_version.patch
06-move_data_out_of_jar.patch
07-use_system_fonts.patch
+08-josm-desktop-fixes.patch
diff --git a/debian/rules b/debian/rules
index aa911f2..fd39b60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,10 +39,8 @@ override_dh_auto_install:
install -m 644 $(CURDIR)/dist/josm-custom.jar $(CURDIR)/debian/josm/usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar
dh_link usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar usr/share/josm/josm.jar
install -m 755 $(CURDIR)/debian/josm.sh $(CURDIR)/debian/josm/usr/bin/josm
- install -m 644 $(CURDIR)/debian/icons/josm-16.xpm $(CURDIR)/debian/josm/usr/share/pixmaps/josm-16.xpm
- install -m 644 $(CURDIR)/debian/icons/josm-32.xpm $(CURDIR)/debian/josm/usr/share/pixmaps/josm-32.xpm
- install -m 644 $(CURDIR)/images/logo.png $(CURDIR)/debian/josm/usr/share/pixmaps/josm.png
- install -m 644 $(CURDIR)/debian/josm.desktop $(CURDIR)/debian/josm/usr/share/applications/josm.desktop
+ install -m 644 $(CURDIR)/linux/tested/usr/share/pixmaps/josm.png $(CURDIR)/debian/josm/usr/share/pixmaps/josm.png
+ install -m 644 $(CURDIR)/linux/tested/usr/share/applications/josm.desktop $(CURDIR)/debian/josm/usr/share/applications/josm.desktop
install -m 644 $(CURDIR)/linux/tested/usr/share/appdata/josm.appdata.xml $(CURDIR)/debian/josm/usr/share/appdata/josm.appdata.xml
override_dh_install:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git
More information about the Pkg-grass-devel
mailing list