This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository grass.
commit 1c42c5f33f03f5e18d6f3a6eceff42a0ff548932
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Thu Oct 22 21:40:42 2015 +0200
Use desktop file in favor of menu file per CTTE #741573.
---
debian/changelog | 6 +
debian/grass-core.dirs | 2 +-
debian/grass-core.dirs.in | 2 +-
debian/grass-core.menu | 5 -
debian/grass-core.menu.in | 5 -
debian/grass.xpm | 282 ------------------------------
debian/patches/ctte-741573.patch | 365 +++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 30 +---
9 files changed, 382 insertions(+), 316 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index da01195..f47450f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grass (7.0.2~rc1-1~exp2) UNRELEASED; urgency=medium
+
+ * Use desktop file in favor of menu file per CTTE #741573.
+
+ -- Bas Couwenberg <sebas...@debian.org> Thu, 22 Oct 2015 21:38:14 +0200
+
grass (7.0.2~rc1-1~exp1) experimental; urgency=medium
* New upstream release candidate.
diff --git a/debian/grass-core.dirs b/debian/grass-core.dirs
index fd619db..3cc00c1 100644
--- a/debian/grass-core.dirs
+++ b/debian/grass-core.dirs
@@ -2,6 +2,6 @@ usr/lib/grass70
usr/bin
usr/share/doc/grass-core
usr/share/man
-usr/share/icons/hicolor/32x32/apps
usr/share/icons/hicolor/48x48/apps
usr/share/icons/hicolor/64x64/apps
+usr/share/icons/hicolor/scalable/apps
diff --git a/debian/grass-core.dirs.in b/debian/grass-core.dirs.in
index 629871b..4c43627 100644
--- a/debian/grass-core.dirs.in
+++ b/debian/grass-core.dirs.in
@@ -2,6 +2,6 @@ usr/lib/grass@VERSION@
usr/bin
usr/share/doc/grass-core
usr/share/man
-usr/share/icons/hicolor/32x32/apps
usr/share/icons/hicolor/48x48/apps
usr/share/icons/hicolor/64x64/apps
+usr/share/icons/hicolor/scalable/apps
diff --git a/debian/grass-core.menu b/debian/grass-core.menu
deleted file mode 100644
index 8d04f52..0000000
--- a/debian/grass-core.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(grass-core):needs="text"\
- section="Applications/Science/Geoscience"\
- title="GRASS GIS"\
- command="/usr/bin/grass"\
- icon="/usr/share/icons/hicolor/32x32/apps/grass70.xpm"
diff --git a/debian/grass-core.menu.in b/debian/grass-core.menu.in
deleted file mode 100644
index dcbd86e..0000000
--- a/debian/grass-core.menu.in
+++ /dev/null
@@ -1,5 +0,0 @@
-?package(grass-core):needs="text"\
- section="Applications/Science/Geoscience"\
- title="GRASS GIS"\
- command="/usr/bin/grass"\
- icon="/usr/share/icons/hicolor/32x32/apps/grass@VERSION@.xpm"
diff --git a/debian/grass.xpm b/debian/grass.xpm
deleted file mode 100644
index 150501a..0000000
--- a/debian/grass.xpm
+++ /dev/null
@@ -1,282 +0,0 @@
-/* XPM */
-static char * grass70_xpm[] = {
-"32 32 247 2",
-" c None",
-". c #B9B9B9",
-"+ c #BDBDBD",
-"@ c #FFFFFF",
-"# c #C1C1C1",
-"$ c #C0C1C0",
-"% c #E8F6E8",
-"& c #52AD52",
-"* c #C5C5C5",
-"= c #BEBEBE",
-"- c #FDFEFD",
-"; c #F0F8F0",
-"> c #008400",
-", c #D2EBD2",
-"' c #FCFDFC",
-") c #C2C2C2",
-"! c #FEFEFE",
-"~ c #078E07",
-"{ c #8CCD8C",
-"] c #BFBFBF",
-"^ c #2C9F2C",
-"/ c #259C25",
-"( c #FEFFFE",
-"_ c #C1C2C1",
-": c #B0B0B0",
-"< c #7BC57B",
-"[ c #1A961A",
-"} c #C0E7C0",
-"| c #B2B2B2",
-"1 c #E5F4E5",
-"2 c #299C29",
-"3 c #B3DDB3",
-"4 c #ADDFAD",
-"5 c #CAC6CA",
-"6 c #AEAEAE",
-"7 c #F3F9F3",
-"8 c #F6FBF6",
-"9 c #57B457",
-"0 c #A6D8A6",
-"a c #65BA65",
-"b c #C3C3C3",
-"c c #A6A6A6",
-"d c #84C984",
-"e c #F5FAF5",
-"f c #C4E5C4",
-"g c #FFFEFF",
-"h c #229D22",
-"i c #D9EED9",
-"j c #A5A5A5",
-"k c #8BC98B",
-"l c #C6E6C6",
-"m c #CCE8CC",
-"n c #C7E6C7",
-"o c #ECF7EC",
-"p c #35A235",
-"q c #FBFDFB",
-"r c #159515",
-"s c #A4D7A4",
-"t c #C3E4C3",
-"u c #E1F2E1",
-"v c #4CAE4C",
-"w c #D3EBD3",
-"x c #AAAAAA",
-"y c #DCEFDC",
-"z c #7FC47F",
-"A c #6DBB6D",
-"B c #9CD39C",
-"C c #F4FAF4",
-"D c #C2E4C2",
-"E c #75C275",
-"F c #109310",
-"G c #C4C4C4",
-"H c #9D9D9D",
-"I c #B2DDB2",
-"J c #008700",
-"K c #D8EED8",
-"L c #FDFDFD",
-"M c #32A332",
-"N c #4CAD4C",
-"O c #979797",
-"P c #C0C0C0",
-"Q c #86C986",
-"R c #A3D6A3",
-"S c #1D961D",
-"T c #B7DFB7",
-"U c #CBE8CB",
-"V c #F8FCF8",
-"W c #4AAC4A",
-"X c #49AD49",
-"Y c #83C883",
-"Z c #A8A8A8",
-"` c #C8E7C8",
-" . c #CFE9CF",
-".. c #229922",
-"+. c #7AC57A",
-"@. c #99D299",
-"#. c #E0F1E0",
-"$. c #E7F4E7",
-"%. c #5CB75C",
-"&. c #42AA42",
-"*. c #98D298",
-"=. c #ACDAAC",
-"-. c #ADADAD",
-";. c #FBFBFB",
-">. c #FAFDFA",
-",. c #55B455",
-"'. c #008800",
-"). c #75C375",
-"!. c #D1EAD1",
-"~. c #AEDAAE",
-"{. c #7CC47C",
-"]. c #40A740",
-"^. c #6BBE6B",
-"/. c #DBEFDB",
-"(. c #A9A9A9",
-"_. c #909090",
-":. c #C9C9C9",
-"<. c #F9F9F9",
-"[. c #D8EDD8",
-"}. c #E5F3E5",
-"|. c #A8D8A8",
-"1. c #6EBD6E",
-"2. c #37A437",
-"3. c #DEF0DE",
-"4. c #289C28",
-"5. c #5BB35B",
-"6. c #D5EDD5",
-"7. c #29A129",
-"8. c #EEF7EE",
-"9. c #C9E7C9",
-"0. c #FCFEFC",
-"a. c #7A7A7A",
-"b. c #F0F0F0",
-"c. c #505050",
-"d. c #70C070",
-"e. c #34A534",
-"f. c #068D06",
-"g. c #4DB04D",
-"h. c #96D196",
-"i. c #239B23",
-"j. c #41AA41",
-"k. c #9ED49E",
-"l. c #F1F9F1",
-"m. c #7C7C7C",
-"n. c #989898",
-"o. c #4C4C4C",
-"p. c #CACACA",
-"q. c #F7F7F7",
-"r. c #B1DCB1",
-"s. c #A4D6A4",
-"t. c #71BE71",
-"u. c #5BB75B",
-"v. c #048E04",
-"w. c #7FC67F",
-"x. c #B9E0B9",
-"y. c #86CA86",
-"z. c #4CB04C",
-"A. c #848484",
-"B. c #999999",
-"C. c #565656",
-"D. c #FFFBFF",
-"E. c #1F991F",
-"F. c #E9F5E9",
-"G. c #48AD48",
-"H. c #88CB88",
-"I. c #28A028",
-"J. c #229B22",
-"K. c #93CF93",
-"L. c #AEDBAE",
-"M. c #63B963",
-"N. c #8C8C8C",
-"O. c #8B8B8B",
-"P. c #3B3B3B",
-"Q. c #3A3A3A",
-"R. c #CAC9CA",
-"S. c #90CC90",
-"T. c #81C481",
-"U. c #ABDAAB",
-"V. c #39A939",
-"W. c #058C05",
-"X. c #58B358",
-"Y. c #94D094",
-"Z. c #A9DDA9",
-"`. c #949494",
-" + c #000000",
-".+ c #E5E5E5",
-"++ c #2E2E2E",
-"@+ c #333433",
-"#+ c #CCCCCC",
-"$+ c #008000",
-"%+ c #FAFCFA",
-"&+ c #62BA62",
-"*+ c #048904",
-"=+ c #7AC27A",
-"-+ c #86C786",
-";+ c #199A19",
-">+ c #6BC06B",
-",+ c #A6B5A6",
-"'+ c #9D9E9D",
-")+ c #060606",
-"!+ c #ADBFAD",
-"~+ c #6CB96C",
-"{+ c #249E24",
-"]+ c #56B556",
-"^+ c #0B900B",
-"/+ c #1D9F1D",
-"(+ c #90AB90",
-"_+ c #ABA6AB",
-":+ c #262626",
-"<+ c #303030",
-"[+ c #A7BEA7",
-"}+ c #F3F2F3",
-"|+ c #58B458",
-"1+ c #74C274",
-"2+ c #95D495",
-"3+ c #3D873D",
-"4+ c #A7A4A7",
-"5+ c #ACACAC",
-"6+ c #393939",
-"7+ c #030303",
-"8+ c #343434",
-"9+ c #D2D3D2",
-"0+ c #B8D8B8",
-"a+ c #44A644",
-"b+ c #BBBFBB",
-"c+ c #A7A5A7",
-"d+ c #2F2F2F",
-"e+ c #020202",
-"f+ c #343534",
-"g+ c #E2DCE2",
-"h+ c #1A921A",
-"i+ c #CCC6CC",
-"j+ c #B3B3B3",
-"k+ c #272727",
-"l+ c #313131",
-"m+ c #C6D0C6",
-"n+ c #B3B2B3",
-"o+ c #292929",
-"p+ c #252625",
-"q+ c #EBEBEB",
-"r+ c #EAEAEA",
-"s+ c #E9E9E9",
-"t+ c #F1F1F1",
-"u+ c #222222",
-"v+ c #9F9F9F",
-"w+ c #C6C6C6",
-"x+ c #202020",
-" . ",
-" + @ # ",
-" + @ @ @ $ ",
-" # @ % & @ @ * ",
-" = @ - ; > , ' @ ) ",
-" + @ ! ! @ ~ { @ ! @ # ",
-" ] @ ! ! @ @ ^ / @ ( ! @ _ ",
-" : @ ! ! @ @ @ < [ @ ( @ @ } _ ",
-" | @ ! ! @ @ ( - 1 2 @ @ @ @ 3 4 5 ",
-" 6 @ 7 8 ! ( ! @ ! ' 9 @ @ @ @ 0 a @ b ",
-" c @ ! @ d @ @ @ e @ @ f @ g ! @ h i - @ ) ",
-" j @ ! @ ! k l - @ m @ @ n @ @ - o p @ @ @ @ b ",
-" c @ ! ! @ q @ r @ @ s @ @ t @ - u v w - ! @ @ @ b ",
-" x ! ! ! @ @ y ; z A @ B C @ D @ @ E F @ @ @ @ @ @ @ G ",
-" H @ ! ! @ @ @ @ I 8 J K s w q f L I M N @ @ @ @ @ ! ! @ O ",
-" P @ ! ! @ @ ( @ Q R S f T 7 U V W X Y @ @ @ @ ! ! ! 6 ",
-" Z ! ! ! @ ! - ` ...+.@.#.$.%.&.*.=.- g @ ! ! L -. ",
-" 6 ;.! @ >.@ @ ,.1 '.).!.~.{.].^.C /.@ ! ! @ (. ",
-" _.:.<.- [.}.q T |.1.2.3.4.5.6.7.8.9.0.! @ G a.b. ",
-" c.:.<.@ d.@ @ e.@ f.g.h.i.@ j.k.l.- @ b m.n. ",
-" o.p.q.r.s.! t.U u.v.w.x.U y.z.@ @ G A.B. ",
-" C.p.D.E.@ F.G.H.I.J.@ K.L.M.@ P N.O. ",
-" P.Q.R.S.T.@ ^ U.V.W.@ X.Y.Z.) `. +.+ ",
-" ++@+#+$+%+R &+*+=+-+;+>+,+'+)+ ",
-" ++@+!+~+@ {+]+@ ^+/+(+_+ + ",
-" :+<+[+}+|+1+@ 2+3+4+ +5+ ",
-" 6+7+8+9+0+a+@ b+c+ + +Z ",
-" d+e+f+g+h+i+6 + +j+ ",
-" k+e+l+m+n+ + +6 ",
-" o+e+p+ + +j ",
-" q+r+r+r+r+r+r+s+t+u+7+ +v+ ",
-" G * * * * * * * w+ x+B. :.p.p.p.p.p.p.p. "};
diff --git a/debian/patches/ctte-741573.patch b/debian/patches/ctte-741573.patch
new file mode 100644
index 0000000..cdbd1bd
--- /dev/null
+++ b/debian/patches/ctte-741573.patch
@@ -0,0 +1,365 @@
+Description: Drop menu file in favor of desktop file.
+ The menu files are no longer required for the Debian packages since
+ [CTTE #741573] Debian Menu System
(https://lists.debian.org/debian-devel-announce/2015/09/msg00000.html)
+ which advised:
+ .
+ In addition to those changes, the Technical Committee resolves that
+ packages providing a .desktop file shall not also provide a menu file
+ for the same application.
+ .
+ The menu file and its associated XPM icon are removed, leaving the
+ desktop file and its associated PNG icons in its place.
+ .
+ The PNG icons are installed in the hicolor theme following the
+ Icon Theme Specification
(http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#install_icons)
+ .
+ The SVG icon
(https://grass.osgeo.org/uploads/images/logo/grasslogo_vector.svg)
+ is also installed to have an icon for all size besides 48x48 & 64x64.
+Author: Bas Couwenberg <sebas...@debian.org>
+Forwarded: https://trac.osgeo.org/grass/ticket/2777
+
+--- a/gui/icons/grass.menu
++++ /dev/null
+@@ -1,5 +0,0 @@
+-?package(grass):needs="text"\
+- section="Applications/Science/Geoscience"\
+- title="GRASS GIS 7"\
+- command="/usr/bin/grass7"\
+- icon="grass.xpm"
+--- a/gui/icons/grass.xpm
++++ /dev/null
+@@ -1,282 +0,0 @@
+-/* XPM */
+-static char * grass64_xpm[] = {
+-"32 32 247 2",
+-" c None",
+-". c #B9B9B9",
+-"+ c #BDBDBD",
+-"@ c #FFFFFF",
+-"# c #C1C1C1",
+-"$ c #C0C1C0",
+-"% c #E8F6E8",
+-"& c #52AD52",
+-"* c #C5C5C5",
+-"= c #BEBEBE",
+-"- c #FDFEFD",
+-"; c #F0F8F0",
+-"> c #008400",
+-", c #D2EBD2",
+-"' c #FCFDFC",
+-") c #C2C2C2",
+-"! c #FEFEFE",
+-"~ c #078E07",
+-"{ c #8CCD8C",
+-"] c #BFBFBF",
+-"^ c #2C9F2C",
+-"/ c #259C25",
+-"( c #FEFFFE",
+-"_ c #C1C2C1",
+-": c #B0B0B0",
+-"< c #7BC57B",
+-"[ c #1A961A",
+-"} c #C0E7C0",
+-"| c #B2B2B2",
+-"1 c #E5F4E5",
+-"2 c #299C29",
+-"3 c #B3DDB3",
+-"4 c #ADDFAD",
+-"5 c #CAC6CA",
+-"6 c #AEAEAE",
+-"7 c #F3F9F3",
+-"8 c #F6FBF6",
+-"9 c #57B457",
+-"0 c #A6D8A6",
+-"a c #65BA65",
+-"b c #C3C3C3",
+-"c c #A6A6A6",
+-"d c #84C984",
+-"e c #F5FAF5",
+-"f c #C4E5C4",
+-"g c #FFFEFF",
+-"h c #229D22",
+-"i c #D9EED9",
+-"j c #A5A5A5",
+-"k c #8BC98B",
+-"l c #C6E6C6",
+-"m c #CCE8CC",
+-"n c #C7E6C7",
+-"o c #ECF7EC",
+-"p c #35A235",
+-"q c #FBFDFB",
+-"r c #159515",
+-"s c #A4D7A4",
+-"t c #C3E4C3",
+-"u c #E1F2E1",
+-"v c #4CAE4C",
+-"w c #D3EBD3",
+-"x c #AAAAAA",
+-"y c #DCEFDC",
+-"z c #7FC47F",
+-"A c #6DBB6D",
+-"B c #9CD39C",
+-"C c #F4FAF4",
+-"D c #C2E4C2",
+-"E c #75C275",
+-"F c #109310",
+-"G c #C4C4C4",
+-"H c #9D9D9D",
+-"I c #B2DDB2",
+-"J c #008700",
+-"K c #D8EED8",
+-"L c #FDFDFD",
+-"M c #32A332",
+-"N c #4CAD4C",
+-"O c #979797",
+-"P c #C0C0C0",
+-"Q c #86C986",
+-"R c #A3D6A3",
+-"S c #1D961D",
+-"T c #B7DFB7",
+-"U c #CBE8CB",
+-"V c #F8FCF8",
+-"W c #4AAC4A",
+-"X c #49AD49",
+-"Y c #83C883",
+-"Z c #A8A8A8",
+-"` c #C8E7C8",
+-" . c #CFE9CF",
+-".. c #229922",
+-"+. c #7AC57A",
+-"@. c #99D299",
+-"#. c #E0F1E0",
+-"$. c #E7F4E7",
+-"%. c #5CB75C",
+-"&. c #42AA42",
+-"*. c #98D298",
+-"=. c #ACDAAC",
+-"-. c #ADADAD",
+-";. c #FBFBFB",
+-">. c #FAFDFA",
+-",. c #55B455",
+-"'. c #008800",
+-"). c #75C375",
+-"!. c #D1EAD1",
+-"~. c #AEDAAE",
+-"{. c #7CC47C",
+-"]. c #40A740",
+-"^. c #6BBE6B",
+-"/. c #DBEFDB",
+-"(. c #A9A9A9",
+-"_. c #909090",
+-":. c #C9C9C9",
+-"<. c #F9F9F9",
+-"[. c #D8EDD8",
+-"}. c #E5F3E5",
+-"|. c #A8D8A8",
+-"1. c #6EBD6E",
+-"2. c #37A437",
+-"3. c #DEF0DE",
+-"4. c #289C28",
+-"5. c #5BB35B",
+-"6. c #D5EDD5",
+-"7. c #29A129",
+-"8. c #EEF7EE",
+-"9. c #C9E7C9",
+-"0. c #FCFEFC",
+-"a. c #7A7A7A",
+-"b. c #F0F0F0",
+-"c. c #505050",
+-"d. c #70C070",
+-"e. c #34A534",
+-"f. c #068D06",
+-"g. c #4DB04D",
+-"h. c #96D196",
+-"i. c #239B23",
+-"j. c #41AA41",
+-"k. c #9ED49E",
+-"l. c #F1F9F1",
+-"m. c #7C7C7C",
+-"n. c #989898",
+-"o. c #4C4C4C",
+-"p. c #CACACA",
+-"q. c #F7F7F7",
+-"r. c #B1DCB1",
+-"s. c #A4D6A4",
+-"t. c #71BE71",
+-"u. c #5BB75B",
+-"v. c #048E04",
+-"w. c #7FC67F",
+-"x. c #B9E0B9",
+-"y. c #86CA86",
+-"z. c #4CB04C",
+-"A. c #848484",
+-"B. c #999999",
+-"C. c #565656",
+-"D. c #FFFBFF",
+-"E. c #1F991F",
+-"F. c #E9F5E9",
+-"G. c #48AD48",
+-"H. c #88CB88",
+-"I. c #28A028",
+-"J. c #229B22",
+-"K. c #93CF93",
+-"L. c #AEDBAE",
+-"M. c #63B963",
+-"N. c #8C8C8C",
+-"O. c #8B8B8B",
+-"P. c #3B3B3B",
+-"Q. c #3A3A3A",
+-"R. c #CAC9CA",
+-"S. c #90CC90",
+-"T. c #81C481",
+-"U. c #ABDAAB",
+-"V. c #39A939",
+-"W. c #058C05",
+-"X. c #58B358",
+-"Y. c #94D094",
+-"Z. c #A9DDA9",
+-"`. c #949494",
+-" + c #000000",
+-".+ c #E5E5E5",
+-"++ c #2E2E2E",
+-"@+ c #333433",
+-"#+ c #CCCCCC",
+-"$+ c #008000",
+-"%+ c #FAFCFA",
+-"&+ c #62BA62",
+-"*+ c #048904",
+-"=+ c #7AC27A",
+-"-+ c #86C786",
+-";+ c #199A19",
+-">+ c #6BC06B",
+-",+ c #A6B5A6",
+-"'+ c #9D9E9D",
+-")+ c #060606",
+-"!+ c #ADBFAD",
+-"~+ c #6CB96C",
+-"{+ c #249E24",
+-"]+ c #56B556",
+-"^+ c #0B900B",
+-"/+ c #1D9F1D",
+-"(+ c #90AB90",
+-"_+ c #ABA6AB",
+-":+ c #262626",
+-"<+ c #303030",
+-"[+ c #A7BEA7",
+-"}+ c #F3F2F3",
+-"|+ c #58B458",
+-"1+ c #74C274",
+-"2+ c #95D495",
+-"3+ c #3D873D",
+-"4+ c #A7A4A7",
+-"5+ c #ACACAC",
+-"6+ c #393939",
+-"7+ c #030303",
+-"8+ c #343434",
+-"9+ c #D2D3D2",
+-"0+ c #B8D8B8",
+-"a+ c #44A644",
+-"b+ c #BBBFBB",
+-"c+ c #A7A5A7",
+-"d+ c #2F2F2F",
+-"e+ c #020202",
+-"f+ c #343534",
+-"g+ c #E2DCE2",
+-"h+ c #1A921A",
+-"i+ c #CCC6CC",
+-"j+ c #B3B3B3",
+-"k+ c #272727",
+-"l+ c #313131",
+-"m+ c #C6D0C6",
+-"n+ c #B3B2B3",
+-"o+ c #292929",
+-"p+ c #252625",
+-"q+ c #EBEBEB",
+-"r+ c #EAEAEA",
+-"s+ c #E9E9E9",
+-"t+ c #F1F1F1",
+-"u+ c #222222",
+-"v+ c #9F9F9F",
+-"w+ c #C6C6C6",
+-"x+ c #202020",
+-" . ",
+-" + @ # ",
+-" + @ @ @ $ ",
+-" # @ % & @ @ * ",
+-" = @ - ; > , ' @ ) ",
+-" + @ ! ! @ ~ { @ ! @ # ",
+-" ] @ ! ! @ @ ^ / @ ( ! @ _ ",
+-" : @ ! ! @ @ @ < [ @ ( @ @ } _ ",
+-" | @ ! ! @ @ ( - 1 2 @ @ @ @ 3 4 5 ",
+-" 6 @ 7 8 ! ( ! @ ! ' 9 @ @ @ @ 0 a @ b ",
+-" c @ ! @ d @ @ @ e @ @ f @ g ! @ h i - @ ) ",
+-" j @ ! @ ! k l - @ m @ @ n @ @ - o p @ @ @ @ b ",
+-" c @ ! ! @ q @ r @ @ s @ @ t @ - u v w - ! @ @ @ b ",
+-" x ! ! ! @ @ y ; z A @ B C @ D @ @ E F @ @ @ @ @ @ @ G ",
+-" H @ ! ! @ @ @ @ I 8 J K s w q f L I M N @ @ @ @ @ ! ! @ O ",
+-" P @ ! ! @ @ ( @ Q R S f T 7 U V W X Y @ @ @ @ ! ! ! 6 ",
+-" Z ! ! ! @ ! - ` ...+.@.#.$.%.&.*.=.- g @ ! ! L -. ",
+-" 6 ;.! @ >.@ @ ,.1 '.).!.~.{.].^.C /.@ ! ! @ (. ",
+-" _.:.<.- [.}.q T |.1.2.3.4.5.6.7.8.9.0.! @ G a.b. ",
+-" c.:.<.@ d.@ @ e.@ f.g.h.i.@ j.k.l.- @ b m.n. ",
+-" o.p.q.r.s.! t.U u.v.w.x.U y.z.@ @ G A.B. ",
+-" C.p.D.E.@ F.G.H.I.J.@ K.L.M.@ P N.O. ",
+-" P.Q.R.S.T.@ ^ U.V.W.@ X.Y.Z.) `. +.+ ",
+-" ++@+#+$+%+R &+*+=+-+;+>+,+'+)+ ",
+-" ++@+!+~+@ {+]+@ ^+/+(+_+ + ",
+-" :+<+[+}+|+1+@ 2+3+4+ +5+ ",
+-" 6+7+8+9+0+a+@ b+c+ + +Z ",
+-" d+e+f+g+h+i+6 + +j+ ",
+-" k+e+l+m+n+ + +6 ",
+-" o+e+p+ + +j ",
+-" q+r+r+r+r+r+r+s+t+u+7+ +v+ ",
+-" G * * * * * * * w+ x+B. :.p.p.p.p.p.p.p. "};
+--- a/gui/icons/Makefile
++++ b/gui/icons/Makefile
+@@ -20,6 +20,12 @@ HTMLDIRS = \
+ default: $(ETCICONS) $(HTMLICONS)
+ $(MKDIR) $(ARCH_DISTDIR)/share/applications
+ $(INSTALL_DATA) grass.desktop $(ARCH_DISTDIR)/share/applications
++ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/48x48/apps
++ $(INSTALL_DATA) grass-48x48.png
$(ARCH_DISTDIR)/share/icons/hicolor/48x48/apps/grass70.png
++ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/64x64/apps
++ $(INSTALL_DATA) grass-64x64.png
$(ARCH_DISTDIR)/share/icons/hicolor/64x64/apps/grass70.png
++ $(MKDIR) $(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps
++ $(INSTALL_DATA) grass.svg
$(ARCH_DISTDIR)/share/icons/hicolor/scalable/apps/grass70.svg
+ $(MKDIR) $(ARCH_DISTDIR)/share/appdata
+ $(INSTALL_DATA) grass.appdata.xml $(ARCH_DISTDIR)/share/appdata
+
+--- /dev/null
++++ b/gui/icons/grass.svg
+@@ -0,0 +1,33 @@
++<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
++<svg width="206.847" height="224.15">
++ <defs>
++ <marker id="ArrowEnd" viewBox="0 0 10 10" refX="0" refY="5"
++ markerUnits="strokeWidth"
++ markerWidth="4"
++ markerHeight="3"
++ orient="auto">
++ <path d="M 0 0 L 10 5 L 0 10 z" />
++ </marker>
++ <marker id="ArrowStart" viewBox="0 0 10 10" refX="10" refY="5"
++ markerUnits="strokeWidth"
++ markerWidth="4"
++ markerHeight="3"
++ orient="auto">
++ <path d="M 10 0 L 0 5 L 10 10 z" />
++ </marker> </defs>
++<g>
++<path style="stroke:#000000; stroke-width:1.8; fill:none" d="M 116.294
213.434L 176.894 213.434"/>
++<path style="stroke:none; fill:#009000" d="M 132.734 88.0936L 132.434
89.4736L 130.874 93.0735L 127.094 99.4335L 116.294 116.054L 110.114 125.174L
105.134 134.054L 102.614 140.594L 105.134 144.494L 107.534 139.574L 116.474
122.414L 125.534 107.294L 129.314 99.9136L 132.434 93.7935L 133.274 91.6935L
133.454 89.6536L 133.094 88.0936L 132.734 88.0936z"/>
++<path style="stroke:none; fill:#009000" d="M 147.194 56.4136L 149.594
58.8135L 150.914 61.3936L 151.454 64.2736L 151.274 67.8735L 150.794 70.0936L
149.414 73.8735L 138.254 96.0135L 131.414 108.854L 125.714 120.854L 121.454
129.794L 113.534 146.414L 110.654 153.074L 106.514 162.374L 105.134 166.634L
103.814 171.254L 103.454 176.234L 101.414 159.614L 104.474 157.394L 106.214
153.254L 113.054 135.614L 121.274 118.814L 131.054 99.4335L 138.734 85.0336L
146.294 71.4736L 148.214 67.0336L 149. [...]
++<path style="stroke:none; fill:#009000" d="M 128.714 171.374L 130.334
160.994L 132.074 151.574L 135.314 141.974L 138.254 134.594L 141.194 124.634L
142.214 118.634L 142.034 125.834L 140.474 135.794L 137.054 149.174L 135.494
156.674L 134.834 162.014L 134.594 165.074L 129.314 170.234L 128.714 171.374z"/>
++<path style="stroke:none; fill:#009000" d="M 144.254 52.4536L 139.454
84.3135L 137.054 93.7935L 133.934 106.994L 128.294 129.614L 125.534 142.454L
122.654 157.994L 119.174 169.034L 123.434 177.074L 125.414 174.494L 128.654
149.294L 135.674 115.214L 140.654 89.8336L 144.434 61.6935L 145.094 52.6335L
144.254 52.4536z"/>
++<path style="stroke:none; fill:#009000" d="M 59.2335 70.1536L 63.3135
75.8535L 81.1335 102.554L 97.4535 128.474L 108.914 148.034L 118.334 165.494L
121.094 171.854L 123.794 176.654L 118.874 181.694L 117.614 175.874L 112.874
167.234L 107.534 158.294L 99.3135 144.554L 87.6735 126.074L 78.9135 112.154L
74.6535 104.774L 71.2335 98.6536L 65.5335 86.4736L 62.2935 79.0936L 60.0735
73.5735L 58.8735 70.1536L 59.2335 70.1536z"/>
++<path style="stroke:none; fill:#009000" d="M 101.414 181.274L 96.8535
150.014L 95.5335 137.894L 91.7535 108.374L 90.7335 93.8535L 90.4935 76.2736L
93.4335 95.5336L 95.8935 116.294L 99.6735 141.674L 101.714 160.154L 106.214
194.114L 102.614 187.754L 101.414 181.274z"/>
++<path style="stroke:none; fill:#009000" d="M 101.894 161.234L 102.614
148.514L 105.734 122.894L 106.754 111.374L 108.494 91.4536L 108.614 72.7935L
109.874 72.7935L 109.454 95.9536L 108.494 106.934L 105.614 135.494L 103.454
160.634"/>
++<path style="stroke:#000000; stroke-width:0.9; fill:#000000" d="M 105.134
202.274L 179.174 127.694L 181.154 130.274L 159.194 151.994L 161.714 155.174L
139.454 177.434L 142.874 180.854L 104.894 219.434L 66.5535 180.854L 70.0335
177.734L 46.8735 155.174L 50.2935 151.994L 28.0335 129.974L 30.3135 128.294L
105.134 202.274z"/>
++<path style="stroke:#000000; stroke-width:1.8; fill:none" d="M 30.0135
213.254L 92.8935 213.254"/>
++<path style="stroke:none; fill:#009000" d="M 56.4735 125.054L 58.8735
127.454L 61.4535 131.054L 66.2535 138.374L 71.4135 146.834L 78.7335 160.034L
83.8935 169.934L 86.2935 174.434L 87.1335 177.134L 100.334 189.854L 99.3135
185.714L 94.8735 172.154L 87.4935 152.954L 80.4735 134.774L 76.8735 126.074L
73.9335 119.534L 71.0535 114.254L 67.7535 108.554L 65.7135 105.314L 64.0335
102.374L 61.4535 99.4935L 57.1335 95.0535L 54.4335 91.7535L 60.9135 97.7535L
64.8735 101.714L 69.8535 108.254L 79.6 [...]
++<path style="stroke:none; fill:#009000" d="M 107.114 72.0735L 106.274
67.8135L 106.574 66.9736L 106.874 66.2535L 106.754 64.5735L 106.454 63.9736L
105.914 63.7335L 105.314 62.4136L 105.734 60.9736L 105.314 60.1335L 104.774
59.7136L 104.294 58.6935L 104.474 57.9736L 104.294 57.5535L 103.754 57.4335L
103.154 56.5936L 103.334 55.6935L 103.034 55.1536L 102.614 54.6735L 102.194
54.1335L 102.194 53.4136L 101.594 52.6935L 101.174 51.7935L 101.354 50.9536L
102.314 49.8135L 102.014 48.6735L 101. [...]
++<path style="stroke:#000000; stroke-width:1.8; fill:none" d="M 9.43352
102.794L 105.314 195.254L 197.414 102.014L 103.634 9.43353L 9.73352 103.514"/>
++</g>
++</svg>
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index b07636b..8c61877 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ no-fail-html.patch
desktop.patch
appstream.patch
various-typos.patch
+ctte-741573.patch
diff --git a/debian/rules b/debian/rules
index e6f13ed..41047de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -120,7 +120,7 @@ override_dh_auto_install-arch:
# delete extra license files
$(RM) debian/tmp/usr/lib/$(BASE_NAME)/etc/license
-
+
# delete python compiled bytecode files (maybe dh_python2 takes care of
this for us?)
find debian/tmp/ -type f -name "*.pyc" -delete
@@ -150,28 +150,16 @@ override_dh_auto_install-arch:
# install pkg-config file
install -m 644 grass.pc
debian/$(PKG_NAME)-dev/usr/share/pkgconfig/$(BASE_NAME).pc
- # install icon file for debian menu system
- install -d debian/tmp/usr/share/icons \
- debian/tmp/usr/share/applications \
- debian/tmp/usr/bin
- # is there a better way to make these exist?
- mkdir -p debian/tmp/usr/share/icons/hicolor/32x32/apps
- mkdir -p debian/tmp/usr/share/icons/hicolor/48x48/apps
- mkdir -p debian/tmp/usr/share/icons/hicolor/64x64/apps
+ # install icons and desktop file
+ mkdir -p debian/tmp/usr/share/icons
+ mv debian/tmp/usr/lib/$(BASE_NAME)/share/icons/hicolor
debian/tmp/usr/share/icons
+
mkdir -p debian/tmp/usr/share/applications
- install -m 644 debian/grass.xpm \
- debian/tmp/usr/share/icons/hicolor/32x32/apps/$(BASE_NAME).xpm
- install -m 644 gui/icons/grass-48x48.png \
- debian/tmp/usr/share/icons/hicolor/48x48/apps/$(BASE_NAME).png
- install -m 644 gui/icons/grass-64x64.png \
- debian/tmp/usr/share/icons/hicolor/64x64/apps/$(BASE_NAME).png
- install -m 644 gui/icons/grass.desktop \
- debian/tmp/usr/share/applications/$(BASE_NAME).desktop
+ mv debian/tmp/usr/lib/$(BASE_NAME)/share/applications/grass.desktop
debian/tmp/usr/share/applications/$(BASE_NAME).desktop
# install AppStream metadata
- mkdir -p debian/tmp/usr/share/appdata/
- install -m 644 gui/icons/grass.appdata.xml \
- debian/tmp/usr/share/appdata/$(BASE_NAME).appdata.xml
+ mkdir -p debian/tmp/usr/share/appdata
+ mv debian/tmp/usr/lib/$(BASE_NAME)/share/appdata/grass.appdata.xml
debian/tmp/usr/share/appdata/$(BASE_NAME).appdata.xml
# install grass wrapper scripts
install -m 755 debian/x-grass7 debian/tmp/usr/bin/x-$(BASE_NAME)
@@ -193,8 +181,6 @@ override_dh_auto_install-arch:
debian/tmp/usr/lib/$(BASE_NAME)/contributors_extra.csv \
debian/tmp/usr/lib/$(BASE_NAME)/translation_status.json \
debian/tmp/usr/lib/$(BASE_NAME)/translators.csv \
-
debian/tmp/usr/lib/$(BASE_NAME)/share/appdata/grass.appdata.xml \
-
debian/tmp/usr/lib/$(BASE_NAME)/share/applications/grass.desktop \
debian/tmp/usr/lib/$(BASE_NAME)/demolocation/
# Move image files from /usr/lib/$(BASE_NAME) to /usr/share/$(BASE_NAME)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/grass.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
