[SCM] Amarok packaging branch, master, updated. debian/2.8.0-4-2-g9ffeb04
Pino Toscano
pino at moszumanska.debian.org
Sun Jan 24 15:25:35 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=9ffeb04
The following commit has been merged in the master branch:
commit 9ffeb043026974df40dd9f7207265296ca59a42b
Author: Pino Toscano <pino at debian.org>
Date: Sun Jan 24 16:24:52 2016 +0100
drop menu file and its pixmaps
amarok already provides a .desktop file
---
debian/amarok.install | 1 -
debian/amarok.menu | 8 --
debian/changelog | 3 +
debian/icons/amarok-16.xpm | 210 -------------------------------------------
debian/icons/amarok.xpm | 220 ---------------------------------------------
5 files changed, 3 insertions(+), 439 deletions(-)
diff --git a/debian/amarok.install b/debian/amarok.install
index 10f7de9..8aae0db 100644
--- a/debian/amarok.install
+++ b/debian/amarok.install
@@ -1,4 +1,3 @@
-debian/icons/* /usr/share/pixmaps
usr/bin/amarok
usr/bin/amarokmp3tunesharmonydaemon
usr/bin/amarokpkg
diff --git a/debian/amarok.menu b/debian/amarok.menu
deleted file mode 100644
index d2e2ead..0000000
--- a/debian/amarok.menu
+++ /dev/null
@@ -1,8 +0,0 @@
-?package(amarok):\
- needs="X11"\
- section="Applications/Sound"\
- hints="KDE"\
- title="Amarok"\
- icon32x32="/usr/share/pixmaps/amarok.xpm"\
- icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
- command="/usr/bin/amarok"
diff --git a/debian/changelog b/debian/changelog
index e159692..a4d9946 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
amarok (2.8.0-5) UNRELEASED; urgency=medium
+ [ Pino Toscano ]
+ * Drop menu file and its pixmaps, since amarok already provides a .desktop
+ file.
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Sun, 24 Jan 2016 16:19:34 +0100
diff --git a/debian/icons/amarok-16.xpm b/debian/icons/amarok-16.xpm
deleted file mode 100644
index 80a228f..0000000
--- a/debian/icons/amarok-16.xpm
+++ /dev/null
@@ -1,210 +0,0 @@
-/* XPM */
-static char *amarok-16[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 188 2",
-" c black",
-". c #010203",
-"X c #010304",
-"o c #030405",
-"O c #030406",
-"+ c #05070A",
-"@ c #03080C",
-"# c #05090D",
-"$ c #04090F",
-"% c #050A10",
-"& c #070F17",
-"* c #071019",
-"= c #0A1521",
-"- c #0B1825",
-"; c #0D1824",
-": c #0D1926",
-"> c #0F1A26",
-", c #0F1E2C",
-"< c #0E1F30",
-"1 c #101D2A",
-"2 c #0F2133",
-"3 c #102030",
-"4 c #132436",
-"5 c #132639",
-"6 c #142638",
-"7 c #17293B",
-"8 c #14283C",
-"9 c #152A40",
-"0 c #193047",
-"q c #193149",
-"w c #19324B",
-"e c #203A55",
-"r c #223D59",
-"t c #26415E",
-"y c #234562",
-"u c #22456C",
-"i c #23486F",
-"p c #26486E",
-"a c #284360",
-"s c #294663",
-"d c #244A71",
-"f c #264F7A",
-"g c #294A70",
-"h c #2A4B71",
-"j c #2D4D73",
-"k c #29537B",
-"l c #2D5178",
-"z c #304F74",
-"x c #35506D",
-"c c #325176",
-"v c #325277",
-"b c #335377",
-"n c #355377",
-"m c #365575",
-"M c #37567A",
-"N c #32597F",
-"B c #33587E",
-"V c #375A7F",
-"C c #385472",
-"Z c #395572",
-"A c #3A5675",
-"S c #38567A",
-"D c #3B5876",
-"F c #3A597A",
-"G c #3B587A",
-"H c #3B5A7B",
-"J c #3B587C",
-"K c #405C7F",
-"L c #445E7F",
-"P c #46607E",
-"I c #2B5781",
-"U c #385C82",
-"Y c #376088",
-"T c #37628A",
-"R c #3A688F",
-"E c #3E6A90",
-"W c #3F6B92",
-"Q c #415D80",
-"! c #435E81",
-"~ c #445F80",
-"^ c #445F82",
-"/ c #466686",
-"( c #476687",
-") c #4A6486",
-"_ c #4E6989",
-"` c #4F6E8F",
-"' c #42769E",
-"] c #46769D",
-"[ c #50698A",
-"{ c #506A89",
-"} c #516A89",
-"| c #506F8F",
-" . c #546D8C",
-".. c #556E8E",
-"X. c #5B7088",
-"o. c #5B718A",
-"O. c #587591",
-"+. c #5B7491",
-"@. c #5E7B9A",
-"#. c #487BA2",
-"$. c #6F7D8C",
-"%. c #607790",
-"&. c #637B97",
-"*. c #627E9B",
-"=. c #6B7D90",
-"-. c #4980A8",
-";. c #4A83AA",
-":. c #5491B8",
-">. c #5693B9",
-",. c #5E99BE",
-"<. c #658DAC",
-"1. c #6A87A0",
-"2. c #6A87A4",
-"3. c #6D89A7",
-"4. c #758BA2",
-"5. c #758FA9",
-"6. c #7E8FA1",
-"7. c #7F93A7",
-"8. c #7997AC",
-"9. c #63A5CA",
-"0. c #6CA7CA",
-"q. c #6CA8CB",
-"w. c #8B949E",
-"e. c #8093A7",
-"r. c #8594A4",
-"t. c #8395A8",
-"y. c #8D99A6",
-"u. c #8F9DAB",
-"i. c #93A0AD",
-"p. c #9AA0A8",
-"a. c #9EA7B1",
-"s. c #A5A6A7",
-"d. c #A3ACB7",
-"f. c #A9AFB7",
-"g. c #A5B2BF",
-"h. c #B0B1B2",
-"j. c #B2B2B2",
-"k. c gray70",
-"l. c #B1B3B6",
-"z. c #B4B5B6",
-"x. c #B6B6B6",
-"c. c #BBBBBB",
-"v. c #B8BBBE",
-"b. c #BCBCBC",
-"n. c #BDBEBF",
-"m. c gray75",
-"M. c #A8B8C9",
-"N. c #B9BDC2",
-"B. c #BABEC3",
-"V. c #93C1D9",
-"C. c #9BC7DD",
-"Z. c #BFC5CB",
-"A. c #B9C4D0",
-"S. c #C1C1C1",
-"D. c #C3C3C3",
-"F. c #C6C6C6",
-"G. c gray78",
-"H. c #C5C8CB",
-"J. c gray79",
-"K. c #CACACA",
-"L. c #CBCBCB",
-"P. c gray80",
-"I. c #CDCDCD",
-"U. c #CECECE",
-"Y. c gray81",
-"T. c #C1C8D0",
-"R. c #D0D0D0",
-"E. c gray82",
-"W. c #D1D1D2",
-"Q. c #D2D2D2",
-"!. c LightGray",
-"~. c gray83",
-"^. c #D5D5D5",
-"/. c #D7D7D7",
-"(. c #DADADA",
-"). c gray86",
-"_. c gainsboro",
-"`. c gray87",
-"'. c #CFD8E1",
-"]. c #D0D9E1",
-"[. c #E4E4E4",
-"{. c gray90",
-"}. c gray91",
-"|. c gray92",
-" X c #EAEDF1",
-".X c gray94",
-"XX c gray97",
-"oX c None",
-/* pixels */
-"oXoXoXoXX 6 a D Z r 1 oXoXoXoX",
-"oXoXoX2 | i.n.D.n.l.t.F * oXoXoX",
-"oXoXw e.G.).).~.Q.L.D.z.*.- oXoX",
-"oX< 7.K._.(.(.~.Q.P.f.y.c. at .% oX",
-"X ` b._.(./.~.~.Q.r. .L b.v.s ",
-"4 u.L./.~.~.Q.H.+.! .$.z.G.5.# ",
-"t k.Y.Q.Q.d._ +.c _ ~ s.B.P.g.3 ",
-"Z k.P.B.6.n A.&.L ) z F o.G.H.9 ",
-"x j.d._ h b _ J K ~ ! w.D.~.T.8 ",
-"e X.j S h p c M J c p.).{.{.M.: ",
-"> 4.D u u l N U J H R..X.X|.3.O ",
-" C =.d I T E E T O.`.XXXX].w ",
-"oX& f k E ] -.;.#.1.[.XX X/ oX",
-"oXoX= I ' >.q.9.,.8.{.]./ @ oX",
-"oXoXoX# y :.V.C.0.<.2.w X oXoX",
-"oXoXoXoX + , 7 4 ; O oXoXoXoX"
-};
diff --git a/debian/icons/amarok.xpm b/debian/icons/amarok.xpm
deleted file mode 100644
index 6411e36..0000000
--- a/debian/icons/amarok.xpm
+++ /dev/null
@@ -1,220 +0,0 @@
-/* XPM */
-static char *amarok[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 182 2",
-" c #000000",
-". c #020508",
-"X c #03090E",
-"o c #0E0E0E",
-"O c #050A10",
-"+ c #09131E",
-"@ c #101112",
-"# c #14191F",
-"$ c #0A1622",
-"% c #0B1926",
-"& c #0D1C2C",
-"* c #0E1F30",
-"= c #161E26",
-"- c #0F2032",
-"; c #18222D",
-": c #102336",
-"> c #12273C",
-", c #1A2632",
-"< c #1C2B3B",
-"1 c #142C44",
-"2 c #162F48",
-"3 c #16304A",
-"4 c #18324E",
-"5 c #183450",
-"6 c #1B3A5A",
-"7 c #20344A",
-"8 c #223A52",
-"9 c #1E4064",
-"0 c #22456B",
-"q c #23486E",
-"w c #28496F",
-"e c #244A72",
-"r c #244D78",
-"t c #2B4C72",
-"y c #26517E",
-"u c #2C5077",
-"i c #2B537B",
-"p c #325175",
-"a c #355479",
-"s c #33587E",
-"d c #395575",
-"f c #38567A",
-"g c #3B597C",
-"h c #405C7D",
-"j c #49627D",
-"k c #52677E",
-"l c #275280",
-"z c #285685",
-"x c #295788",
-"c c #2D5982",
-"v c #2A598A",
-"b c #2C5D91",
-"n c #355C83",
-"m c #395E83",
-"M c #2E6094",
-"N c #336189",
-"B c #3A658C",
-"V c #336395",
-"C c #356892",
-"Z c #386798",
-"A c #3C6C93",
-"S c #3C6A9A",
-"D c #3D729A",
-"F c #425D80",
-"G c #456083",
-"H c #41678D",
-"J c #496485",
-"K c #4C6688",
-"L c #4F6889",
-"P c #466E93",
-"I c #426E9B",
-"U c #417096",
-"Y c #42739B",
-"T c #47789F",
-"R c #4B749C",
-"E c #506782",
-"W c #536A84",
-"Q c #536C8B",
-"! c #586C82",
-"~ c #5D7084",
-"^ c #5D748D",
-"/ c #51769D",
-"( c #55799E",
-") c #5A7190",
-"_ c #447AA1",
-"` c #457CA8",
-"' c #4F78A2",
-"] c #5C7EA1",
-"[ c #627B96",
-"{ c #6A7F96",
-"} c #4681AB",
-"| c #4984AB",
-" . c #4E8BB2",
-".. c #5082A7",
-"X. c #5084AA",
-"o. c #5E80A4",
-"O. c #5B81A9",
-"+. c #548CB2",
-"@. c #5390B6",
-"#. c #5594BD",
-"$. c #5B94BC",
-"%. c #5E99BE",
-"&. c #6C8197",
-"*. c #69809B",
-"=. c #758699",
-"-. c #778A9D",
-";. c #7C8691",
-":. c #798A9D",
-">. c #6080A2",
-",. c #6A86A3",
-"<. c #6E8CAB",
-"1. c #608FB2",
-"2. c #7389A3",
-"3. c #7B91A6",
-"4. c #7B9AB9",
-"5. c #579AC1",
-"6. c #5B9EC5",
-"7. c #669EC2",
-"8. c #68A8CC",
-"9. c #6AACD0",
-"0. c #72ABCD",
-"q. c #78AFCE",
-"w. c #71B0D2",
-"e. c #7BB4D4",
-"r. c #858F9B",
-"t. c #87909A",
-"y. c #8D949B",
-"u. c #94989C",
-"i. c #9D9D9D",
-"p. c #8493A3",
-"a. c #8395A8",
-"s. c #8798A9",
-"d. c #859FB9",
-"f. c #9199A3",
-"g. c #8EA2B7",
-"h. c #8CA5BF",
-"j. c #96A2AB",
-"k. c #9BA4AD",
-"l. c #9DA9B5",
-"z. c #A3A3A3",
-"x. c #A6A9AC",
-"c. c #ACACAC",
-"v. c #A3ABB2",
-"b. c #A4AEB8",
-"n. c #AAAEB1",
-"m. c #ADB0B3",
-"M. c #ADB4BB",
-"N. c #B3B3B3",
-"B. c #B0B7BE",
-"V. c #B6B8B9",
-"C. c #BBBBBB",
-"Z. c #8FA7C1",
-"A. c #87B6D1",
-"S. c #85BBD7",
-"D. c #A2B1C1",
-"F. c #AFBBC7",
-"G. c #ADBAC8",
-"H. c #B2BCC7",
-"J. c #B0BCCA",
-"K. c #B8BDC3",
-"L. c #93C2DA",
-"P. c #9EC9DE",
-"I. c #BFC3C7",
-"U. c #B0C1D3",
-"Y. c #AFD1E1",
-"T. c #B4D6E4",
-"R. c #C3C3C4",
-"E. c #C1C4C8",
-"W. c #CCCCCC",
-"Q. c #C1CEDC",
-"!. c #CFD4D9",
-"~. c #D3D3D3",
-"^. c #D6DADE",
-"/. c #DBDBDB",
-"(. c #DAE0E6",
-"). c #E2E3E3",
-"_. c #E2E5E8",
-"`. c #ECECEC",
-"'. c #EAEEF1",
-"]. c #F4F4F4",
-"[. c #FBFBFB",
-"{. c None",
-/* pixels */
-"{.{.{.{.{.{.{.{.{.{.{.o # , 7 8 8 < ; @ o {.{.{.{.{.{.{.{.{.{.{.",
-"{.{.{.{.{.{.{.{.{.X 4 l M I / ( ( R Z v 9 * {.{.{.{.{.{.{.{.",
-"{.{.{.{.{.{.{.X 6 M ( s.n.N.N.N.N.N.N.k.,.S r & {.{.{.{.{.{.{.",
-"{.{.{.{.{.{.- v ( k.N.C.W.W.~.~.W.R.R.V.N.N.3.Z 6 . {.{.{.{.{.",
-"{.{.{.{. 3 V a.N.C.~.)./././.~.~.~.W.W.R.V.N.n./ r X {.{.{.{.",
-"{.{.{.{.2 Z j.N.W./././././.~.~.~.W.W.W.W.R.K.N.N.o.y . {.{.{.",
-"{.{.{.& V j.N.W.).)././.~.~.~.~.~.W.W.W.W.R.n.R.C.V.] q {.{.",
-"{.{.. v a.N.R.)././././.~./.~.~.W.~.W.W.R.E q n.R.C.V.I 1 {.{.",
-"{.{.6 ( N.C././././.~.~.~.~.~.~.W.~.~.b.j ^ p j R.C.C.v.v X {.",
-"{.X b k.N.W././././.~./.~.~.~.~.~.W.:.e Q ) K k x.R.R.R.o.5 {.",
-"{.4 ' N.V././.~.~./.~.~.~.~.~.~.E.J p F ) ) p y.i.R.R.R.b.v . ",
-"o r s.N.R./.~.~.~.~.~.~.~.W.I.B.h d s Q Q K ! z.c.W.W.R.R.I % ",
-"@ M n.N.W.~.~.~.~.~.~.E.Q g g f p w L Q Q t u.z.W.W.W.W.W.<.4 . ",
-", S N.N.W.~.~.~.~.~.K.h G &.D.Q 0 F K L j j z.C.l.M.~.W.W.g.0 . ",
-"< / N.N.W.W.W.W.W.M.f h [ [.'.a g K G L p 0 d g w &.~.~.~.M.0 . ",
-"8 ( N.N.W.W.W.p.Q w p w (.F.f f F F G K g a g d j t.c.!.~.K.i . ",
-"7 ( N.N.R.R.{ 2.F 0 0 Q H.e g g F F F F G g g u.c.n.C././.H.r . ",
-", I N.m.f.^ h 0 0 0 0 d t a f g g F F F p ! c.N.W./.)././.D.q ",
-"= V y.h f t d m p 0 0 q p p d a g g F p ! N.C.).).).).).).d.6 ",
-"o x :.t w t a d t 0 q t p a d s f f a 0 c.C.).`.`.`.).).).] , . ",
-"o 8 ,.r.q 0 q 0 0 q t u p s s g m f e g V./.`.`.`.`.`._.^.M X . ",
-"{.% Z m.;.q 0 0 q e i i s N h N m s r ^ C.`.].].].].`.`.Z.9 . ",
-"{. r 2.N.! q q t n c m N B B B B c s =.R.].].].].].]._.S $ {.",
-"{.. $ Z =.q q u m c H B A U U U B B n p.~.].].[.[.[.].4.9 {.",
-"{.{. 6 z q r i c P U Y Y T _ _ D Y N j.~.].[.[.[.].U.v X {.{.",
-"{.{.{.. e y r c A Y T ..| @. . .| ..D l./.`.].].[.Q.V % {.{.",
-"{.{.{. . e c N A D @. at .8.6.6.%.%.+.T n./.`.].].J.Z * {.{.{.",
-"{.{.{.{. . 9 M D X. at .6.q.w.w.8.8.%.| N./.`.(.4.v % {.{.{.{.",
-"{.{.{.{.{. > N } #.9.S.L.L.S.w.0. at .c.~.h.S 9 X {.{.{.{.{.",
-"{.{.{.{.{.{. X 2 C $.A.Y.T.P.q.#.` ' b 0 + {.{.{.{.{.{.",
-"{.{.{.{.{.{.{.{. # < 9 p w w 0 5 - . {.{.{.{.{.{.{.{.",
-"{.{.{.{.{.{.{.{.{.{. . . . . . . . . {.{.{.{.{.{.{.{.{.{."
-};
--
Amarok packaging
More information about the pkg-kde-commits
mailing list