[SCM] hydrogen packaging branch, master, updated. c1ebe0bf09c1ecd0fb25fd8c5c9fb901551f74d4
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Feb 14 03:45:34 UTC 2010
The following commit has been merged in the master branch:
commit b180e099e0652512c5837480235208a1ef9a7553
Author: Jonas Smedegaard <dr at jones.dk>
Date: Sun Feb 14 02:54:01 2010 +0100
Build-depend on rsvg, and generate menu icon from SVG (not locally shipped XPM file).
diff --git a/debian/control.in b/debian/control.in
index 2fcaf37..0a60066 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,7 @@ Source: hydrogen
Section: sound
Priority: optional
Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: docbook-utils, @cdbs@, libqt4-dev, libz-dev, pkg-config, libaudiofile-dev, libjack-dev, liblrdf-dev, libsndfile1-dev, libflac++-dev, libflac-dev (>= 1.1.1-3), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libarchive-dev, libportmidi-dev, liblash-dev
+Build-Depends: docbook-utils, @cdbs@, libqt4-dev, libz-dev, pkg-config, libaudiofile-dev, libjack-dev, liblrdf-dev, libsndfile1-dev, libflac++-dev, libflac-dev (>= 1.1.1-3), libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libarchive-dev, libportmidi-dev, liblash-dev, rsvg
Standards-Version: 3.8.3
Homepage: http://www.hydrogen-music.org/
diff --git a/debian/hydrogen.xpm b/debian/hydrogen.xpm
deleted file mode 100644
index 4cf2378..0000000
--- a/debian/hydrogen.xpm
+++ /dev/null
@@ -1,315 +0,0 @@
-/* XPM */
-static char * hydrogen_xpm[] = {
-"32 32 280 2",
-" c None",
-". c #54628E",
-"+ c #616E96",
-"@ c #647198",
-"# c #647098",
-"$ c #637098",
-"% c #626F97",
-"& c #616E97",
-"* c #5D6A94",
-"= c #C4C9D8",
-"- c #F2F3F7",
-"; c #F2F3F6",
-"> c #F0F1F6",
-", c #EFF0F4",
-"' c #EDEFF4",
-") c #EDEEF3",
-"! c #EBEDF1",
-"~ c #EAEBF1",
-"{ c #E9EBF1",
-"] c #E7EAF0",
-"^ c #E6E8EE",
-"/ c #E5E8EE",
-"( c #E4E5ED",
-"_ c #E2E5EC",
-": c #E1E4EC",
-"< c #E0E2EB",
-"[ c #DFE2E9",
-"} c #DEE0E9",
-"| c #DCDFE8",
-"1 c #DBDFE8",
-"2 c #DADDE7",
-"3 c #D9DCE6",
-"4 c #D8DBE5",
-"5 c #D7DAE4",
-"6 c #D6D9E3",
-"7 c #D4D8E3",
-"8 c #D3D7E2",
-"9 c #D1D5E1",
-"0 c #A7AEC5",
-"a c #6E7A9F",
-"b c #D0D4E0",
-"c c #747FA3",
-"d c #CED2DF",
-"e c #68749B",
-"f c #737FA3",
-"g c #C7CCDA",
-"h c #6B779E",
-"i c #69769C",
-"j c #67749A",
-"k c #65739B",
-"l c #CFD2DF",
-"m c #858FAF",
-"n c #636E97",
-"o c #636F98",
-"p c #627098",
-"q c #626F98",
-"r c #A9B1C6",
-"s c #CED2DE",
-"t c #949CB7",
-"u c #314277",
-"v c #37477B",
-"w c #ADB4C9",
-"x c #475686",
-"y c #7581A3",
-"z c #CCD0DE",
-"A c #737FA2",
-"B c #939BB6",
-"C c #38487C",
-"D c #AEB3C9",
-"E c #E3E5EC",
-"F c #495886",
-"G c #505E8C",
-"H c #8993B1",
-"I c #495887",
-"J c #CBCFDC",
-"K c #929AB6",
-"L c #AEB4C8",
-"M c #495786",
-"N c #AEB5C9",
-"O c #FFFFFF",
-"P c #9CA4BE",
-"Q c #7681A5",
-"R c #CACFDC",
-"S c #67749B",
-"T c #727EA2",
-"U c #ACB3C9",
-"V c #7581A4",
-"W c #C9CDDB",
-"X c #9199B6",
-"Y c #37487C",
-"Z c #495785",
-"` c #818BAC",
-" . c #E1E4EB",
-".. c #E1E3EB",
-"+. c #F3F4F7",
-"@. c #7681A4",
-"#. c #C8CCDA",
-"$. c #67739A",
-"%. c #9098B5",
-"&. c #39497D",
-"*. c #DFE2EA",
-"=. c #7580A3",
-"-. c #C9CDDA",
-";. c #C7CBDA",
-">. c #344579",
-",. c #415082",
-"'. c #415182",
-"). c #3E4E80",
-"!. c #485786",
-"~. c #7883A6",
-"{. c #EAECF1",
-"]. c #7782A5",
-"^. c #C6CBD9",
-"/. c #717DA1",
-"(. c #8F97B4",
-"_. c #ADB3C8",
-":. c #FCFDFD",
-"<. c #FBFCFD",
-"[. c #FDFDFE",
-"}. c #C5CAD9",
-"|. c #66739A",
-"1. c #C4C8D7",
-"2. c #8E96B4",
-"3. c #EFF1F5",
-"4. c #B6BCCF",
-"5. c #5B6993",
-"6. c #C2C8D7",
-"7. c #8E96B3",
-"8. c #E4E6ED",
-"9. c #C2C6D6",
-"0. c #707CA1",
-"a. c #8D95B2",
-"b. c #36477B",
-"c. c #455684",
-"d. c #4E5D8A",
-"e. c #4E5C89",
-"f. c #3C4C7E",
-"g. c #445383",
-"h. c #7481A3",
-"i. c #C1C5D5",
-"j. c #8C94B2",
-"k. c #39497B",
-"l. c #A8AFC5",
-"m. c #D6DAE4",
-"n. c #9BA3BD",
-"o. c #767FA3",
-"p. c #BFC5D5",
-"q. c #667299",
-"r. c #A7AFC5",
-"s. c #D3D6E1",
-"t. c #455585",
-"u. c #757FA3",
-"v. c #BFC4D4",
-"w. c #657299",
-"x. c #707CA0",
-"y. c #DDE0E9",
-"z. c #8B94B1",
-"A. c #A6AEC4",
-"B. c #D3D7E3",
-"C. c #465685",
-"D. c #E2E4EC",
-"E. c #BDC3D4",
-"F. c #6F7BA0",
-"G. c #8B93B1",
-"H. c #38497B",
-"I. c #A5ADC4",
-"J. c #465585",
-"K. c #BCC1D2",
-"L. c #DBDDE7",
-"M. c #A8B0C6",
-"N. c #485687",
-"O. c #485886",
-"P. c #495888",
-"Q. c #B9BFD0",
-"R. c #CFD3DF",
-"S. c #69749B",
-"T. c #475786",
-"U. c #475785",
-"V. c #475685",
-"W. c #465584",
-"X. c #455584",
-"Y. c #445384",
-"Z. c #8F99B6",
-"`. c #BBC1D2",
-" + c #657199",
-".+ c #D9DDE6",
-"++ c #CCD0DD",
-"@+ c #BAC0D1",
-"#+ c #C3C8D7",
-"$+ c #BCC2D2",
-"%+ c #C6CAD9",
-"&+ c #ADB4C8",
-"*+ c #CACEDB",
-"=+ c #8994B0",
-"-+ c #8993B0",
-";+ c #B3B9CD",
-">+ c #667398",
-",+ c #BDC2D3",
-"'+ c #68759B",
-")+ c #637197",
-"!+ c #8892AF",
-"~+ c #99A1BB",
-"{+ c #818BAA",
-"]+ c #828DAD",
-"^+ c #BBBFD1",
-"/+ c #B7BDD0",
-"(+ c #9BA4BD",
-"_+ c #9AA2BB",
-":+ c #B8BED0",
-"<+ c #B5BCCF",
-"[+ c #A2AAC2",
-"}+ c #A3AAC1",
-"|+ c #BFC4D5",
-"1+ c #ACB3C8",
-"2+ c #9BA2BD",
-"3+ c #586591",
-"4+ c #4A5987",
-"5+ c #586590",
-"6+ c #B0B6CA",
-"7+ c #53628E",
-"8+ c #4A5887",
-"9+ c #5E6C95",
-"0+ c #7E88A9",
-"a+ c #6E7BA0",
-"b+ c #B0B8CC",
-"c+ c #AFB7C9",
-"d+ c #929BB7",
-"e+ c #909AB5",
-"f+ c #9BA3BC",
-"g+ c #647199",
-"h+ c #B6BCD0",
-"i+ c #A5ABC3",
-"j+ c #A3ABC2",
-"k+ c #7A85A6",
-"l+ c #7A84A7",
-"m+ c #9DA5BE",
-"n+ c #55648F",
-"o+ c #54638E",
-"p+ c #54638F",
-"q+ c #B3B9CC",
-"r+ c #51608D",
-"s+ c #52628D",
-"t+ c #808AAB",
-"u+ c #7580A4",
-"v+ c #B1B7CB",
-"w+ c #AFB6CA",
-"x+ c #939CB7",
-"y+ c #929CB7",
-"z+ c #B6BCCE",
-"A+ c #D0D3DF",
-"B+ c #C8CDDB",
-"C+ c #CDD1DD",
-"D+ c #BBC0D2",
-"E+ c #BBC0D1",
-"F+ c #C7CCD9",
-"G+ c #B6BDCE",
-"H+ c #AFB5CA",
-"I+ c #AAB0C6",
-"J+ c #B7BBCE",
-"K+ c #B8BDD0",
-"L+ c #ADB5C9",
-"M+ c #B1B8CA",
-"N+ c #B0B7CB",
-"O+ c #B5BBCD",
-"P+ c #B5BBCE",
-"Q+ c #6D799F",
-"R+ c #CCD1DE",
-"S+ c #C2C7D6",
-"T+ c #C1C6D5",
-"U+ c #B4BACD",
-"V+ c #6B779D",
-"W+ c #D3D7E1",
-"X+ c #B9BFD1",
-"Y+ c #9EA6BE",
-"Z+ c #55638E",
-"`+ c #717CA1",
-" @ c #6D799E",
-".@ c #6C789E",
-"+@ c #6C789D",
-"@@ c #6A769C",
-" . + @ @ # $ $ $ $ $ $ $ $ % % % % % % % % & + + + + + + * . ",
-". = - ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 0 . ",
-"a - ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 9 b # ",
-"c ; > , ' ) ! ~ { ] ^ / ( _ : < [ } | 1 2 3 4 5 6 7 8 9 9 b d e ",
-"f > , g h i e j k l / ( _ m n % % $ $ o o $ % $ p p q q r d s e ",
-"f , ' t u u u u v w ( _ : x u u u u u u u u u u u u u u y s z e ",
-"A ' ) B u u u u C D E : < F u G H H H H H H H H H H I u y z J e ",
-"A ) ! K u u u u v L : < [ M u N O O O O O O O O O O P u Q J R S ",
-"T ! ~ K u u u u C U < [ } M u N O O O O O O O O O O P u V R W j ",
-"T ~ { X u u u u Y w [ } | Z u ` .............+.O O P u @.W #.$.",
-"T { ] %.u u u u &.N } | 1 M u u u u u u u u u *.O O P u =.-.;.$.",
-"T ] ^ %.u u u u >.,.'.'.'.).u !.~.~.~.~.~.~.~.{.O O P u ].;.^.$.",
-"/.^ / (.u u u u u u u u u u u _.:.<.<.<.<.<.<.[.O O P u Q ^.}.|.",
-"/./ ( (.u u u u u u u u u u u N O O O O O O O O O O P u @.}.1.|.",
-"/.( E 2.u u u u u u u u u u u N O O 3.4.4.4.4.4.4.4.5.u @.1.6.|.",
-"/.E : 7.u u u u u u u u u u u N O O 8.u u u u u u u u u y 6.9.|.",
-"0.: ..a.u u u u b.c.d.d.e.f.u N O O ~ ~.~.~.~.~.~.~.g.u h.9.i.|.",
-"0...[ j.u u u u k.l.m.7 8 x u N O O [.<.<.<.<.<.<.:.n.u o.i.p.q.",
-"0.[ } j.u u u u k.r.7 8 s.t.u N O O O O O O O O O O P u u.p.v.w.",
-"x.} y.z.u u u u k.A.B.s.9 C.u ` .................D.f u =.v.E.w.",
-"F.y.1 G.u u u u H.I.s.9 b J.u u u u u u u u u u u u u u u.E.K.w.",
-"F.1 L.M.N.I I O.P.Q.9 b R.S.T.T.U.V.V.C.C.C.C.C.J.W.X.Y.Z.K.`. +",
-"F.L..+4 5 m.7 B.s.9 b R.s z ++J W W ;.^.}.1.6.9.i.p.v.E.K.`. at + +",
-"F..+4 5 m.7 B.s.9 b R.s z ++J W W ;.^.}.1.#+9.i.p.v.E.$+`. at +Q. +",
-"F.4 5 %+&+w *+E.=+-+;+z ~.>+].W ,+'+)+!+#+~+{+]+^+/+(+_+l.Q.:+ +",
-"a 5 m.<+[+}+|+1+V V 2+++3+4+5+;.6+7+8+9+9.0+a+V b+c+d+e+f+:+:+g+",
-"a m.7 h+i+j+p.&+k+l+m+J n+o+p+^.q+r+s+% i.t+u+T v+w+x+y+(+:+z+g+",
-"a 7 B.A+B+g s C+D+E+F+W Q.N G+}.1.H+I+J+p.K+L+N `. at +M+N+O+z+P+# ",
-"Q+B.s.9 b R.d R+++J W W g ^.}.= #+S+T+p.v.E.$+K.D+Q.:+:+z+P+U+# ",
-"V+W+9 b R.d R+++J W W g ^.}.= #+S+T+p.v.E.$+K.D+Q.:+:+z+P+U+;+& ",
-". X+b R.d R+++J W W g ^.}.= #+S+T+p.v.E.$+K.D+Q.:+:+z+P+U+;+Y+. ",
-" Z+a `+x.x.x.F.F.F.F.a a a Q+ @ @ @. at .@. at .@+ at +@+ at V+V+V+@@j . "};
diff --git a/debian/install b/debian/install
index 0e7e5c4..93323ba 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-debian/hydrogen.xpm usr/share/pixmaps
+data/img/gray/h2-icon.xpm usr/share/pixmaps
diff --git a/debian/menu b/debian/menu
index 5a11175..74ea75d 100644
--- a/debian/menu
+++ b/debian/menu
@@ -2,4 +2,4 @@
section="Applications/Sound" \
needs="X11" \
title="Hydrogen" \
-icon="/usr/share/pixmaps/hydrogen.xpm"
+icon="/usr/share/pixmaps/h2-icon.xpm"
diff --git a/debian/rules b/debian/rules
index 7355832..d8afd32 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,16 @@ DEB_SCONS_OPTIONS += optflags="$(CXXFLAGS)"
DEB_SCONS_INSTALL_OPTIONS = DESTDIR=$(DEB_DESTDIR)
+imgstub = data/img/gray/h2-icon
+common-build-arch::
+ #inkscape -z -e$(imgstub).png -D -w32 -h32 --export-area-snap $(imgstub).svg
+ rsvg -w32 -h32 $(imgstub).svg $(imgstub).png
+ pngtopnm -alpha $(imgstub).png > $(imgstub).alpha.pgm
+ pngtopnm $(imgstub).png | ppmtoxpm -alphamask=$(imgstub).alpha.pgm > $(imgstub).xpm
+ rm -f $(imgstub).png $(imgstub).alpha.pgm
+clean::
+ rm -f $(imgstub).xpm
+
clean::
rm -f qt4.pyc version.cpp config.h scache.conf
rm -rf scons_cache
--
hydrogen packaging
More information about the pkg-multimedia-commits
mailing list