diff --git a/debian/lenny/tdebase/debian/cdbs/debian-qt-kde.mk b/debian/lenny/tdebase/debian/cdbs/debian-qt-kde.mk index ec89756bb..4fd113539 100644 --- a/debian/lenny/tdebase/debian/cdbs/debian-qt-kde.mk +++ b/debian/lenny/tdebase/debian/cdbs/debian-qt-kde.mk @@ -13,7 +13,7 @@ debian/stamp-cvs-make: touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches diff --git a/debian/lenny/tdebase/debian/icons/kinfocenter-16.xpm b/debian/lenny/tdebase/debian/icons/kinfocenter-16.xpm deleted file mode 100644 index 615bbf46b..000000000 --- a/debian/lenny/tdebase/debian/icons/kinfocenter-16.xpm +++ /dev/null @@ -1,193 +0,0 @@ -/* XPM */ -static char * kinfocenter_16_xpm[] = { -"16 16 174 2", -" c None", -". c #A6DBF4", -"+ c #CFEBF9", -"@ c #C9EAF9", -"# c #A1DCF7", -"$ c #CEE0F3", -"% c #D9E4F4", -"& c #E6EEF8", -"* c #E7EEF8", -"= c #DCE5F5", -"- c #BCE3FF", -"; c #256589", -"> c #64B0E5", -", c #B2CBEA", -"' c #A3C5E9", -") c #DEEAF7", -"! c #B4CDED", -"~ c #5CB5F0", -"{ c #419CDF", -"] c #86B0DF", -"^ c #7CACDF", -"/ c #B8D2EE", -"( c #86AFDF", -"_ c #3CA2EB", -": c #004D85", -"< c #A3A3CF", -"[ c #9188AD", -"} c #034A82", -"| c #0884DF", -"1 c #428FD6", -"2 c #5995D6", -"3 c #DAE7F6", -"4 c #DBE7F6", -"5 c #3E8ED5", -"6 c #0683DD", -"7 c #005FA0", -"8 c #8B8BAC", -"9 c #ACA3B8", -"0 c #01386D", -"a c #0078DA", -"b c #0072CE", -"c c #1377CD", -"d c #CAE0F4", -"e c #1177CD", -"f c #0071D9", -"g c #0F7B8C", -"h c #378B1E", -"i c #399D25", -"j c #34A721", -"k c #0D7A05", -"l c #4C4C5F", -"m c #ABA4C5", -"n c #0A3C47", -"o c #006DC9", -"p c #0067C9", -"q c #0067C8", -"r c #CAE1F4", -"s c #0068C8", -"t c #0063C8", -"u c #3C9E7A", -"v c #80E35A", -"w c #5DCF47", -"x c #80DB6D", -"y c #2B9022", -"z c #8989B1", -"A c #9D98BD", -"B c #254925", -"C c #358FAE", -"D c #0056C6", -"E c #005BC3", -"F c #8EB8E3", -"G c #005BC2", -"H c #0059CC", -"I c #2775BB", -"J c #8BA78C", -"K c #739B66", -"L c #14A100", -"M c #54C841", -"N c #2E8F29", -"O c #9D9DCD", -"P c #9792B8", -"Q c #254B25", -"R c #A2ED8B", -"S c #3589A8", -"T c #0057BA", -"U c #0058C3", -"V c #0059C8", -"W c #005AC2", -"X c #096F88", -"Y c #4DA653", -"Z c #75906A", -"` c #415E3E", -" . c #089000", -".. c #4CC33F", -"+. c #2B8D29", -"@. c #9A9AC8", -"#. c #9691B8", -"$. c #204624", -"%. c #BAED84", -"&. c #B4EF90", -"*. c #55B464", -"=. c #4B9092", -"-. c #489093", -";. c #59A87D", -">. c #67C14F", -",. c #7ACF60", -"'. c #96C38D", -"). c #7EAB78", -"!. c #70C06C", -"~. c #7ED279", -"{. c #218821", -"]. c #9491B8", -"^. c #254022", -"/. c #D7A95B", -"(. c #8CE254", -"_. c #A0E879", -":. c #86847C", -"<. c #699351", -"[. c #6FD35D", -"}. c #65C173", -"|. c #79CC6C", -"1. c #919091", -"2. c #555455", -"3. c #70B06E", -"4. c #88D688", -"5. c #1F861F", -"6. c #938FB6", -"7. c #214325", -"8. c #BAD581", -"9. c #86E262", -"0. c #7BDA61", -"a. c #92B98F", -"b. c #3BAB1A", -"c. c #48AB88", -"d. c #548DF3", -"e. c #4BC042", -"f. c #46AA3E", -"g. c #31942F", -"h. c #2AA72A", -"i. c #62CC62", -"j. c #289028", -"k. c #908BB4", -"l. c #234729", -"m. c #D6F289", -"n. c #DAEA82", -"o. c #C2E56D", -"p. c #E2EA86", -"q. c #B0E85D", -"r. c #8BB66D", -"s. c #447F68", -"t. c #4C8F4B", -"u. c #4A9148", -"v. c #4B924B", -"w. c #4D8E4D", -"x. c #498E49", -"y. c #0D650D", -"z. c #A0A0CE", -"A. c #9490BA", -"B. c #234A27", -"C. c #E6E569", -"D. c #F0E26C", -"E. c #F1E978", -"F. c #EFD85C", -"G. c #F5FA8B", -"H. c #8EA842", -"I. c #000100", -"J. c #686699", -"K. c #0C1E12", -"L. c #1E4018", -"M. c #1D3D18", -"N. c #1E3E18", -"O. c #1D3D17", -"P. c #1E3F1A", -"Q. c #183815", -" . + @ # ", -" $ % & * = - ; ", -" > , ' ) ) ' ! ~ ", -" { ] ^ / / ^ ( _ : ", -"< [ } | 1 2 3 4 2 5 6 7 ", -"8 9 0 a b c d d e b f g h i j k ", -"l m n o p q r r q s t u v w x y ", -"z A B C D E F F G H I J K L M N ", -"O P Q R S T U V W X Y Z ` ...+.", -"@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.", -"@.].^./.(._.:.<.[.}.|.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.q.r.s.t.u.v.w.x.y.", -"z.A.B.C.D.E.F.G.H.I. ", -" J.K.L.M.N.O.P.Q. ", -" "}; diff --git a/debian/lenny/tdebase/debian/icons/kinfocenter.xpm b/debian/lenny/tdebase/debian/icons/kinfocenter.xpm deleted file mode 100644 index 04fcb0013..000000000 --- a/debian/lenny/tdebase/debian/icons/kinfocenter.xpm +++ /dev/null @@ -1,349 +0,0 @@ -/* XPM */ -static char * kinfocenter_xpm[] = { -"32 32 314 2", -" c None", -". c #98DBF8", -"+ c #ABE2F9", -"@ c #BBE7FA", -"# c #9CDCF8", -"$ c #85D4F6", -"% c #3DBBF1", -"& c #B8E0F6", -"* c #E8F1F9", -"= c #97D3F2", -"- c #1BA6E6", -"; c #C6DFF3", -"> c #D4E4F4", -", c #ABD6F2", -"' c #1399DB", -") c #9BCAED", -"! c #C0D7F0", -"~ c #D5E4F5", -"{ c #FFFFFF", -"] c #77BFEB", -"^ c #0089CF", -"/ c #229DE3", -"( c #ADCBEB", -"_ c #D6E5F5", -": c #0093E1", -"< c #008DDE", -"[ c #269AE0", -"} c #98BEE6", -"| c #AAC9EA", -"1 c #F8FBFD", -"2 c #007DC6", -"3 c #0088DB", -"4 c #1990DC", -"5 c #84B1E1", -"6 c #A4C6E9", -"7 c #0083D8", -"8 c #559CDB", -"9 c #70A4DC", -"0 c #AFCCEB", -"a c #4698DA", -"b c #8A8ABF", -"c c #8181BB", -"d c #007ED5", -"e c #0C81D5", -"f c #5796D7", -"g c #5C98D7", -"h c #AECBEB", -"i c #4C93D6", -"j c #0680D5", -"k c #005A9E", -"l c #8888BE", -"m c #E4E4E4", -"n c #7F7FBA", -"o c #0079D2", -"p c #057AD2", -"q c #3085D2", -"r c #498CD2", -"s c #A4C5E9", -"t c #2B84D2", -"u c #006183", -"v c #8383BC", -"w c #7D7DB9", -"x c #0074CF", -"y c #0876CE", -"z c #1A7ACE", -"A c #8EBDE7", -"B c #1679CE", -"C c #0475CE", -"D c #107A39", -"E c #178A02", -"F c #178E00", -"G c #158D00", -"H c #138B00", -"I c #118900", -"J c #0F8800", -"K c #0E8600", -"L c #005D00", -"M c #7B7BB7", -"N c #006EBF", -"O c #006FCB", -"P c #80B7E5", -"Q c #46A948", -"R c #78D05E", -"S c #7AD660", -"T c #78D460", -"U c #76D260", -"V c #73D060", -"W c #31B718", -"X c #7979B6", -"Y c #0E797D", -"Z c #006AC8", -"` c #80B4E4", -" . c #0875A4", -".. c #6AB859", -"+. c #9EDD8D", -"@. c #77D360", -"#. c #75D160", -"$. c #73CF60", -"%. c #B1E4A7", -"&. c #43BC30", -"*. c #7777B5", -"=. c #318030", -"-. c #0065C5", -";. c #80B2E2", -">. c #1A9042", -",. c #6EBD5C", -"'. c #23B600", -"). c #1FB300", -"!. c #1CB000", -"~. c #9ADB8F", -"{. c #40B930", -"]. c #7575B4", -"^. c #6CAEC0", -"/. c #005FC2", -"(. c #5091D5", -"_. c #297AAC", -":. c #8DAD8B", -"<. c #A2B69F", -"[. c #9DB497", -"}. c #7BA073", -"|. c #31AA1B", -"1. c #18AD00", -"2. c #98DA8F", -"3. c #3DB630", -"4. c #7373B3", -"5. c #B9F78F", -"6. c #369099", -"7. c #005DC0", -"8. c #307BCC", -"9. c #2072BC", -"0. c #94BB9D", -"a. c #95959B", -"b. c #848484", -"c. c #6A6A6A", -"d. c #505050", -"e. c #219110", -"f. c #14A900", -"g. c #97D88F", -"h. c #3AB430", -"i. c #7070B2", -"j. c #B7F58F", -"k. c #B4F28E", -"l. c #4695A4", -"m. c #0C7386", -"n. c #3BA431", -"o. c #61AE54", -"p. c #979798", -"q. c #727272", -"r. c #585858", -"s. c #3E3E3E", -"t. c #1A8A0B", -"u. c #11A600", -"v. c #95D78F", -"w. c #37B130", -"x. c #6E6EB0", -"y. c #B6F48F", -"z. c #B5F38F", -"A. c #B1EF8E", -"B. c #74BC7F", -"C. c #17807B", -"D. c #0D7386", -"E. c #1C9135", -"F. c #24A007", -"G. c #22A306", -"H. c #2DB30E", -"I. c #3BAA24", -"J. c #2E9D1A", -"K. c #259413", -"L. c #1B8B0D", -"M. c #129E02", -"N. c #0DA300", -"O. c #94D58F", -"P. c #34AE30", -"Q. c #6C6CAF", -"R. c #B4F28F", -"S. c #B3F28F", -"T. c #B2F08F", -"U. c #9FEB77", -"V. c #64CE33", -"W. c #3AB607", -"X. c #84B2B0", -"Y. c #269A35", -"Z. c #6BAB91", -"`. c #83B1B0", -" + c #A3C5AB", -".+ c #ACCBAA", -"++ c #AECDAB", -"@+ c #BADCB5", -"#+ c #C6EABE", -"$+ c #CBEBC4", -"%+ c #D2E4CE", -"&+ c #CBDEC8", -"*+ c #C5D8C2", -"=+ c #BFD1BC", -"-+ c #C0E1BE", -";+ c #93D58F", -">+ c #92D48F", -",+ c #31AC30", -"'+ c #6A6AAE", -")+ c #DCB46B", -"!+ c #DBB46B", -"~+ c #B0EF8F", -"{+ c #D1F5BF", -"]+ c #D0F4BF", -"^+ c #69D539", -"/+ c #BFBFC1", -"(+ c #99999C", -"_+ c #7F7F83", -":+ c #2DB404", -"<+ c #2AB104", -"[+ c #28B502", -"}+ c #26B900", -"|+ c #4DBC38", -"1+ c #B0B0B0", -"2+ c #8A8A8A", -"3+ c #707070", -"4+ c #565656", -"5+ c #479B41", -"6+ c #92D38F", -"7+ c #91D38F", -"8+ c #30AB30", -"9+ c #6868AD", -"0+ c #E9A060", -"a+ c #E89F60", -"b+ c #69DE30", -"c+ c #43D300", -"d+ c #CFF3BF", -"e+ c #63D036", -"f+ c #A3A3A3", -"g+ c #747474", -"h+ c #4F4F4F", -"i+ c #A3E38F", -"j+ c #A2E28F", -"k+ c #A0E18F", -"l+ c #9FDF8F", -"m+ c #9DDE8F", -"n+ c #9CDC8F", -"o+ c #A9DAA1", -"p+ c #A0A0A0", -"q+ c #797979", -"r+ c #5F5F5F", -"s+ c #444444", -"t+ c #86B084", -"u+ c #90D28F", -"v+ c #8FD28F", -"w+ c #6666AC", -"x+ c #66DB30", -"y+ c #3FD000", -"z+ c #CEF2BF", -"A+ c #5DCA33", -"B+ c #8E8E8E", -"C+ c #5B5B5B", -"D+ c #353535", -"E+ c #52C930", -"F+ c #4EC630", -"G+ c #4287CB", -"H+ c #3F72FF", -"I+ c #4185CB", -"J+ c #58BC4B", -"K+ c #72976E", -"L+ c #52774F", -"M+ c #3D633B", -"N+ c #294E27", -"O+ c #2C912B", -"P+ c #24A624", -"Q+ c #6464AB", -"R+ c #AEED8F", -"S+ c #ADEC8F", -"T+ c #60D630", -"U+ c #CDF1BF", -"V+ c #35C600", -"W+ c #CBF0BF", -"X+ c #CAEFBF", -"Y+ c #22B600", -"Z+ c #3782BF", -"`+ c #3580BF", -" @ c #0AA000", -".@ c #069C00", -"+@ c #029900", -"@@ c #009700", -"#@ c #6262A9", -"$@ c #C7F2B3", -"%@ c #90E46B", -"&@ c #5DD330", -"*@ c #CCF1BF", -"=@ c #31C300", -"-@ c #CAEEBF", -";@ c #89BACB", -">@ c #82AEDF", -",@ c #87B8CB", -"'@ c #B3E0B3", -")@ c #5F5FA8", -"!@ c #F3F497", -"~@ c #EAE071", -"{@ c #F3DA70", -"]@ c #D6F47F", -"^@ c #F2DA70", -"/@ c #CBEF74", -"(@ c #F2D970", -"_@ c #D2E873", -":@ c #C7EC74", -"<@ c #F1D870", -"[@ c #307F30", -"}@ c #0C700C", -"|@ c #006C00", -"1@ c #5D5DA7", -"2@ c #FFF489", -"3@ c #FFDD67", -"4@ c #FFD256", -"5@ c #FFFF9A", -"6@ c #5B5BA6", -"7@ c #5959A5", -"8@ c #5A5AA5", -"9@ c #5757A4", -" ", -" . + @ @ # $ % ", -" & * * * * * * * * = - ", -" ; > > > > > > > > > > , ' ", -" ) ! ! ! ! ~ { { ~ ! ! ! ! ] ^ ", -" / ( ( ( ( ( _ { { _ ( ( ( ( ( : ", -" < [ } } } } } | 1 1 | } } } } } [ 2 ", -" 3 4 5 5 5 5 5 5 6 6 5 5 5 5 5 5 3 3 ", -" 7 7 8 9 9 9 9 0 { { 0 9 9 9 9 a 7 7 ", -"b b b c d d e f g g g h { { h g g g i j d d k ", -"l m m n o o o p q r r s { { s r r t p o o o u ", -"b v m w x x x x x y z A { { A B C x x x x x D E F G H I J K L ", -" b m M N O O O O O O P { { P O O O O O O O Q R S T U U V W L ", -" b m X Y Z Z Z Z Z Z ` { { ` Z Z Z Z Z Z ...+.@.#.$.$.%.&.L ", -" b m *. =.-.-.-.-.-.-.;.{ { ;.-.-.-.-.-.-.>.,.@.'.).!.!.~.{.L ", -" b m ]. =.^./././././.(.{ { (./././././._.:.<.[.}.|.1.1.2.3.L ", -" b m 4. =.5.6.7.7.7.7.7.8.8.7.7.7.7.7.9.0.a.b.c.d.e.f.f.g.h.L ", -" b m i. =.j.k.l.7.7.7.7.7.7.7.7.7.7.m.n.o.p.q.r.s.t.u.u.v.w.L ", -" b m x. =.y.z.A.B.C.7.7.7.7.7.7.D.E.F.G.H.I.J.K.L.M.N.N.O.P.L ", -" b m Q. =.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+;+>+,+L ", -" b m '+ =.)+!+~+{+]+^+/+(+_+:+<+[+}+'.).|+1+2+3+4+5+6+6+7+8+L ", -" b m 9+ =.0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+u+v+8+L ", -" b m w+ =.a+a+x+y+z+A+B+C+D+E+F+G+H+I+&.J+K+L+M+N+O+P+P+v+8+L ", -" b m Q+ =.R+S+d+T+U+V+W+X+E+}+Y+Z+H+`+f.u.N. @.@+@@@@@@@v+8+L ", -" b m #@ =.$@%@z+&@*@=@X+-@F+Y+m+;@>@,@g.v.O.>+7+v+v+v+v+'@8+L ", -" b m )@ =.!@~@{@]@^@/@(@(@_@:@<@=.=.=.=.=.[@[@[@[@[@[@[@}@|@L ", -" b m 1@ =.2@3@4@5@4@5@4@4@2@5@4@=. ", -" b m 6@ =.2@3@4@5@4@5@4@4@2@5@4@=. ", -" b m 7@ =.=.=.=.=.=.=.=.=.=.=.=.=. ", -" b 8@9@ ", -" ", -" "}; diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.install b/debian/lenny/tdebase/debian/kcontrol-trinity.install index 65a650cbc..46eb3b814 100644 --- a/debian/lenny/tdebase/debian/kcontrol-trinity.install +++ b/debian/lenny/tdebase/debian/kcontrol-trinity.install @@ -4,7 +4,6 @@ debian/tmp/opt/trinity/bin/kdeinstallktheme debian/tmp/opt/trinity/bin/keditfiletype debian/tmp/opt/trinity/bin/tdefontinst debian/tmp/opt/trinity/bin/tdefontview -debian/tmp/opt/trinity/bin/kinfocenter debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper debian/tmp/opt/trinity/bin/tderandrtray debian/tmp/opt/trinity/bin/krdb @@ -242,5 +241,3 @@ debian/tmp/opt/trinity/share/services/localdomainurifilter.desktop debian/icons/kcontrol.xpm /opt/trinity/share/pixmaps debian/icons/kcontrol-16.xpm /opt/trinity/share/pixmaps -debian/icons/kinfocenter.xpm /opt/trinity/share/pixmaps -debian/icons/kinfocenter-16.xpm /opt/trinity/share/pixmaps diff --git a/debian/lenny/tdebase/debian/kcontrol-trinity.menu b/debian/lenny/tdebase/debian/kcontrol-trinity.menu index f2bedef2b..3576cdae0 100644 --- a/debian/lenny/tdebase/debian/kcontrol-trinity.menu +++ b/debian/lenny/tdebase/debian/kcontrol-trinity.menu @@ -7,17 +7,5 @@ icon16x16="/opt/trinity/share/pixmaps/kcontrol-16.xpm"\ command="/opt/trinity/bin/kcontrol" -?package(kcontrol):\ - needs="X11"\ - section="Applications/System/Administration"\ - hints="TDE"\ - title="KInfoCenter"\ - icon32x32="/opt/trinity/share/pixmaps/kinfocenter.xpm"\ - icon16x16="/opt/trinity/share/pixmaps/kinfocenter-16.xpm"\ - command="/opt/trinity/bin/kinfocenter" - # Icon 32x32 kcontrol/kcontrol/cr32-app-kcontrol.png kcontrol.xpm # Icon 16x16 kcontrol/kcontrol/cr16-app-kcontrol.png kcontrol-16.xpm - -# Icon 32x32 kcontrol/pics/cr32-app-hwinfo.png kinfocenter.xpm -# Icon 16x16 kcontrol/pics/cr16-app-hwinfo.png kinfocenter-16.xpm diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules index ee6ffe6ce..401934230 100755 --- a/debian/lenny/tdebase/debian/rules +++ b/debian/lenny/tdebase/debian/rules @@ -27,7 +27,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \ - -DAUTODETECT_QT_DIRS="ON" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH="OFF" \ @@ -79,7 +78,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop +DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ ksysguard-trinity twin-trinity libkonq4-trinity diff --git a/debian/lenny/tdebase/debian/tdebase-data-trinity.install b/debian/lenny/tdebase/debian/tdebase-data-trinity.install index e790d4894..9ae37a312 100644 --- a/debian/lenny/tdebase/debian/tdebase-data-trinity.install +++ b/debian/lenny/tdebase/debian/tdebase-data-trinity.install @@ -107,7 +107,6 @@ debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WindowsXP.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/YellowOnBlue.kcsrc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewpart.rc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewui.rc -debian/tmp/opt/trinity/share/apps/kinfocenter/kinfocenterui.rc debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png @@ -273,63 +272,63 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/access.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/acroread.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/applixware.png diff --git a/debian/lenny/tdegraphics/debian/kgamma-trinity.install b/debian/lenny/tdegraphics/debian/kgamma-trinity.install index ff83d71ab..3e8fa0bb8 100644 --- a/debian/lenny/tdegraphics/debian/kgamma-trinity.install +++ b/debian/lenny/tdegraphics/debian/kgamma-trinity.install @@ -1,7 +1,7 @@ debian/tmp/opt/trinity/bin/xf86gammacfg debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.la debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.so -debian/tmp/opt/trinity/share/applications/tde/kgamma.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/kgamma.desktop debian/tmp/opt/trinity/share/apps/kgamma/pics/background.png debian/tmp/opt/trinity/share/apps/kgamma/pics/cmyscale.png debian/tmp/opt/trinity/share/apps/kgamma/pics/darkgrey.png diff --git a/debian/lenny/tdeutils/debian/kdf-trinity.install b/debian/lenny/tdeutils/debian/kdf-trinity.install index 44a0e0bf3..a89e9bf6e 100644 --- a/debian/lenny/tdeutils/debian/kdf-trinity.install +++ b/debian/lenny/tdeutils/debian/kdf-trinity.install @@ -13,9 +13,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf_config.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.docbook debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdf.png diff --git a/debian/lenny/tdeutils/debian/rules b/debian/lenny/tdeutils/debian/rules index c7e800362..a9e44f7f8 100755 --- a/debian/lenny/tdeutils/debian/rules +++ b/debian/lenny/tdeutils/debian/rules @@ -36,7 +36,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_XMMS="ON" \ -DWITH_KNEWSTUFF="ON" -DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselect-trinity ksim-trinity +DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg diff --git a/debian/squeeze/tdebase/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/tdebase/debian/cdbs/debian-qt-kde.mk index ec89756bb..4fd113539 100644 --- a/debian/squeeze/tdebase/debian/cdbs/debian-qt-kde.mk +++ b/debian/squeeze/tdebase/debian/cdbs/debian-qt-kde.mk @@ -13,7 +13,7 @@ debian/stamp-cvs-make: touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches diff --git a/debian/squeeze/tdebase/debian/icons/kinfocenter-16.xpm b/debian/squeeze/tdebase/debian/icons/kinfocenter-16.xpm deleted file mode 100644 index 615bbf46b..000000000 --- a/debian/squeeze/tdebase/debian/icons/kinfocenter-16.xpm +++ /dev/null @@ -1,193 +0,0 @@ -/* XPM */ -static char * kinfocenter_16_xpm[] = { -"16 16 174 2", -" c None", -". c #A6DBF4", -"+ c #CFEBF9", -"@ c #C9EAF9", -"# c #A1DCF7", -"$ c #CEE0F3", -"% c #D9E4F4", -"& c #E6EEF8", -"* c #E7EEF8", -"= c #DCE5F5", -"- c #BCE3FF", -"; c #256589", -"> c #64B0E5", -", c #B2CBEA", -"' c #A3C5E9", -") c #DEEAF7", -"! c #B4CDED", -"~ c #5CB5F0", -"{ c #419CDF", -"] c #86B0DF", -"^ c #7CACDF", -"/ c #B8D2EE", -"( c #86AFDF", -"_ c #3CA2EB", -": c #004D85", -"< c #A3A3CF", -"[ c #9188AD", -"} c #034A82", -"| c #0884DF", -"1 c #428FD6", -"2 c #5995D6", -"3 c #DAE7F6", -"4 c #DBE7F6", -"5 c #3E8ED5", -"6 c #0683DD", -"7 c #005FA0", -"8 c #8B8BAC", -"9 c #ACA3B8", -"0 c #01386D", -"a c #0078DA", -"b c #0072CE", -"c c #1377CD", -"d c #CAE0F4", -"e c #1177CD", -"f c #0071D9", -"g c #0F7B8C", -"h c #378B1E", -"i c #399D25", -"j c #34A721", -"k c #0D7A05", -"l c #4C4C5F", -"m c #ABA4C5", -"n c #0A3C47", -"o c #006DC9", -"p c #0067C9", -"q c #0067C8", -"r c #CAE1F4", -"s c #0068C8", -"t c #0063C8", -"u c #3C9E7A", -"v c #80E35A", -"w c #5DCF47", -"x c #80DB6D", -"y c #2B9022", -"z c #8989B1", -"A c #9D98BD", -"B c #254925", -"C c #358FAE", -"D c #0056C6", -"E c #005BC3", -"F c #8EB8E3", -"G c #005BC2", -"H c #0059CC", -"I c #2775BB", -"J c #8BA78C", -"K c #739B66", -"L c #14A100", -"M c #54C841", -"N c #2E8F29", -"O c #9D9DCD", -"P c #9792B8", -"Q c #254B25", -"R c #A2ED8B", -"S c #3589A8", -"T c #0057BA", -"U c #0058C3", -"V c #0059C8", -"W c #005AC2", -"X c #096F88", -"Y c #4DA653", -"Z c #75906A", -"` c #415E3E", -" . c #089000", -".. c #4CC33F", -"+. c #2B8D29", -"@. c #9A9AC8", -"#. c #9691B8", -"$. c #204624", -"%. c #BAED84", -"&. c #B4EF90", -"*. c #55B464", -"=. c #4B9092", -"-. c #489093", -";. c #59A87D", -">. c #67C14F", -",. c #7ACF60", -"'. c #96C38D", -"). c #7EAB78", -"!. c #70C06C", -"~. c #7ED279", -"{. c #218821", -"]. c #9491B8", -"^. c #254022", -"/. c #D7A95B", -"(. c #8CE254", -"_. c #A0E879", -":. c #86847C", -"<. c #699351", -"[. c #6FD35D", -"}. c #65C173", -"|. c #79CC6C", -"1. c #919091", -"2. c #555455", -"3. c #70B06E", -"4. c #88D688", -"5. c #1F861F", -"6. c #938FB6", -"7. c #214325", -"8. c #BAD581", -"9. c #86E262", -"0. c #7BDA61", -"a. c #92B98F", -"b. c #3BAB1A", -"c. c #48AB88", -"d. c #548DF3", -"e. c #4BC042", -"f. c #46AA3E", -"g. c #31942F", -"h. c #2AA72A", -"i. c #62CC62", -"j. c #289028", -"k. c #908BB4", -"l. c #234729", -"m. c #D6F289", -"n. c #DAEA82", -"o. c #C2E56D", -"p. c #E2EA86", -"q. c #B0E85D", -"r. c #8BB66D", -"s. c #447F68", -"t. c #4C8F4B", -"u. c #4A9148", -"v. c #4B924B", -"w. c #4D8E4D", -"x. c #498E49", -"y. c #0D650D", -"z. c #A0A0CE", -"A. c #9490BA", -"B. c #234A27", -"C. c #E6E569", -"D. c #F0E26C", -"E. c #F1E978", -"F. c #EFD85C", -"G. c #F5FA8B", -"H. c #8EA842", -"I. c #000100", -"J. c #686699", -"K. c #0C1E12", -"L. c #1E4018", -"M. c #1D3D18", -"N. c #1E3E18", -"O. c #1D3D17", -"P. c #1E3F1A", -"Q. c #183815", -" . + @ # ", -" $ % & * = - ; ", -" > , ' ) ) ' ! ~ ", -" { ] ^ / / ^ ( _ : ", -"< [ } | 1 2 3 4 2 5 6 7 ", -"8 9 0 a b c d d e b f g h i j k ", -"l m n o p q r r q s t u v w x y ", -"z A B C D E F F G H I J K L M N ", -"O P Q R S T U V W X Y Z ` ...+.", -"@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.", -"@.].^./.(._.:.<.[.}.|.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.q.r.s.t.u.v.w.x.y.", -"z.A.B.C.D.E.F.G.H.I. ", -" J.K.L.M.N.O.P.Q. ", -" "}; diff --git a/debian/squeeze/tdebase/debian/icons/kinfocenter.xpm b/debian/squeeze/tdebase/debian/icons/kinfocenter.xpm deleted file mode 100644 index 04fcb0013..000000000 --- a/debian/squeeze/tdebase/debian/icons/kinfocenter.xpm +++ /dev/null @@ -1,349 +0,0 @@ -/* XPM */ -static char * kinfocenter_xpm[] = { -"32 32 314 2", -" c None", -". c #98DBF8", -"+ c #ABE2F9", -"@ c #BBE7FA", -"# c #9CDCF8", -"$ c #85D4F6", -"% c #3DBBF1", -"& c #B8E0F6", -"* c #E8F1F9", -"= c #97D3F2", -"- c #1BA6E6", -"; c #C6DFF3", -"> c #D4E4F4", -", c #ABD6F2", -"' c #1399DB", -") c #9BCAED", -"! c #C0D7F0", -"~ c #D5E4F5", -"{ c #FFFFFF", -"] c #77BFEB", -"^ c #0089CF", -"/ c #229DE3", -"( c #ADCBEB", -"_ c #D6E5F5", -": c #0093E1", -"< c #008DDE", -"[ c #269AE0", -"} c #98BEE6", -"| c #AAC9EA", -"1 c #F8FBFD", -"2 c #007DC6", -"3 c #0088DB", -"4 c #1990DC", -"5 c #84B1E1", -"6 c #A4C6E9", -"7 c #0083D8", -"8 c #559CDB", -"9 c #70A4DC", -"0 c #AFCCEB", -"a c #4698DA", -"b c #8A8ABF", -"c c #8181BB", -"d c #007ED5", -"e c #0C81D5", -"f c #5796D7", -"g c #5C98D7", -"h c #AECBEB", -"i c #4C93D6", -"j c #0680D5", -"k c #005A9E", -"l c #8888BE", -"m c #E4E4E4", -"n c #7F7FBA", -"o c #0079D2", -"p c #057AD2", -"q c #3085D2", -"r c #498CD2", -"s c #A4C5E9", -"t c #2B84D2", -"u c #006183", -"v c #8383BC", -"w c #7D7DB9", -"x c #0074CF", -"y c #0876CE", -"z c #1A7ACE", -"A c #8EBDE7", -"B c #1679CE", -"C c #0475CE", -"D c #107A39", -"E c #178A02", -"F c #178E00", -"G c #158D00", -"H c #138B00", -"I c #118900", -"J c #0F8800", -"K c #0E8600", -"L c #005D00", -"M c #7B7BB7", -"N c #006EBF", -"O c #006FCB", -"P c #80B7E5", -"Q c #46A948", -"R c #78D05E", -"S c #7AD660", -"T c #78D460", -"U c #76D260", -"V c #73D060", -"W c #31B718", -"X c #7979B6", -"Y c #0E797D", -"Z c #006AC8", -"` c #80B4E4", -" . c #0875A4", -".. c #6AB859", -"+. c #9EDD8D", -"@. c #77D360", -"#. c #75D160", -"$. c #73CF60", -"%. c #B1E4A7", -"&. c #43BC30", -"*. c #7777B5", -"=. c #318030", -"-. c #0065C5", -";. c #80B2E2", -">. c #1A9042", -",. c #6EBD5C", -"'. c #23B600", -"). c #1FB300", -"!. c #1CB000", -"~. c #9ADB8F", -"{. c #40B930", -"]. c #7575B4", -"^. c #6CAEC0", -"/. c #005FC2", -"(. c #5091D5", -"_. c #297AAC", -":. c #8DAD8B", -"<. c #A2B69F", -"[. c #9DB497", -"}. c #7BA073", -"|. c #31AA1B", -"1. c #18AD00", -"2. c #98DA8F", -"3. c #3DB630", -"4. c #7373B3", -"5. c #B9F78F", -"6. c #369099", -"7. c #005DC0", -"8. c #307BCC", -"9. c #2072BC", -"0. c #94BB9D", -"a. c #95959B", -"b. c #848484", -"c. c #6A6A6A", -"d. c #505050", -"e. c #219110", -"f. c #14A900", -"g. c #97D88F", -"h. c #3AB430", -"i. c #7070B2", -"j. c #B7F58F", -"k. c #B4F28E", -"l. c #4695A4", -"m. c #0C7386", -"n. c #3BA431", -"o. c #61AE54", -"p. c #979798", -"q. c #727272", -"r. c #585858", -"s. c #3E3E3E", -"t. c #1A8A0B", -"u. c #11A600", -"v. c #95D78F", -"w. c #37B130", -"x. c #6E6EB0", -"y. c #B6F48F", -"z. c #B5F38F", -"A. c #B1EF8E", -"B. c #74BC7F", -"C. c #17807B", -"D. c #0D7386", -"E. c #1C9135", -"F. c #24A007", -"G. c #22A306", -"H. c #2DB30E", -"I. c #3BAA24", -"J. c #2E9D1A", -"K. c #259413", -"L. c #1B8B0D", -"M. c #129E02", -"N. c #0DA300", -"O. c #94D58F", -"P. c #34AE30", -"Q. c #6C6CAF", -"R. c #B4F28F", -"S. c #B3F28F", -"T. c #B2F08F", -"U. c #9FEB77", -"V. c #64CE33", -"W. c #3AB607", -"X. c #84B2B0", -"Y. c #269A35", -"Z. c #6BAB91", -"`. c #83B1B0", -" + c #A3C5AB", -".+ c #ACCBAA", -"++ c #AECDAB", -"@+ c #BADCB5", -"#+ c #C6EABE", -"$+ c #CBEBC4", -"%+ c #D2E4CE", -"&+ c #CBDEC8", -"*+ c #C5D8C2", -"=+ c #BFD1BC", -"-+ c #C0E1BE", -";+ c #93D58F", -">+ c #92D48F", -",+ c #31AC30", -"'+ c #6A6AAE", -")+ c #DCB46B", -"!+ c #DBB46B", -"~+ c #B0EF8F", -"{+ c #D1F5BF", -"]+ c #D0F4BF", -"^+ c #69D539", -"/+ c #BFBFC1", -"(+ c #99999C", -"_+ c #7F7F83", -":+ c #2DB404", -"<+ c #2AB104", -"[+ c #28B502", -"}+ c #26B900", -"|+ c #4DBC38", -"1+ c #B0B0B0", -"2+ c #8A8A8A", -"3+ c #707070", -"4+ c #565656", -"5+ c #479B41", -"6+ c #92D38F", -"7+ c #91D38F", -"8+ c #30AB30", -"9+ c #6868AD", -"0+ c #E9A060", -"a+ c #E89F60", -"b+ c #69DE30", -"c+ c #43D300", -"d+ c #CFF3BF", -"e+ c #63D036", -"f+ c #A3A3A3", -"g+ c #747474", -"h+ c #4F4F4F", -"i+ c #A3E38F", -"j+ c #A2E28F", -"k+ c #A0E18F", -"l+ c #9FDF8F", -"m+ c #9DDE8F", -"n+ c #9CDC8F", -"o+ c #A9DAA1", -"p+ c #A0A0A0", -"q+ c #797979", -"r+ c #5F5F5F", -"s+ c #444444", -"t+ c #86B084", -"u+ c #90D28F", -"v+ c #8FD28F", -"w+ c #6666AC", -"x+ c #66DB30", -"y+ c #3FD000", -"z+ c #CEF2BF", -"A+ c #5DCA33", -"B+ c #8E8E8E", -"C+ c #5B5B5B", -"D+ c #353535", -"E+ c #52C930", -"F+ c #4EC630", -"G+ c #4287CB", -"H+ c #3F72FF", -"I+ c #4185CB", -"J+ c #58BC4B", -"K+ c #72976E", -"L+ c #52774F", -"M+ c #3D633B", -"N+ c #294E27", -"O+ c #2C912B", -"P+ c #24A624", -"Q+ c #6464AB", -"R+ c #AEED8F", -"S+ c #ADEC8F", -"T+ c #60D630", -"U+ c #CDF1BF", -"V+ c #35C600", -"W+ c #CBF0BF", -"X+ c #CAEFBF", -"Y+ c #22B600", -"Z+ c #3782BF", -"`+ c #3580BF", -" @ c #0AA000", -".@ c #069C00", -"+@ c #029900", -"@@ c #009700", -"#@ c #6262A9", -"$@ c #C7F2B3", -"%@ c #90E46B", -"&@ c #5DD330", -"*@ c #CCF1BF", -"=@ c #31C300", -"-@ c #CAEEBF", -";@ c #89BACB", -">@ c #82AEDF", -",@ c #87B8CB", -"'@ c #B3E0B3", -")@ c #5F5FA8", -"!@ c #F3F497", -"~@ c #EAE071", -"{@ c #F3DA70", -"]@ c #D6F47F", -"^@ c #F2DA70", -"/@ c #CBEF74", -"(@ c #F2D970", -"_@ c #D2E873", -":@ c #C7EC74", -"<@ c #F1D870", -"[@ c #307F30", -"}@ c #0C700C", -"|@ c #006C00", -"1@ c #5D5DA7", -"2@ c #FFF489", -"3@ c #FFDD67", -"4@ c #FFD256", -"5@ c #FFFF9A", -"6@ c #5B5BA6", -"7@ c #5959A5", -"8@ c #5A5AA5", -"9@ c #5757A4", -" ", -" . + @ @ # $ % ", -" & * * * * * * * * = - ", -" ; > > > > > > > > > > , ' ", -" ) ! ! ! ! ~ { { ~ ! ! ! ! ] ^ ", -" / ( ( ( ( ( _ { { _ ( ( ( ( ( : ", -" < [ } } } } } | 1 1 | } } } } } [ 2 ", -" 3 4 5 5 5 5 5 5 6 6 5 5 5 5 5 5 3 3 ", -" 7 7 8 9 9 9 9 0 { { 0 9 9 9 9 a 7 7 ", -"b b b c d d e f g g g h { { h g g g i j d d k ", -"l m m n o o o p q r r s { { s r r t p o o o u ", -"b v m w x x x x x y z A { { A B C x x x x x D E F G H I J K L ", -" b m M N O O O O O O P { { P O O O O O O O Q R S T U U V W L ", -" b m X Y Z Z Z Z Z Z ` { { ` Z Z Z Z Z Z ...+.@.#.$.$.%.&.L ", -" b m *. =.-.-.-.-.-.-.;.{ { ;.-.-.-.-.-.-.>.,.@.'.).!.!.~.{.L ", -" b m ]. =.^./././././.(.{ { (./././././._.:.<.[.}.|.1.1.2.3.L ", -" b m 4. =.5.6.7.7.7.7.7.8.8.7.7.7.7.7.9.0.a.b.c.d.e.f.f.g.h.L ", -" b m i. =.j.k.l.7.7.7.7.7.7.7.7.7.7.m.n.o.p.q.r.s.t.u.u.v.w.L ", -" b m x. =.y.z.A.B.C.7.7.7.7.7.7.D.E.F.G.H.I.J.K.L.M.N.N.O.P.L ", -" b m Q. =.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+;+>+,+L ", -" b m '+ =.)+!+~+{+]+^+/+(+_+:+<+[+}+'.).|+1+2+3+4+5+6+6+7+8+L ", -" b m 9+ =.0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+u+v+8+L ", -" b m w+ =.a+a+x+y+z+A+B+C+D+E+F+G+H+I+&.J+K+L+M+N+O+P+P+v+8+L ", -" b m Q+ =.R+S+d+T+U+V+W+X+E+}+Y+Z+H+`+f.u.N. @.@+@@@@@@@v+8+L ", -" b m #@ =.$@%@z+&@*@=@X+-@F+Y+m+;@>@,@g.v.O.>+7+v+v+v+v+'@8+L ", -" b m )@ =.!@~@{@]@^@/@(@(@_@:@<@=.=.=.=.=.[@[@[@[@[@[@[@}@|@L ", -" b m 1@ =.2@3@4@5@4@5@4@4@2@5@4@=. ", -" b m 6@ =.2@3@4@5@4@5@4@4@2@5@4@=. ", -" b m 7@ =.=.=.=.=.=.=.=.=.=.=.=.=. ", -" b 8@9@ ", -" ", -" "}; diff --git a/debian/squeeze/tdebase/debian/kcontrol-trinity.install b/debian/squeeze/tdebase/debian/kcontrol-trinity.install index 65a650cbc..46eb3b814 100644 --- a/debian/squeeze/tdebase/debian/kcontrol-trinity.install +++ b/debian/squeeze/tdebase/debian/kcontrol-trinity.install @@ -4,7 +4,6 @@ debian/tmp/opt/trinity/bin/kdeinstallktheme debian/tmp/opt/trinity/bin/keditfiletype debian/tmp/opt/trinity/bin/tdefontinst debian/tmp/opt/trinity/bin/tdefontview -debian/tmp/opt/trinity/bin/kinfocenter debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper debian/tmp/opt/trinity/bin/tderandrtray debian/tmp/opt/trinity/bin/krdb @@ -242,5 +241,3 @@ debian/tmp/opt/trinity/share/services/localdomainurifilter.desktop debian/icons/kcontrol.xpm /opt/trinity/share/pixmaps debian/icons/kcontrol-16.xpm /opt/trinity/share/pixmaps -debian/icons/kinfocenter.xpm /opt/trinity/share/pixmaps -debian/icons/kinfocenter-16.xpm /opt/trinity/share/pixmaps diff --git a/debian/squeeze/tdebase/debian/kcontrol-trinity.menu b/debian/squeeze/tdebase/debian/kcontrol-trinity.menu index f2bedef2b..3576cdae0 100644 --- a/debian/squeeze/tdebase/debian/kcontrol-trinity.menu +++ b/debian/squeeze/tdebase/debian/kcontrol-trinity.menu @@ -7,17 +7,5 @@ icon16x16="/opt/trinity/share/pixmaps/kcontrol-16.xpm"\ command="/opt/trinity/bin/kcontrol" -?package(kcontrol):\ - needs="X11"\ - section="Applications/System/Administration"\ - hints="TDE"\ - title="KInfoCenter"\ - icon32x32="/opt/trinity/share/pixmaps/kinfocenter.xpm"\ - icon16x16="/opt/trinity/share/pixmaps/kinfocenter-16.xpm"\ - command="/opt/trinity/bin/kinfocenter" - # Icon 32x32 kcontrol/kcontrol/cr32-app-kcontrol.png kcontrol.xpm # Icon 16x16 kcontrol/kcontrol/cr16-app-kcontrol.png kcontrol-16.xpm - -# Icon 32x32 kcontrol/pics/cr32-app-hwinfo.png kinfocenter.xpm -# Icon 16x16 kcontrol/pics/cr16-app-hwinfo.png kinfocenter-16.xpm diff --git a/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules index 4cd8ee87e..39e8b828a 100755 --- a/debian/squeeze/tdebase/debian/rules +++ b/debian/squeeze/tdebase/debian/rules @@ -27,7 +27,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \ - -DAUTODETECT_QT_DIRS="ON" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH="OFF" \ @@ -79,7 +78,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop +DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ ksysguard-trinity twin-trinity libkonq4-trinity diff --git a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install index e790d4894..9ae37a312 100644 --- a/debian/squeeze/tdebase/debian/tdebase-data-trinity.install +++ b/debian/squeeze/tdebase/debian/tdebase-data-trinity.install @@ -107,7 +107,6 @@ debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WindowsXP.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/YellowOnBlue.kcsrc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewpart.rc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewui.rc -debian/tmp/opt/trinity/share/apps/kinfocenter/kinfocenterui.rc debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png @@ -273,63 +272,63 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/access.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/acroread.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/applixware.png diff --git a/debian/squeeze/tdegraphics/debian/kgamma-trinity.install b/debian/squeeze/tdegraphics/debian/kgamma-trinity.install index ff83d71ab..3e8fa0bb8 100644 --- a/debian/squeeze/tdegraphics/debian/kgamma-trinity.install +++ b/debian/squeeze/tdegraphics/debian/kgamma-trinity.install @@ -1,7 +1,7 @@ debian/tmp/opt/trinity/bin/xf86gammacfg debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.la debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.so -debian/tmp/opt/trinity/share/applications/tde/kgamma.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/kgamma.desktop debian/tmp/opt/trinity/share/apps/kgamma/pics/background.png debian/tmp/opt/trinity/share/apps/kgamma/pics/cmyscale.png debian/tmp/opt/trinity/share/apps/kgamma/pics/darkgrey.png diff --git a/debian/squeeze/tdeutils/debian/kdf-trinity.install b/debian/squeeze/tdeutils/debian/kdf-trinity.install index 44a0e0bf3..a89e9bf6e 100644 --- a/debian/squeeze/tdeutils/debian/kdf-trinity.install +++ b/debian/squeeze/tdeutils/debian/kdf-trinity.install @@ -13,9 +13,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf_config.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.docbook debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdf.png diff --git a/debian/squeeze/tdeutils/debian/rules b/debian/squeeze/tdeutils/debian/rules index 772269551..eb3386805 100755 --- a/debian/squeeze/tdeutils/debian/rules +++ b/debian/squeeze/tdeutils/debian/rules @@ -36,7 +36,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_XMMS="ON" \ -DWITH_KNEWSTUFF="ON" -DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselect-trinity ksim-trinity +DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg diff --git a/debian/wheezy/tdebase/debian/cdbs/debian-qt-kde.mk b/debian/wheezy/tdebase/debian/cdbs/debian-qt-kde.mk index ec89756bb..4fd113539 100644 --- a/debian/wheezy/tdebase/debian/cdbs/debian-qt-kde.mk +++ b/debian/wheezy/tdebase/debian/cdbs/debian-qt-kde.mk @@ -13,7 +13,7 @@ debian/stamp-cvs-make: touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches diff --git a/debian/wheezy/tdebase/debian/icons/kinfocenter-16.xpm b/debian/wheezy/tdebase/debian/icons/kinfocenter-16.xpm deleted file mode 100644 index 615bbf46b..000000000 --- a/debian/wheezy/tdebase/debian/icons/kinfocenter-16.xpm +++ /dev/null @@ -1,193 +0,0 @@ -/* XPM */ -static char * kinfocenter_16_xpm[] = { -"16 16 174 2", -" c None", -". c #A6DBF4", -"+ c #CFEBF9", -"@ c #C9EAF9", -"# c #A1DCF7", -"$ c #CEE0F3", -"% c #D9E4F4", -"& c #E6EEF8", -"* c #E7EEF8", -"= c #DCE5F5", -"- c #BCE3FF", -"; c #256589", -"> c #64B0E5", -", c #B2CBEA", -"' c #A3C5E9", -") c #DEEAF7", -"! c #B4CDED", -"~ c #5CB5F0", -"{ c #419CDF", -"] c #86B0DF", -"^ c #7CACDF", -"/ c #B8D2EE", -"( c #86AFDF", -"_ c #3CA2EB", -": c #004D85", -"< c #A3A3CF", -"[ c #9188AD", -"} c #034A82", -"| c #0884DF", -"1 c #428FD6", -"2 c #5995D6", -"3 c #DAE7F6", -"4 c #DBE7F6", -"5 c #3E8ED5", -"6 c #0683DD", -"7 c #005FA0", -"8 c #8B8BAC", -"9 c #ACA3B8", -"0 c #01386D", -"a c #0078DA", -"b c #0072CE", -"c c #1377CD", -"d c #CAE0F4", -"e c #1177CD", -"f c #0071D9", -"g c #0F7B8C", -"h c #378B1E", -"i c #399D25", -"j c #34A721", -"k c #0D7A05", -"l c #4C4C5F", -"m c #ABA4C5", -"n c #0A3C47", -"o c #006DC9", -"p c #0067C9", -"q c #0067C8", -"r c #CAE1F4", -"s c #0068C8", -"t c #0063C8", -"u c #3C9E7A", -"v c #80E35A", -"w c #5DCF47", -"x c #80DB6D", -"y c #2B9022", -"z c #8989B1", -"A c #9D98BD", -"B c #254925", -"C c #358FAE", -"D c #0056C6", -"E c #005BC3", -"F c #8EB8E3", -"G c #005BC2", -"H c #0059CC", -"I c #2775BB", -"J c #8BA78C", -"K c #739B66", -"L c #14A100", -"M c #54C841", -"N c #2E8F29", -"O c #9D9DCD", -"P c #9792B8", -"Q c #254B25", -"R c #A2ED8B", -"S c #3589A8", -"T c #0057BA", -"U c #0058C3", -"V c #0059C8", -"W c #005AC2", -"X c #096F88", -"Y c #4DA653", -"Z c #75906A", -"` c #415E3E", -" . c #089000", -".. c #4CC33F", -"+. c #2B8D29", -"@. c #9A9AC8", -"#. c #9691B8", -"$. c #204624", -"%. c #BAED84", -"&. c #B4EF90", -"*. c #55B464", -"=. c #4B9092", -"-. c #489093", -";. c #59A87D", -">. c #67C14F", -",. c #7ACF60", -"'. c #96C38D", -"). c #7EAB78", -"!. c #70C06C", -"~. c #7ED279", -"{. c #218821", -"]. c #9491B8", -"^. c #254022", -"/. c #D7A95B", -"(. c #8CE254", -"_. c #A0E879", -":. c #86847C", -"<. c #699351", -"[. c #6FD35D", -"}. c #65C173", -"|. c #79CC6C", -"1. c #919091", -"2. c #555455", -"3. c #70B06E", -"4. c #88D688", -"5. c #1F861F", -"6. c #938FB6", -"7. c #214325", -"8. c #BAD581", -"9. c #86E262", -"0. c #7BDA61", -"a. c #92B98F", -"b. c #3BAB1A", -"c. c #48AB88", -"d. c #548DF3", -"e. c #4BC042", -"f. c #46AA3E", -"g. c #31942F", -"h. c #2AA72A", -"i. c #62CC62", -"j. c #289028", -"k. c #908BB4", -"l. c #234729", -"m. c #D6F289", -"n. c #DAEA82", -"o. c #C2E56D", -"p. c #E2EA86", -"q. c #B0E85D", -"r. c #8BB66D", -"s. c #447F68", -"t. c #4C8F4B", -"u. c #4A9148", -"v. c #4B924B", -"w. c #4D8E4D", -"x. c #498E49", -"y. c #0D650D", -"z. c #A0A0CE", -"A. c #9490BA", -"B. c #234A27", -"C. c #E6E569", -"D. c #F0E26C", -"E. c #F1E978", -"F. c #EFD85C", -"G. c #F5FA8B", -"H. c #8EA842", -"I. c #000100", -"J. c #686699", -"K. c #0C1E12", -"L. c #1E4018", -"M. c #1D3D18", -"N. c #1E3E18", -"O. c #1D3D17", -"P. c #1E3F1A", -"Q. c #183815", -" . + @ # ", -" $ % & * = - ; ", -" > , ' ) ) ' ! ~ ", -" { ] ^ / / ^ ( _ : ", -"< [ } | 1 2 3 4 2 5 6 7 ", -"8 9 0 a b c d d e b f g h i j k ", -"l m n o p q r r q s t u v w x y ", -"z A B C D E F F G H I J K L M N ", -"O P Q R S T U V W X Y Z ` ...+.", -"@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.", -"@.].^./.(._.:.<.[.}.|.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.q.r.s.t.u.v.w.x.y.", -"z.A.B.C.D.E.F.G.H.I. ", -" J.K.L.M.N.O.P.Q. ", -" "}; diff --git a/debian/wheezy/tdebase/debian/icons/kinfocenter.xpm b/debian/wheezy/tdebase/debian/icons/kinfocenter.xpm deleted file mode 100644 index 04fcb0013..000000000 --- a/debian/wheezy/tdebase/debian/icons/kinfocenter.xpm +++ /dev/null @@ -1,349 +0,0 @@ -/* XPM */ -static char * kinfocenter_xpm[] = { -"32 32 314 2", -" c None", -". c #98DBF8", -"+ c #ABE2F9", -"@ c #BBE7FA", -"# c #9CDCF8", -"$ c #85D4F6", -"% c #3DBBF1", -"& c #B8E0F6", -"* c #E8F1F9", -"= c #97D3F2", -"- c #1BA6E6", -"; c #C6DFF3", -"> c #D4E4F4", -", c #ABD6F2", -"' c #1399DB", -") c #9BCAED", -"! c #C0D7F0", -"~ c #D5E4F5", -"{ c #FFFFFF", -"] c #77BFEB", -"^ c #0089CF", -"/ c #229DE3", -"( c #ADCBEB", -"_ c #D6E5F5", -": c #0093E1", -"< c #008DDE", -"[ c #269AE0", -"} c #98BEE6", -"| c #AAC9EA", -"1 c #F8FBFD", -"2 c #007DC6", -"3 c #0088DB", -"4 c #1990DC", -"5 c #84B1E1", -"6 c #A4C6E9", -"7 c #0083D8", -"8 c #559CDB", -"9 c #70A4DC", -"0 c #AFCCEB", -"a c #4698DA", -"b c #8A8ABF", -"c c #8181BB", -"d c #007ED5", -"e c #0C81D5", -"f c #5796D7", -"g c #5C98D7", -"h c #AECBEB", -"i c #4C93D6", -"j c #0680D5", -"k c #005A9E", -"l c #8888BE", -"m c #E4E4E4", -"n c #7F7FBA", -"o c #0079D2", -"p c #057AD2", -"q c #3085D2", -"r c #498CD2", -"s c #A4C5E9", -"t c #2B84D2", -"u c #006183", -"v c #8383BC", -"w c #7D7DB9", -"x c #0074CF", -"y c #0876CE", -"z c #1A7ACE", -"A c #8EBDE7", -"B c #1679CE", -"C c #0475CE", -"D c #107A39", -"E c #178A02", -"F c #178E00", -"G c #158D00", -"H c #138B00", -"I c #118900", -"J c #0F8800", -"K c #0E8600", -"L c #005D00", -"M c #7B7BB7", -"N c #006EBF", -"O c #006FCB", -"P c #80B7E5", -"Q c #46A948", -"R c #78D05E", -"S c #7AD660", -"T c #78D460", -"U c #76D260", -"V c #73D060", -"W c #31B718", -"X c #7979B6", -"Y c #0E797D", -"Z c #006AC8", -"` c #80B4E4", -" . c #0875A4", -".. c #6AB859", -"+. c #9EDD8D", -"@. c #77D360", -"#. c #75D160", -"$. c #73CF60", -"%. c #B1E4A7", -"&. c #43BC30", -"*. c #7777B5", -"=. c #318030", -"-. c #0065C5", -";. c #80B2E2", -">. c #1A9042", -",. c #6EBD5C", -"'. c #23B600", -"). c #1FB300", -"!. c #1CB000", -"~. c #9ADB8F", -"{. c #40B930", -"]. c #7575B4", -"^. c #6CAEC0", -"/. c #005FC2", -"(. c #5091D5", -"_. c #297AAC", -":. c #8DAD8B", -"<. c #A2B69F", -"[. c #9DB497", -"}. c #7BA073", -"|. c #31AA1B", -"1. c #18AD00", -"2. c #98DA8F", -"3. c #3DB630", -"4. c #7373B3", -"5. c #B9F78F", -"6. c #369099", -"7. c #005DC0", -"8. c #307BCC", -"9. c #2072BC", -"0. c #94BB9D", -"a. c #95959B", -"b. c #848484", -"c. c #6A6A6A", -"d. c #505050", -"e. c #219110", -"f. c #14A900", -"g. c #97D88F", -"h. c #3AB430", -"i. c #7070B2", -"j. c #B7F58F", -"k. c #B4F28E", -"l. c #4695A4", -"m. c #0C7386", -"n. c #3BA431", -"o. c #61AE54", -"p. c #979798", -"q. c #727272", -"r. c #585858", -"s. c #3E3E3E", -"t. c #1A8A0B", -"u. c #11A600", -"v. c #95D78F", -"w. c #37B130", -"x. c #6E6EB0", -"y. c #B6F48F", -"z. c #B5F38F", -"A. c #B1EF8E", -"B. c #74BC7F", -"C. c #17807B", -"D. c #0D7386", -"E. c #1C9135", -"F. c #24A007", -"G. c #22A306", -"H. c #2DB30E", -"I. c #3BAA24", -"J. c #2E9D1A", -"K. c #259413", -"L. c #1B8B0D", -"M. c #129E02", -"N. c #0DA300", -"O. c #94D58F", -"P. c #34AE30", -"Q. c #6C6CAF", -"R. c #B4F28F", -"S. c #B3F28F", -"T. c #B2F08F", -"U. c #9FEB77", -"V. c #64CE33", -"W. c #3AB607", -"X. c #84B2B0", -"Y. c #269A35", -"Z. c #6BAB91", -"`. c #83B1B0", -" + c #A3C5AB", -".+ c #ACCBAA", -"++ c #AECDAB", -"@+ c #BADCB5", -"#+ c #C6EABE", -"$+ c #CBEBC4", -"%+ c #D2E4CE", -"&+ c #CBDEC8", -"*+ c #C5D8C2", -"=+ c #BFD1BC", -"-+ c #C0E1BE", -";+ c #93D58F", -">+ c #92D48F", -",+ c #31AC30", -"'+ c #6A6AAE", -")+ c #DCB46B", -"!+ c #DBB46B", -"~+ c #B0EF8F", -"{+ c #D1F5BF", -"]+ c #D0F4BF", -"^+ c #69D539", -"/+ c #BFBFC1", -"(+ c #99999C", -"_+ c #7F7F83", -":+ c #2DB404", -"<+ c #2AB104", -"[+ c #28B502", -"}+ c #26B900", -"|+ c #4DBC38", -"1+ c #B0B0B0", -"2+ c #8A8A8A", -"3+ c #707070", -"4+ c #565656", -"5+ c #479B41", -"6+ c #92D38F", -"7+ c #91D38F", -"8+ c #30AB30", -"9+ c #6868AD", -"0+ c #E9A060", -"a+ c #E89F60", -"b+ c #69DE30", -"c+ c #43D300", -"d+ c #CFF3BF", -"e+ c #63D036", -"f+ c #A3A3A3", -"g+ c #747474", -"h+ c #4F4F4F", -"i+ c #A3E38F", -"j+ c #A2E28F", -"k+ c #A0E18F", -"l+ c #9FDF8F", -"m+ c #9DDE8F", -"n+ c #9CDC8F", -"o+ c #A9DAA1", -"p+ c #A0A0A0", -"q+ c #797979", -"r+ c #5F5F5F", -"s+ c #444444", -"t+ c #86B084", -"u+ c #90D28F", -"v+ c #8FD28F", -"w+ c #6666AC", -"x+ c #66DB30", -"y+ c #3FD000", -"z+ c #CEF2BF", -"A+ c #5DCA33", -"B+ c #8E8E8E", -"C+ c #5B5B5B", -"D+ c #353535", -"E+ c #52C930", -"F+ c #4EC630", -"G+ c #4287CB", -"H+ c #3F72FF", -"I+ c #4185CB", -"J+ c #58BC4B", -"K+ c #72976E", -"L+ c #52774F", -"M+ c #3D633B", -"N+ c #294E27", -"O+ c #2C912B", -"P+ c #24A624", -"Q+ c #6464AB", -"R+ c #AEED8F", -"S+ c #ADEC8F", -"T+ c #60D630", -"U+ c #CDF1BF", -"V+ c #35C600", -"W+ c #CBF0BF", -"X+ c #CAEFBF", -"Y+ c #22B600", -"Z+ c #3782BF", -"`+ c #3580BF", -" @ c #0AA000", -".@ c #069C00", -"+@ c #029900", -"@@ c #009700", -"#@ c #6262A9", -"$@ c #C7F2B3", -"%@ c #90E46B", -"&@ c #5DD330", -"*@ c #CCF1BF", -"=@ c #31C300", -"-@ c #CAEEBF", -";@ c #89BACB", -">@ c #82AEDF", -",@ c #87B8CB", -"'@ c #B3E0B3", -")@ c #5F5FA8", -"!@ c #F3F497", -"~@ c #EAE071", -"{@ c #F3DA70", -"]@ c #D6F47F", -"^@ c #F2DA70", -"/@ c #CBEF74", -"(@ c #F2D970", -"_@ c #D2E873", -":@ c #C7EC74", -"<@ c #F1D870", -"[@ c #307F30", -"}@ c #0C700C", -"|@ c #006C00", -"1@ c #5D5DA7", -"2@ c #FFF489", -"3@ c #FFDD67", -"4@ c #FFD256", -"5@ c #FFFF9A", -"6@ c #5B5BA6", -"7@ c #5959A5", -"8@ c #5A5AA5", -"9@ c #5757A4", -" ", -" . + @ @ # $ % ", -" & * * * * * * * * = - ", -" ; > > > > > > > > > > , ' ", -" ) ! ! ! ! ~ { { ~ ! ! ! ! ] ^ ", -" / ( ( ( ( ( _ { { _ ( ( ( ( ( : ", -" < [ } } } } } | 1 1 | } } } } } [ 2 ", -" 3 4 5 5 5 5 5 5 6 6 5 5 5 5 5 5 3 3 ", -" 7 7 8 9 9 9 9 0 { { 0 9 9 9 9 a 7 7 ", -"b b b c d d e f g g g h { { h g g g i j d d k ", -"l m m n o o o p q r r s { { s r r t p o o o u ", -"b v m w x x x x x y z A { { A B C x x x x x D E F G H I J K L ", -" b m M N O O O O O O P { { P O O O O O O O Q R S T U U V W L ", -" b m X Y Z Z Z Z Z Z ` { { ` Z Z Z Z Z Z ...+.@.#.$.$.%.&.L ", -" b m *. =.-.-.-.-.-.-.;.{ { ;.-.-.-.-.-.-.>.,.@.'.).!.!.~.{.L ", -" b m ]. =.^./././././.(.{ { (./././././._.:.<.[.}.|.1.1.2.3.L ", -" b m 4. =.5.6.7.7.7.7.7.8.8.7.7.7.7.7.9.0.a.b.c.d.e.f.f.g.h.L ", -" b m i. =.j.k.l.7.7.7.7.7.7.7.7.7.7.m.n.o.p.q.r.s.t.u.u.v.w.L ", -" b m x. =.y.z.A.B.C.7.7.7.7.7.7.D.E.F.G.H.I.J.K.L.M.N.N.O.P.L ", -" b m Q. =.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+;+>+,+L ", -" b m '+ =.)+!+~+{+]+^+/+(+_+:+<+[+}+'.).|+1+2+3+4+5+6+6+7+8+L ", -" b m 9+ =.0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+u+v+8+L ", -" b m w+ =.a+a+x+y+z+A+B+C+D+E+F+G+H+I+&.J+K+L+M+N+O+P+P+v+8+L ", -" b m Q+ =.R+S+d+T+U+V+W+X+E+}+Y+Z+H+`+f.u.N. @.@+@@@@@@@v+8+L ", -" b m #@ =.$@%@z+&@*@=@X+-@F+Y+m+;@>@,@g.v.O.>+7+v+v+v+v+'@8+L ", -" b m )@ =.!@~@{@]@^@/@(@(@_@:@<@=.=.=.=.=.[@[@[@[@[@[@[@}@|@L ", -" b m 1@ =.2@3@4@5@4@5@4@4@2@5@4@=. ", -" b m 6@ =.2@3@4@5@4@5@4@4@2@5@4@=. ", -" b m 7@ =.=.=.=.=.=.=.=.=.=.=.=.=. ", -" b 8@9@ ", -" ", -" "}; diff --git a/debian/wheezy/tdebase/debian/kcontrol-trinity.install b/debian/wheezy/tdebase/debian/kcontrol-trinity.install index 65a650cbc..46eb3b814 100644 --- a/debian/wheezy/tdebase/debian/kcontrol-trinity.install +++ b/debian/wheezy/tdebase/debian/kcontrol-trinity.install @@ -4,7 +4,6 @@ debian/tmp/opt/trinity/bin/kdeinstallktheme debian/tmp/opt/trinity/bin/keditfiletype debian/tmp/opt/trinity/bin/tdefontinst debian/tmp/opt/trinity/bin/tdefontview -debian/tmp/opt/trinity/bin/kinfocenter debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper debian/tmp/opt/trinity/bin/tderandrtray debian/tmp/opt/trinity/bin/krdb @@ -242,5 +241,3 @@ debian/tmp/opt/trinity/share/services/localdomainurifilter.desktop debian/icons/kcontrol.xpm /opt/trinity/share/pixmaps debian/icons/kcontrol-16.xpm /opt/trinity/share/pixmaps -debian/icons/kinfocenter.xpm /opt/trinity/share/pixmaps -debian/icons/kinfocenter-16.xpm /opt/trinity/share/pixmaps diff --git a/debian/wheezy/tdebase/debian/kcontrol-trinity.menu b/debian/wheezy/tdebase/debian/kcontrol-trinity.menu index f2bedef2b..3576cdae0 100644 --- a/debian/wheezy/tdebase/debian/kcontrol-trinity.menu +++ b/debian/wheezy/tdebase/debian/kcontrol-trinity.menu @@ -7,17 +7,5 @@ icon16x16="/opt/trinity/share/pixmaps/kcontrol-16.xpm"\ command="/opt/trinity/bin/kcontrol" -?package(kcontrol):\ - needs="X11"\ - section="Applications/System/Administration"\ - hints="TDE"\ - title="KInfoCenter"\ - icon32x32="/opt/trinity/share/pixmaps/kinfocenter.xpm"\ - icon16x16="/opt/trinity/share/pixmaps/kinfocenter-16.xpm"\ - command="/opt/trinity/bin/kinfocenter" - # Icon 32x32 kcontrol/kcontrol/cr32-app-kcontrol.png kcontrol.xpm # Icon 16x16 kcontrol/kcontrol/cr16-app-kcontrol.png kcontrol-16.xpm - -# Icon 32x32 kcontrol/pics/cr32-app-hwinfo.png kinfocenter.xpm -# Icon 16x16 kcontrol/pics/cr16-app-hwinfo.png kinfocenter-16.xpm diff --git a/debian/wheezy/tdebase/debian/rules b/debian/wheezy/tdebase/debian/rules index 4cd8ee87e..39e8b828a 100755 --- a/debian/wheezy/tdebase/debian/rules +++ b/debian/wheezy/tdebase/debian/rules @@ -27,7 +27,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \ - -DAUTODETECT_QT_DIRS="ON" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH="OFF" \ @@ -79,7 +78,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop +DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ ksysguard-trinity twin-trinity libkonq4-trinity diff --git a/debian/wheezy/tdebase/debian/tdebase-data-trinity.install b/debian/wheezy/tdebase/debian/tdebase-data-trinity.install index e790d4894..9ae37a312 100644 --- a/debian/wheezy/tdebase/debian/tdebase-data-trinity.install +++ b/debian/wheezy/tdebase/debian/tdebase-data-trinity.install @@ -107,7 +107,6 @@ debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WindowsXP.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/YellowOnBlue.kcsrc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewpart.rc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewui.rc -debian/tmp/opt/trinity/share/apps/kinfocenter/kinfocenterui.rc debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png @@ -273,63 +272,63 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/access.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/acroread.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/applixware.png diff --git a/debian/wheezy/tdegraphics/debian/kgamma-trinity.install b/debian/wheezy/tdegraphics/debian/kgamma-trinity.install index ff83d71ab..3e8fa0bb8 100644 --- a/debian/wheezy/tdegraphics/debian/kgamma-trinity.install +++ b/debian/wheezy/tdegraphics/debian/kgamma-trinity.install @@ -1,7 +1,7 @@ debian/tmp/opt/trinity/bin/xf86gammacfg debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.la debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.so -debian/tmp/opt/trinity/share/applications/tde/kgamma.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/kgamma.desktop debian/tmp/opt/trinity/share/apps/kgamma/pics/background.png debian/tmp/opt/trinity/share/apps/kgamma/pics/cmyscale.png debian/tmp/opt/trinity/share/apps/kgamma/pics/darkgrey.png diff --git a/debian/wheezy/tdeutils/debian/kdf-trinity.install b/debian/wheezy/tdeutils/debian/kdf-trinity.install index 44a0e0bf3..a89e9bf6e 100644 --- a/debian/wheezy/tdeutils/debian/kdf-trinity.install +++ b/debian/wheezy/tdeutils/debian/kdf-trinity.install @@ -13,9 +13,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf_config.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.docbook debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdf.png diff --git a/debian/wheezy/tdeutils/debian/rules b/debian/wheezy/tdeutils/debian/rules index 772269551..eb3386805 100755 --- a/debian/wheezy/tdeutils/debian/rules +++ b/debian/wheezy/tdeutils/debian/rules @@ -36,7 +36,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_XMMS="ON" \ -DWITH_KNEWSTUFF="ON" -DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselect-trinity ksim-trinity +DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg diff --git a/redhat/applications/adept/adept-14.0.0.spec b/redhat/applications/adept/adept-14.0.0.spec index ebd0ef00b..b271314ce 100644 --- a/redhat/applications/adept/adept-14.0.0.spec +++ b/redhat/applications/adept/adept-14.0.0.spec @@ -44,7 +44,9 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-util + +BuildRequires: libapt-front-devel Requires: %{name}-manager = %{version}-%{release} Requires: %{name}-installer = %{version}-%{release} @@ -165,10 +167,15 @@ export PATH="%{tde_bindir}:${PATH}" --includedir=%{tde_tdeincludedir} \ --libdir=%{tde_libdir} \ --mandir=%{tde_mandir} \ + \ --disable-rpath \ - --enable-closure + --enable-closure \ + \ + --with-extra-includes=%{_includedir}/tqt3 \ + \ + --enable-adept -%__make %{?_smp_mflags} -C adept +%__make %{?_smp_mflags} %install diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec index 3bd3a64b3..e08ab5f2b 100644 --- a/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec +++ b/redhat/applications/tde-systemsettings/tde-systemsettings-14.0.0.spec @@ -128,8 +128,8 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null %files %defattr(-,root,root,-) %doc README TODO -%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu -%{tde_sysconfdir}/xdg/menus/system-settings.menu +%{tde_sysconfdir}/xdg/menus/applications-merged/tde-system-settings-merge.menu +%{tde_sysconfdir}/xdg/menus/tde-system-settings.menu %{tde_bindir}/systemsettings %{tde_datadir}/applications/tde/audioencoding.desktop %{tde_datadir}/applications/tde/defaultapplication.desktop diff --git a/redhat/build/Makefile.r14 b/redhat/build/Makefile.r14 index ac31b4913..5712c83f4 100644 --- a/redhat/build/Makefile.r14 +++ b/redhat/build/Makefile.r14 @@ -126,8 +126,8 @@ htdig: $(call buildpkg,3rdparty/htdig) imlib1: -# Do NOT build on Fedora -ifeq ($(wildcard /etc/fedora-release),) +# Do NOT build on Fedora / CentOS +ifeq ($(wildcard /etc/fedora-release /etc/centos-release),) $(call buildpkg,3rdparty/imlib1) endif @@ -483,7 +483,10 @@ potracegui: tdebase $(call buildpkg,applications/potracegui) qt4-tqt-theme-engine: tdebase +# Do NOT build on CentOS +ifeq ($(wildcard /etc/centos-release),) $(call buildpkg,applications/qt4-tqt-theme-engine) +endif rosegarden: tdebase lilypond $(call buildpkg,applications/rosegarden) @@ -516,7 +519,10 @@ tdeio-umountwrapper: tdebase $(call buildpkg,applications/tdeio-umountwrapper) tdenetworkmanager: tdebase +# Do NOT build on CentOS +ifeq ($(wildcard /etc/centos-release),) $(call buildpkg,applications/tdenetworkmanager) +endif tdepowersave: tdebase $(call buildpkg,applications/tdepowersave) diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh index 26dd017cd..aea4036dd 100644 --- a/redhat/buildenv.sh +++ b/redhat/buildenv.sh @@ -12,6 +12,10 @@ export PATH="${PATH}:${TDE_GITBASEPKG}" # Distribution suffix (e.g: .el6 , .mga3 ...) export DIST="$( "${TDE_GITBASEPKG}/build/rpmdist.sh" --dist )" +<<<<<<< HEAD +======= +#alias dist='~/bin/rpmdist.sh --dist' +>>>>>>> 650867080ee48b3e555a57f7ac0dab05eb4c6447 # Go to the RPMS folder alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}' diff --git a/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch b/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch index 76fd104ba..0ed0de35c 100644 --- a/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch +++ b/redhat/tdebase/tdebase-14.0.0-displayconfig_translation.patch @@ -5,10 +5,10 @@ Comment=Configure display Comment[en_US]=Configure display +Comment[fr]=Configuration de l'affichage - # Restore the following key and remove this comment when a help handbook - # is written. Disabling this key prevents populating the main handbook - # table of contents with a non-existent document, which results in a -@@ -17,6 +18,7 @@ + DocPath=kcontrol/displayconfig/index.html + Exec=tdecmshell displayconfig + GenericName= +@@ -11,6 +12,7 @@ MimeType= Name=Monitor & Display Name[en_US]=Monitor & Display @@ -18,7 +18,7 @@ StartupNotify=true --- trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop.ORI 2013-05-11 21:21:04.241337141 +0200 +++ trinity-tdebase-3.5.13.2~pre100+073a32f9/kcontrol/iccconfig/iccconfig.desktop 2013-05-11 21:21:44.782537929 +0200 -@@ -18,6 +18,7 @@ +@@ -12,6 +12,7 @@ Categories=Qt;TDE;X-TDE-settings-hardware; Comment=Configure display ICC profile Comment[en_US]=Configure display ICC profile @@ -26,7 +26,7 @@ GenericName= GenericName[en_US]= Keywords=ICC,display,color,profile -@@ -24,5 +25,6 @@ +@@ -18,5 +19,6 @@ MimeType= Name=ICC Color Profile Name[en_US]=ICC Color Profile diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index e71cb7aaf..f1417f7ae 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -914,7 +914,7 @@ plugdev group. %{tde_bindir}/keditfiletype %{tde_bindir}/tdefontinst %{tde_bindir}/tdefontview -%{tde_bindir}/kinfocenter +#%{tde_bindir}/kinfocenter %{tde_bindir}/klocaldomainurifilterhelper %{tde_bindir}/krdb %{tde_tdelibdir}/fontthumbnail.la @@ -1078,7 +1078,7 @@ plugdev group. %{tde_tdeappdir}/tdehtml_behavior.desktop %{tde_tdeappdir}/tdehtml_fonts.desktop %{tde_tdeappdir}/tdehtml_java_js.desktop -%{tde_tdeappdir}/kinfocenter.desktop +#%{tde_tdeappdir}/kinfocenter.desktop %{tde_tdeappdir}/kthememanager.desktop %{tde_tdeappdir}/lanbrowser.desktop %{tde_tdeappdir}/language.desktop @@ -1358,7 +1358,7 @@ needed for a basic TDE desktop installation. %{tde_datadir}/apps/kcontrol/ %{tde_datadir}/apps/tdedisplay/ %{tde_datadir}/apps/tdefontview/ -%{tde_datadir}/apps/kinfocenter/kinfocenterui.rc +#%{tde_datadir}/apps/kinfocenter/kinfocenterui.rc %{tde_datadir}/apps/kthememanager/themes/* %{tde_datadir}/icons/crystalsvg/*/apps/access.png %{tde_datadir}/icons/crystalsvg/*/apps/acroread.png @@ -1594,7 +1594,7 @@ needed for a basic TDE desktop installation. %{tde_tdedocdir}/HTML/en/kcontrol/ %exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/ -%{tde_tdedocdir}/HTML/en/kinfocenter/ +#%{tde_tdedocdir}/HTML/en/kinfocenter/ %post data for f in crystalsvg ; do @@ -1888,6 +1888,7 @@ Installation of smbclient will make you able to use smb shared printers. %{tde_datadir}/services/print.protocol %{tde_datadir}/services/printdb.protocol %{tde_tdedocdir}/HTML/en/tdeprint/ +%{tde_tdedocdir}/HTML/en/tdeprintfax/ %post -n trinity-tdeprint /sbin/ldconfig || : diff --git a/redhat/tdegraphics/tdegraphics-14.0.0.spec b/redhat/tdegraphics/tdegraphics-14.0.0.spec index dd74fb9b8..228574b0a 100644 --- a/redhat/tdegraphics/tdegraphics-14.0.0.spec +++ b/redhat/tdegraphics/tdegraphics-14.0.0.spec @@ -458,6 +458,7 @@ A fax viewer for Trinity, supporting the display of raw and tiffed fax images %{tde_datadir}/apps/kfax/ %{tde_datadir}/icons/hicolor/??x??/apps/kfax.png %{tde_datadir}/icons/hicolor/scalable/apps/kfax.svgz +%{tde_tdedocdir}/HTML/en/kfax/ %post -n trinity-kfax for f in hicolor ; do @@ -497,6 +498,7 @@ kfax application once it reproduces all of kfax's features. %{tde_datadir}/icons/hicolor/scalable/apps/kfaxview.svgz %{tde_datadir}/services/kfaxmultipage.desktop %{tde_datadir}/services/kfaxmultipage_tiff.desktop +%{tde_tdedocdir}/HTML/en/kfaxview/ %post -n trinity-kfaxview for f in hicolor ; do @@ -532,7 +534,7 @@ Homepage: http://kgamma.berlios.de/index2.php %{tde_bindir}/xf86gammacfg %{tde_tdelibdir}/kcm_kgamma.la %{tde_tdelibdir}/kcm_kgamma.so -%{tde_tdeappdir}/kgamma.desktop +%{tde_datadir}/applnk/.hidden/kgamma.desktop %{tde_datadir}/apps/kgamma/ %{tde_datadir}/icons/hicolor/*/apps/kgamma.png %{tde_tdedocdir}/HTML/en/kgamma/ diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index 151b0dfcd..028aaa031 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -36,8 +36,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz -Patch1: tdelibs-14.0.0-fix_icon_path.patch - # Patches from Mandriva Patch101: tdelibs-14.0.0-xdg_dirs_set_path.patch Patch102: tdelibs-14.0.0-cups_by_default.patch @@ -448,8 +446,6 @@ applications for TDE. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .icons - %patch101 -p1 -b .xdg_path %patch102 -p1 -b .cups_by_default diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec index 2be7c765e..ad39e92c1 100644 --- a/redhat/tdepim/tdepim-14.0.0.spec +++ b/redhat/tdepim/tdepim-14.0.0.spec @@ -882,6 +882,7 @@ keybox and for retrieving certificates from LDAP servers. %{tde_datadir}/apps/kleopatra %{tde_datadir}/apps/kwatchgnupg %{tde_datadir}/services/kleopatra_config_*.desktop +%{tde_tdeappdir}/kleopatra.desktop %{tde_tdedocdir}/HTML/en/kleopatra/ %{tde_tdedocdir}/HTML/en/kwatchgnupg/ diff --git a/redhat/tdeutils/tdeutils-14.0.0.spec b/redhat/tdeutils/tdeutils-14.0.0.spec index fc510bd38..726f816b7 100644 --- a/redhat/tdeutils/tdeutils-14.0.0.spec +++ b/redhat/tdeutils/tdeutils-14.0.0.spec @@ -374,7 +374,7 @@ in a file manager. %{tde_datadir}/icons/hicolor/*/apps/kdf.png %{tde_datadir}/icons/hicolor/*/apps/kwikdisk.png %{tde_tdedocdir}/HTML/en/kdf/ -%{tde_tdedocdir}/HTML/en/kinfocenter/blockdevices/ +%{tde_tdedocdir}/HTML/en/kcontrol/storagedevices/ %post -n trinity-kdf for f in crystalsvg hicolor ; do @@ -728,6 +728,8 @@ plugin, if you need this package please file a bug. %{tde_datadir}/services/kmilo/kmilo_delli8k.desktop %{tde_datadir}/services/kmilo/kmilo_kvaio.desktop %{tde_datadir}/services/kmilo/kmilo_thinkpad.desktop +%{tde_tdedocdir}/HTML/en/kcontrol/kvaio/ +%{tde_tdedocdir}/HTML/en/kcontrol/thinkpad/ ########## diff --git a/ubuntu/maverick/kdegraphics.automake/debian/kgamma-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kgamma-trinity.install index ff83d71ab..3e8fa0bb8 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/kgamma-trinity.install +++ b/ubuntu/maverick/kdegraphics.automake/debian/kgamma-trinity.install @@ -1,7 +1,7 @@ debian/tmp/opt/trinity/bin/xf86gammacfg debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.la debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.so -debian/tmp/opt/trinity/share/applications/tde/kgamma.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/kgamma.desktop debian/tmp/opt/trinity/share/apps/kgamma/pics/background.png debian/tmp/opt/trinity/share/apps/kgamma/pics/cmyscale.png debian/tmp/opt/trinity/share/apps/kgamma/pics/darkgrey.png diff --git a/ubuntu/maverick/tdebase/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdebase/debian/cdbs/debian-qt-kde.mk index ec89756bb..4fd113539 100644 --- a/ubuntu/maverick/tdebase/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/maverick/tdebase/debian/cdbs/debian-qt-kde.mk @@ -13,7 +13,7 @@ debian/stamp-cvs-make: touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches diff --git a/ubuntu/maverick/tdebase/debian/icons/kinfocenter-16.xpm b/ubuntu/maverick/tdebase/debian/icons/kinfocenter-16.xpm deleted file mode 100644 index 615bbf46b..000000000 --- a/ubuntu/maverick/tdebase/debian/icons/kinfocenter-16.xpm +++ /dev/null @@ -1,193 +0,0 @@ -/* XPM */ -static char * kinfocenter_16_xpm[] = { -"16 16 174 2", -" c None", -". c #A6DBF4", -"+ c #CFEBF9", -"@ c #C9EAF9", -"# c #A1DCF7", -"$ c #CEE0F3", -"% c #D9E4F4", -"& c #E6EEF8", -"* c #E7EEF8", -"= c #DCE5F5", -"- c #BCE3FF", -"; c #256589", -"> c #64B0E5", -", c #B2CBEA", -"' c #A3C5E9", -") c #DEEAF7", -"! c #B4CDED", -"~ c #5CB5F0", -"{ c #419CDF", -"] c #86B0DF", -"^ c #7CACDF", -"/ c #B8D2EE", -"( c #86AFDF", -"_ c #3CA2EB", -": c #004D85", -"< c #A3A3CF", -"[ c #9188AD", -"} c #034A82", -"| c #0884DF", -"1 c #428FD6", -"2 c #5995D6", -"3 c #DAE7F6", -"4 c #DBE7F6", -"5 c #3E8ED5", -"6 c #0683DD", -"7 c #005FA0", -"8 c #8B8BAC", -"9 c #ACA3B8", -"0 c #01386D", -"a c #0078DA", -"b c #0072CE", -"c c #1377CD", -"d c #CAE0F4", -"e c #1177CD", -"f c #0071D9", -"g c #0F7B8C", -"h c #378B1E", -"i c #399D25", -"j c #34A721", -"k c #0D7A05", -"l c #4C4C5F", -"m c #ABA4C5", -"n c #0A3C47", -"o c #006DC9", -"p c #0067C9", -"q c #0067C8", -"r c #CAE1F4", -"s c #0068C8", -"t c #0063C8", -"u c #3C9E7A", -"v c #80E35A", -"w c #5DCF47", -"x c #80DB6D", -"y c #2B9022", -"z c #8989B1", -"A c #9D98BD", -"B c #254925", -"C c #358FAE", -"D c #0056C6", -"E c #005BC3", -"F c #8EB8E3", -"G c #005BC2", -"H c #0059CC", -"I c #2775BB", -"J c #8BA78C", -"K c #739B66", -"L c #14A100", -"M c #54C841", -"N c #2E8F29", -"O c #9D9DCD", -"P c #9792B8", -"Q c #254B25", -"R c #A2ED8B", -"S c #3589A8", -"T c #0057BA", -"U c #0058C3", -"V c #0059C8", -"W c #005AC2", -"X c #096F88", -"Y c #4DA653", -"Z c #75906A", -"` c #415E3E", -" . c #089000", -".. c #4CC33F", -"+. c #2B8D29", -"@. c #9A9AC8", -"#. c #9691B8", -"$. c #204624", -"%. c #BAED84", -"&. c #B4EF90", -"*. c #55B464", -"=. c #4B9092", -"-. c #489093", -";. c #59A87D", -">. c #67C14F", -",. c #7ACF60", -"'. c #96C38D", -"). c #7EAB78", -"!. c #70C06C", -"~. c #7ED279", -"{. c #218821", -"]. c #9491B8", -"^. c #254022", -"/. c #D7A95B", -"(. c #8CE254", -"_. c #A0E879", -":. c #86847C", -"<. c #699351", -"[. c #6FD35D", -"}. c #65C173", -"|. c #79CC6C", -"1. c #919091", -"2. c #555455", -"3. c #70B06E", -"4. c #88D688", -"5. c #1F861F", -"6. c #938FB6", -"7. c #214325", -"8. c #BAD581", -"9. c #86E262", -"0. c #7BDA61", -"a. c #92B98F", -"b. c #3BAB1A", -"c. c #48AB88", -"d. c #548DF3", -"e. c #4BC042", -"f. c #46AA3E", -"g. c #31942F", -"h. c #2AA72A", -"i. c #62CC62", -"j. c #289028", -"k. c #908BB4", -"l. c #234729", -"m. c #D6F289", -"n. c #DAEA82", -"o. c #C2E56D", -"p. c #E2EA86", -"q. c #B0E85D", -"r. c #8BB66D", -"s. c #447F68", -"t. c #4C8F4B", -"u. c #4A9148", -"v. c #4B924B", -"w. c #4D8E4D", -"x. c #498E49", -"y. c #0D650D", -"z. c #A0A0CE", -"A. c #9490BA", -"B. c #234A27", -"C. c #E6E569", -"D. c #F0E26C", -"E. c #F1E978", -"F. c #EFD85C", -"G. c #F5FA8B", -"H. c #8EA842", -"I. c #000100", -"J. c #686699", -"K. c #0C1E12", -"L. c #1E4018", -"M. c #1D3D18", -"N. c #1E3E18", -"O. c #1D3D17", -"P. c #1E3F1A", -"Q. c #183815", -" . + @ # ", -" $ % & * = - ; ", -" > , ' ) ) ' ! ~ ", -" { ] ^ / / ^ ( _ : ", -"< [ } | 1 2 3 4 2 5 6 7 ", -"8 9 0 a b c d d e b f g h i j k ", -"l m n o p q r r q s t u v w x y ", -"z A B C D E F F G H I J K L M N ", -"O P Q R S T U V W X Y Z ` ...+.", -"@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.", -"@.].^./.(._.:.<.[.}.|.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.q.r.s.t.u.v.w.x.y.", -"z.A.B.C.D.E.F.G.H.I. ", -" J.K.L.M.N.O.P.Q. ", -" "}; diff --git a/ubuntu/maverick/tdebase/debian/icons/kinfocenter.xpm b/ubuntu/maverick/tdebase/debian/icons/kinfocenter.xpm deleted file mode 100644 index 04fcb0013..000000000 --- a/ubuntu/maverick/tdebase/debian/icons/kinfocenter.xpm +++ /dev/null @@ -1,349 +0,0 @@ -/* XPM */ -static char * kinfocenter_xpm[] = { -"32 32 314 2", -" c None", -". c #98DBF8", -"+ c #ABE2F9", -"@ c #BBE7FA", -"# c #9CDCF8", -"$ c #85D4F6", -"% c #3DBBF1", -"& c #B8E0F6", -"* c #E8F1F9", -"= c #97D3F2", -"- c #1BA6E6", -"; c #C6DFF3", -"> c #D4E4F4", -", c #ABD6F2", -"' c #1399DB", -") c #9BCAED", -"! c #C0D7F0", -"~ c #D5E4F5", -"{ c #FFFFFF", -"] c #77BFEB", -"^ c #0089CF", -"/ c #229DE3", -"( c #ADCBEB", -"_ c #D6E5F5", -": c #0093E1", -"< c #008DDE", -"[ c #269AE0", -"} c #98BEE6", -"| c #AAC9EA", -"1 c #F8FBFD", -"2 c #007DC6", -"3 c #0088DB", -"4 c #1990DC", -"5 c #84B1E1", -"6 c #A4C6E9", -"7 c #0083D8", -"8 c #559CDB", -"9 c #70A4DC", -"0 c #AFCCEB", -"a c #4698DA", -"b c #8A8ABF", -"c c #8181BB", -"d c #007ED5", -"e c #0C81D5", -"f c #5796D7", -"g c #5C98D7", -"h c #AECBEB", -"i c #4C93D6", -"j c #0680D5", -"k c #005A9E", -"l c #8888BE", -"m c #E4E4E4", -"n c #7F7FBA", -"o c #0079D2", -"p c #057AD2", -"q c #3085D2", -"r c #498CD2", -"s c #A4C5E9", -"t c #2B84D2", -"u c #006183", -"v c #8383BC", -"w c #7D7DB9", -"x c #0074CF", -"y c #0876CE", -"z c #1A7ACE", -"A c #8EBDE7", -"B c #1679CE", -"C c #0475CE", -"D c #107A39", -"E c #178A02", -"F c #178E00", -"G c #158D00", -"H c #138B00", -"I c #118900", -"J c #0F8800", -"K c #0E8600", -"L c #005D00", -"M c #7B7BB7", -"N c #006EBF", -"O c #006FCB", -"P c #80B7E5", -"Q c #46A948", -"R c #78D05E", -"S c #7AD660", -"T c #78D460", -"U c #76D260", -"V c #73D060", -"W c #31B718", -"X c #7979B6", -"Y c #0E797D", -"Z c #006AC8", -"` c #80B4E4", -" . c #0875A4", -".. c #6AB859", -"+. c #9EDD8D", -"@. c #77D360", -"#. c #75D160", -"$. c #73CF60", -"%. c #B1E4A7", -"&. c #43BC30", -"*. c #7777B5", -"=. c #318030", -"-. c #0065C5", -";. c #80B2E2", -">. c #1A9042", -",. c #6EBD5C", -"'. c #23B600", -"). c #1FB300", -"!. c #1CB000", -"~. c #9ADB8F", -"{. c #40B930", -"]. c #7575B4", -"^. c #6CAEC0", -"/. c #005FC2", -"(. c #5091D5", -"_. c #297AAC", -":. c #8DAD8B", -"<. c #A2B69F", -"[. c #9DB497", -"}. c #7BA073", -"|. c #31AA1B", -"1. c #18AD00", -"2. c #98DA8F", -"3. c #3DB630", -"4. c #7373B3", -"5. c #B9F78F", -"6. c #369099", -"7. c #005DC0", -"8. c #307BCC", -"9. c #2072BC", -"0. c #94BB9D", -"a. c #95959B", -"b. c #848484", -"c. c #6A6A6A", -"d. c #505050", -"e. c #219110", -"f. c #14A900", -"g. c #97D88F", -"h. c #3AB430", -"i. c #7070B2", -"j. c #B7F58F", -"k. c #B4F28E", -"l. c #4695A4", -"m. c #0C7386", -"n. c #3BA431", -"o. c #61AE54", -"p. c #979798", -"q. c #727272", -"r. c #585858", -"s. c #3E3E3E", -"t. c #1A8A0B", -"u. c #11A600", -"v. c #95D78F", -"w. c #37B130", -"x. c #6E6EB0", -"y. c #B6F48F", -"z. c #B5F38F", -"A. c #B1EF8E", -"B. c #74BC7F", -"C. c #17807B", -"D. c #0D7386", -"E. c #1C9135", -"F. c #24A007", -"G. c #22A306", -"H. c #2DB30E", -"I. c #3BAA24", -"J. c #2E9D1A", -"K. c #259413", -"L. c #1B8B0D", -"M. c #129E02", -"N. c #0DA300", -"O. c #94D58F", -"P. c #34AE30", -"Q. c #6C6CAF", -"R. c #B4F28F", -"S. c #B3F28F", -"T. c #B2F08F", -"U. c #9FEB77", -"V. c #64CE33", -"W. c #3AB607", -"X. c #84B2B0", -"Y. c #269A35", -"Z. c #6BAB91", -"`. c #83B1B0", -" + c #A3C5AB", -".+ c #ACCBAA", -"++ c #AECDAB", -"@+ c #BADCB5", -"#+ c #C6EABE", -"$+ c #CBEBC4", -"%+ c #D2E4CE", -"&+ c #CBDEC8", -"*+ c #C5D8C2", -"=+ c #BFD1BC", -"-+ c #C0E1BE", -";+ c #93D58F", -">+ c #92D48F", -",+ c #31AC30", -"'+ c #6A6AAE", -")+ c #DCB46B", -"!+ c #DBB46B", -"~+ c #B0EF8F", -"{+ c #D1F5BF", -"]+ c #D0F4BF", -"^+ c #69D539", -"/+ c #BFBFC1", -"(+ c #99999C", -"_+ c #7F7F83", -":+ c #2DB404", -"<+ c #2AB104", -"[+ c #28B502", -"}+ c #26B900", -"|+ c #4DBC38", -"1+ c #B0B0B0", -"2+ c #8A8A8A", -"3+ c #707070", -"4+ c #565656", -"5+ c #479B41", -"6+ c #92D38F", -"7+ c #91D38F", -"8+ c #30AB30", -"9+ c #6868AD", -"0+ c #E9A060", -"a+ c #E89F60", -"b+ c #69DE30", -"c+ c #43D300", -"d+ c #CFF3BF", -"e+ c #63D036", -"f+ c #A3A3A3", -"g+ c #747474", -"h+ c #4F4F4F", -"i+ c #A3E38F", -"j+ c #A2E28F", -"k+ c #A0E18F", -"l+ c #9FDF8F", -"m+ c #9DDE8F", -"n+ c #9CDC8F", -"o+ c #A9DAA1", -"p+ c #A0A0A0", -"q+ c #797979", -"r+ c #5F5F5F", -"s+ c #444444", -"t+ c #86B084", -"u+ c #90D28F", -"v+ c #8FD28F", -"w+ c #6666AC", -"x+ c #66DB30", -"y+ c #3FD000", -"z+ c #CEF2BF", -"A+ c #5DCA33", -"B+ c #8E8E8E", -"C+ c #5B5B5B", -"D+ c #353535", -"E+ c #52C930", -"F+ c #4EC630", -"G+ c #4287CB", -"H+ c #3F72FF", -"I+ c #4185CB", -"J+ c #58BC4B", -"K+ c #72976E", -"L+ c #52774F", -"M+ c #3D633B", -"N+ c #294E27", -"O+ c #2C912B", -"P+ c #24A624", -"Q+ c #6464AB", -"R+ c #AEED8F", -"S+ c #ADEC8F", -"T+ c #60D630", -"U+ c #CDF1BF", -"V+ c #35C600", -"W+ c #CBF0BF", -"X+ c #CAEFBF", -"Y+ c #22B600", -"Z+ c #3782BF", -"`+ c #3580BF", -" @ c #0AA000", -".@ c #069C00", -"+@ c #029900", -"@@ c #009700", -"#@ c #6262A9", -"$@ c #C7F2B3", -"%@ c #90E46B", -"&@ c #5DD330", -"*@ c #CCF1BF", -"=@ c #31C300", -"-@ c #CAEEBF", -";@ c #89BACB", -">@ c #82AEDF", -",@ c #87B8CB", -"'@ c #B3E0B3", -")@ c #5F5FA8", -"!@ c #F3F497", -"~@ c #EAE071", -"{@ c #F3DA70", -"]@ c #D6F47F", -"^@ c #F2DA70", -"/@ c #CBEF74", -"(@ c #F2D970", -"_@ c #D2E873", -":@ c #C7EC74", -"<@ c #F1D870", -"[@ c #307F30", -"}@ c #0C700C", -"|@ c #006C00", -"1@ c #5D5DA7", -"2@ c #FFF489", -"3@ c #FFDD67", -"4@ c #FFD256", -"5@ c #FFFF9A", -"6@ c #5B5BA6", -"7@ c #5959A5", -"8@ c #5A5AA5", -"9@ c #5757A4", -" ", -" . + @ @ # $ % ", -" & * * * * * * * * = - ", -" ; > > > > > > > > > > , ' ", -" ) ! ! ! ! ~ { { ~ ! ! ! ! ] ^ ", -" / ( ( ( ( ( _ { { _ ( ( ( ( ( : ", -" < [ } } } } } | 1 1 | } } } } } [ 2 ", -" 3 4 5 5 5 5 5 5 6 6 5 5 5 5 5 5 3 3 ", -" 7 7 8 9 9 9 9 0 { { 0 9 9 9 9 a 7 7 ", -"b b b c d d e f g g g h { { h g g g i j d d k ", -"l m m n o o o p q r r s { { s r r t p o o o u ", -"b v m w x x x x x y z A { { A B C x x x x x D E F G H I J K L ", -" b m M N O O O O O O P { { P O O O O O O O Q R S T U U V W L ", -" b m X Y Z Z Z Z Z Z ` { { ` Z Z Z Z Z Z ...+.@.#.$.$.%.&.L ", -" b m *. =.-.-.-.-.-.-.;.{ { ;.-.-.-.-.-.-.>.,.@.'.).!.!.~.{.L ", -" b m ]. =.^./././././.(.{ { (./././././._.:.<.[.}.|.1.1.2.3.L ", -" b m 4. =.5.6.7.7.7.7.7.8.8.7.7.7.7.7.9.0.a.b.c.d.e.f.f.g.h.L ", -" b m i. =.j.k.l.7.7.7.7.7.7.7.7.7.7.m.n.o.p.q.r.s.t.u.u.v.w.L ", -" b m x. =.y.z.A.B.C.7.7.7.7.7.7.D.E.F.G.H.I.J.K.L.M.N.N.O.P.L ", -" b m Q. =.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+;+>+,+L ", -" b m '+ =.)+!+~+{+]+^+/+(+_+:+<+[+}+'.).|+1+2+3+4+5+6+6+7+8+L ", -" b m 9+ =.0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+u+v+8+L ", -" b m w+ =.a+a+x+y+z+A+B+C+D+E+F+G+H+I+&.J+K+L+M+N+O+P+P+v+8+L ", -" b m Q+ =.R+S+d+T+U+V+W+X+E+}+Y+Z+H+`+f.u.N. @.@+@@@@@@@v+8+L ", -" b m #@ =.$@%@z+&@*@=@X+-@F+Y+m+;@>@,@g.v.O.>+7+v+v+v+v+'@8+L ", -" b m )@ =.!@~@{@]@^@/@(@(@_@:@<@=.=.=.=.=.[@[@[@[@[@[@[@}@|@L ", -" b m 1@ =.2@3@4@5@4@5@4@4@2@5@4@=. ", -" b m 6@ =.2@3@4@5@4@5@4@4@2@5@4@=. ", -" b m 7@ =.=.=.=.=.=.=.=.=.=.=.=.=. ", -" b 8@9@ ", -" ", -" "}; diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install index 65a650cbc..46eb3b814 100644 --- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install +++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install @@ -4,7 +4,6 @@ debian/tmp/opt/trinity/bin/kdeinstallktheme debian/tmp/opt/trinity/bin/keditfiletype debian/tmp/opt/trinity/bin/tdefontinst debian/tmp/opt/trinity/bin/tdefontview -debian/tmp/opt/trinity/bin/kinfocenter debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper debian/tmp/opt/trinity/bin/tderandrtray debian/tmp/opt/trinity/bin/krdb @@ -242,5 +241,3 @@ debian/tmp/opt/trinity/share/services/localdomainurifilter.desktop debian/icons/kcontrol.xpm /opt/trinity/share/pixmaps debian/icons/kcontrol-16.xpm /opt/trinity/share/pixmaps -debian/icons/kinfocenter.xpm /opt/trinity/share/pixmaps -debian/icons/kinfocenter-16.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.menu b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.menu index f2bedef2b..3576cdae0 100644 --- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.menu +++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.menu @@ -7,17 +7,5 @@ icon16x16="/opt/trinity/share/pixmaps/kcontrol-16.xpm"\ command="/opt/trinity/bin/kcontrol" -?package(kcontrol):\ - needs="X11"\ - section="Applications/System/Administration"\ - hints="TDE"\ - title="KInfoCenter"\ - icon32x32="/opt/trinity/share/pixmaps/kinfocenter.xpm"\ - icon16x16="/opt/trinity/share/pixmaps/kinfocenter-16.xpm"\ - command="/opt/trinity/bin/kinfocenter" - # Icon 32x32 kcontrol/kcontrol/cr32-app-kcontrol.png kcontrol.xpm # Icon 16x16 kcontrol/kcontrol/cr16-app-kcontrol.png kcontrol-16.xpm - -# Icon 32x32 kcontrol/pics/cr32-app-hwinfo.png kinfocenter.xpm -# Icon 16x16 kcontrol/pics/cr16-app-hwinfo.png kinfocenter-16.xpm diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules index d33ef8289..44308e2c2 100755 --- a/ubuntu/maverick/tdebase/debian/rules +++ b/ubuntu/maverick/tdebase/debian/rules @@ -27,7 +27,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \ - -DAUTODETECT_QT_DIRS="ON" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH="OFF" \ @@ -79,7 +78,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop +DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ ksysguard-trinity twin-trinity libkonq4-trinity diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install index e790d4894..9ae37a312 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install @@ -107,7 +107,6 @@ debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WindowsXP.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/YellowOnBlue.kcsrc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewpart.rc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewui.rc -debian/tmp/opt/trinity/share/apps/kinfocenter/kinfocenterui.rc debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png @@ -273,63 +272,63 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/access.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/acroread.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/applixware.png diff --git a/ubuntu/maverick/tdegraphics/debian/kgamma-trinity.install b/ubuntu/maverick/tdegraphics/debian/kgamma-trinity.install index ff83d71ab..3e8fa0bb8 100644 --- a/ubuntu/maverick/tdegraphics/debian/kgamma-trinity.install +++ b/ubuntu/maverick/tdegraphics/debian/kgamma-trinity.install @@ -1,7 +1,7 @@ debian/tmp/opt/trinity/bin/xf86gammacfg debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.la debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.so -debian/tmp/opt/trinity/share/applications/tde/kgamma.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/kgamma.desktop debian/tmp/opt/trinity/share/apps/kgamma/pics/background.png debian/tmp/opt/trinity/share/apps/kgamma/pics/cmyscale.png debian/tmp/opt/trinity/share/apps/kgamma/pics/darkgrey.png diff --git a/ubuntu/maverick/tdeutils/debian/kdf-trinity.install b/ubuntu/maverick/tdeutils/debian/kdf-trinity.install index 44a0e0bf3..a89e9bf6e 100644 --- a/ubuntu/maverick/tdeutils/debian/kdf-trinity.install +++ b/ubuntu/maverick/tdeutils/debian/kdf-trinity.install @@ -13,9 +13,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf_config.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.docbook debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdf.png diff --git a/ubuntu/maverick/tdeutils/debian/rules b/ubuntu/maverick/tdeutils/debian/rules index 772269551..eb3386805 100755 --- a/ubuntu/maverick/tdeutils/debian/rules +++ b/ubuntu/maverick/tdeutils/debian/rules @@ -36,7 +36,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_XMMS="ON" \ -DWITH_KNEWSTUFF="ON" -DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselect-trinity ksim-trinity +DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg diff --git a/ubuntu/precise/kdegraphics.automake/debian/kgamma-trinity.install b/ubuntu/precise/kdegraphics.automake/debian/kgamma-trinity.install index ff83d71ab..3e8fa0bb8 100644 --- a/ubuntu/precise/kdegraphics.automake/debian/kgamma-trinity.install +++ b/ubuntu/precise/kdegraphics.automake/debian/kgamma-trinity.install @@ -1,7 +1,7 @@ debian/tmp/opt/trinity/bin/xf86gammacfg debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.la debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.so -debian/tmp/opt/trinity/share/applications/tde/kgamma.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/kgamma.desktop debian/tmp/opt/trinity/share/apps/kgamma/pics/background.png debian/tmp/opt/trinity/share/apps/kgamma/pics/cmyscale.png debian/tmp/opt/trinity/share/apps/kgamma/pics/darkgrey.png diff --git a/ubuntu/precise/tdebase/debian/cdbs/debian-qt-kde.mk b/ubuntu/precise/tdebase/debian/cdbs/debian-qt-kde.mk index ec89756bb..4fd113539 100644 --- a/ubuntu/precise/tdebase/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/precise/tdebase/debian/cdbs/debian-qt-kde.mk @@ -13,7 +13,7 @@ debian/stamp-cvs-make: touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches diff --git a/ubuntu/precise/tdebase/debian/icons/kinfocenter-16.xpm b/ubuntu/precise/tdebase/debian/icons/kinfocenter-16.xpm deleted file mode 100644 index 615bbf46b..000000000 --- a/ubuntu/precise/tdebase/debian/icons/kinfocenter-16.xpm +++ /dev/null @@ -1,193 +0,0 @@ -/* XPM */ -static char * kinfocenter_16_xpm[] = { -"16 16 174 2", -" c None", -". c #A6DBF4", -"+ c #CFEBF9", -"@ c #C9EAF9", -"# c #A1DCF7", -"$ c #CEE0F3", -"% c #D9E4F4", -"& c #E6EEF8", -"* c #E7EEF8", -"= c #DCE5F5", -"- c #BCE3FF", -"; c #256589", -"> c #64B0E5", -", c #B2CBEA", -"' c #A3C5E9", -") c #DEEAF7", -"! c #B4CDED", -"~ c #5CB5F0", -"{ c #419CDF", -"] c #86B0DF", -"^ c #7CACDF", -"/ c #B8D2EE", -"( c #86AFDF", -"_ c #3CA2EB", -": c #004D85", -"< c #A3A3CF", -"[ c #9188AD", -"} c #034A82", -"| c #0884DF", -"1 c #428FD6", -"2 c #5995D6", -"3 c #DAE7F6", -"4 c #DBE7F6", -"5 c #3E8ED5", -"6 c #0683DD", -"7 c #005FA0", -"8 c #8B8BAC", -"9 c #ACA3B8", -"0 c #01386D", -"a c #0078DA", -"b c #0072CE", -"c c #1377CD", -"d c #CAE0F4", -"e c #1177CD", -"f c #0071D9", -"g c #0F7B8C", -"h c #378B1E", -"i c #399D25", -"j c #34A721", -"k c #0D7A05", -"l c #4C4C5F", -"m c #ABA4C5", -"n c #0A3C47", -"o c #006DC9", -"p c #0067C9", -"q c #0067C8", -"r c #CAE1F4", -"s c #0068C8", -"t c #0063C8", -"u c #3C9E7A", -"v c #80E35A", -"w c #5DCF47", -"x c #80DB6D", -"y c #2B9022", -"z c #8989B1", -"A c #9D98BD", -"B c #254925", -"C c #358FAE", -"D c #0056C6", -"E c #005BC3", -"F c #8EB8E3", -"G c #005BC2", -"H c #0059CC", -"I c #2775BB", -"J c #8BA78C", -"K c #739B66", -"L c #14A100", -"M c #54C841", -"N c #2E8F29", -"O c #9D9DCD", -"P c #9792B8", -"Q c #254B25", -"R c #A2ED8B", -"S c #3589A8", -"T c #0057BA", -"U c #0058C3", -"V c #0059C8", -"W c #005AC2", -"X c #096F88", -"Y c #4DA653", -"Z c #75906A", -"` c #415E3E", -" . c #089000", -".. c #4CC33F", -"+. c #2B8D29", -"@. c #9A9AC8", -"#. c #9691B8", -"$. c #204624", -"%. c #BAED84", -"&. c #B4EF90", -"*. c #55B464", -"=. c #4B9092", -"-. c #489093", -";. c #59A87D", -">. c #67C14F", -",. c #7ACF60", -"'. c #96C38D", -"). c #7EAB78", -"!. c #70C06C", -"~. c #7ED279", -"{. c #218821", -"]. c #9491B8", -"^. c #254022", -"/. c #D7A95B", -"(. c #8CE254", -"_. c #A0E879", -":. c #86847C", -"<. c #699351", -"[. c #6FD35D", -"}. c #65C173", -"|. c #79CC6C", -"1. c #919091", -"2. c #555455", -"3. c #70B06E", -"4. c #88D688", -"5. c #1F861F", -"6. c #938FB6", -"7. c #214325", -"8. c #BAD581", -"9. c #86E262", -"0. c #7BDA61", -"a. c #92B98F", -"b. c #3BAB1A", -"c. c #48AB88", -"d. c #548DF3", -"e. c #4BC042", -"f. c #46AA3E", -"g. c #31942F", -"h. c #2AA72A", -"i. c #62CC62", -"j. c #289028", -"k. c #908BB4", -"l. c #234729", -"m. c #D6F289", -"n. c #DAEA82", -"o. c #C2E56D", -"p. c #E2EA86", -"q. c #B0E85D", -"r. c #8BB66D", -"s. c #447F68", -"t. c #4C8F4B", -"u. c #4A9148", -"v. c #4B924B", -"w. c #4D8E4D", -"x. c #498E49", -"y. c #0D650D", -"z. c #A0A0CE", -"A. c #9490BA", -"B. c #234A27", -"C. c #E6E569", -"D. c #F0E26C", -"E. c #F1E978", -"F. c #EFD85C", -"G. c #F5FA8B", -"H. c #8EA842", -"I. c #000100", -"J. c #686699", -"K. c #0C1E12", -"L. c #1E4018", -"M. c #1D3D18", -"N. c #1E3E18", -"O. c #1D3D17", -"P. c #1E3F1A", -"Q. c #183815", -" . + @ # ", -" $ % & * = - ; ", -" > , ' ) ) ' ! ~ ", -" { ] ^ / / ^ ( _ : ", -"< [ } | 1 2 3 4 2 5 6 7 ", -"8 9 0 a b c d d e b f g h i j k ", -"l m n o p q r r q s t u v w x y ", -"z A B C D E F F G H I J K L M N ", -"O P Q R S T U V W X Y Z ` ...+.", -"@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.", -"@.].^./.(._.:.<.[.}.|.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.q.r.s.t.u.v.w.x.y.", -"z.A.B.C.D.E.F.G.H.I. ", -" J.K.L.M.N.O.P.Q. ", -" "}; diff --git a/ubuntu/precise/tdebase/debian/icons/kinfocenter.xpm b/ubuntu/precise/tdebase/debian/icons/kinfocenter.xpm deleted file mode 100644 index 04fcb0013..000000000 --- a/ubuntu/precise/tdebase/debian/icons/kinfocenter.xpm +++ /dev/null @@ -1,349 +0,0 @@ -/* XPM */ -static char * kinfocenter_xpm[] = { -"32 32 314 2", -" c None", -". c #98DBF8", -"+ c #ABE2F9", -"@ c #BBE7FA", -"# c #9CDCF8", -"$ c #85D4F6", -"% c #3DBBF1", -"& c #B8E0F6", -"* c #E8F1F9", -"= c #97D3F2", -"- c #1BA6E6", -"; c #C6DFF3", -"> c #D4E4F4", -", c #ABD6F2", -"' c #1399DB", -") c #9BCAED", -"! c #C0D7F0", -"~ c #D5E4F5", -"{ c #FFFFFF", -"] c #77BFEB", -"^ c #0089CF", -"/ c #229DE3", -"( c #ADCBEB", -"_ c #D6E5F5", -": c #0093E1", -"< c #008DDE", -"[ c #269AE0", -"} c #98BEE6", -"| c #AAC9EA", -"1 c #F8FBFD", -"2 c #007DC6", -"3 c #0088DB", -"4 c #1990DC", -"5 c #84B1E1", -"6 c #A4C6E9", -"7 c #0083D8", -"8 c #559CDB", -"9 c #70A4DC", -"0 c #AFCCEB", -"a c #4698DA", -"b c #8A8ABF", -"c c #8181BB", -"d c #007ED5", -"e c #0C81D5", -"f c #5796D7", -"g c #5C98D7", -"h c #AECBEB", -"i c #4C93D6", -"j c #0680D5", -"k c #005A9E", -"l c #8888BE", -"m c #E4E4E4", -"n c #7F7FBA", -"o c #0079D2", -"p c #057AD2", -"q c #3085D2", -"r c #498CD2", -"s c #A4C5E9", -"t c #2B84D2", -"u c #006183", -"v c #8383BC", -"w c #7D7DB9", -"x c #0074CF", -"y c #0876CE", -"z c #1A7ACE", -"A c #8EBDE7", -"B c #1679CE", -"C c #0475CE", -"D c #107A39", -"E c #178A02", -"F c #178E00", -"G c #158D00", -"H c #138B00", -"I c #118900", -"J c #0F8800", -"K c #0E8600", -"L c #005D00", -"M c #7B7BB7", -"N c #006EBF", -"O c #006FCB", -"P c #80B7E5", -"Q c #46A948", -"R c #78D05E", -"S c #7AD660", -"T c #78D460", -"U c #76D260", -"V c #73D060", -"W c #31B718", -"X c #7979B6", -"Y c #0E797D", -"Z c #006AC8", -"` c #80B4E4", -" . c #0875A4", -".. c #6AB859", -"+. c #9EDD8D", -"@. c #77D360", -"#. c #75D160", -"$. c #73CF60", -"%. c #B1E4A7", -"&. c #43BC30", -"*. c #7777B5", -"=. c #318030", -"-. c #0065C5", -";. c #80B2E2", -">. c #1A9042", -",. c #6EBD5C", -"'. c #23B600", -"). c #1FB300", -"!. c #1CB000", -"~. c #9ADB8F", -"{. c #40B930", -"]. c #7575B4", -"^. c #6CAEC0", -"/. c #005FC2", -"(. c #5091D5", -"_. c #297AAC", -":. c #8DAD8B", -"<. c #A2B69F", -"[. c #9DB497", -"}. c #7BA073", -"|. c #31AA1B", -"1. c #18AD00", -"2. c #98DA8F", -"3. c #3DB630", -"4. c #7373B3", -"5. c #B9F78F", -"6. c #369099", -"7. c #005DC0", -"8. c #307BCC", -"9. c #2072BC", -"0. c #94BB9D", -"a. c #95959B", -"b. c #848484", -"c. c #6A6A6A", -"d. c #505050", -"e. c #219110", -"f. c #14A900", -"g. c #97D88F", -"h. c #3AB430", -"i. c #7070B2", -"j. c #B7F58F", -"k. c #B4F28E", -"l. c #4695A4", -"m. c #0C7386", -"n. c #3BA431", -"o. c #61AE54", -"p. c #979798", -"q. c #727272", -"r. c #585858", -"s. c #3E3E3E", -"t. c #1A8A0B", -"u. c #11A600", -"v. c #95D78F", -"w. c #37B130", -"x. c #6E6EB0", -"y. c #B6F48F", -"z. c #B5F38F", -"A. c #B1EF8E", -"B. c #74BC7F", -"C. c #17807B", -"D. c #0D7386", -"E. c #1C9135", -"F. c #24A007", -"G. c #22A306", -"H. c #2DB30E", -"I. c #3BAA24", -"J. c #2E9D1A", -"K. c #259413", -"L. c #1B8B0D", -"M. c #129E02", -"N. c #0DA300", -"O. c #94D58F", -"P. c #34AE30", -"Q. c #6C6CAF", -"R. c #B4F28F", -"S. c #B3F28F", -"T. c #B2F08F", -"U. c #9FEB77", -"V. c #64CE33", -"W. c #3AB607", -"X. c #84B2B0", -"Y. c #269A35", -"Z. c #6BAB91", -"`. c #83B1B0", -" + c #A3C5AB", -".+ c #ACCBAA", -"++ c #AECDAB", -"@+ c #BADCB5", -"#+ c #C6EABE", -"$+ c #CBEBC4", -"%+ c #D2E4CE", -"&+ c #CBDEC8", -"*+ c #C5D8C2", -"=+ c #BFD1BC", -"-+ c #C0E1BE", -";+ c #93D58F", -">+ c #92D48F", -",+ c #31AC30", -"'+ c #6A6AAE", -")+ c #DCB46B", -"!+ c #DBB46B", -"~+ c #B0EF8F", -"{+ c #D1F5BF", -"]+ c #D0F4BF", -"^+ c #69D539", -"/+ c #BFBFC1", -"(+ c #99999C", -"_+ c #7F7F83", -":+ c #2DB404", -"<+ c #2AB104", -"[+ c #28B502", -"}+ c #26B900", -"|+ c #4DBC38", -"1+ c #B0B0B0", -"2+ c #8A8A8A", -"3+ c #707070", -"4+ c #565656", -"5+ c #479B41", -"6+ c #92D38F", -"7+ c #91D38F", -"8+ c #30AB30", -"9+ c #6868AD", -"0+ c #E9A060", -"a+ c #E89F60", -"b+ c #69DE30", -"c+ c #43D300", -"d+ c #CFF3BF", -"e+ c #63D036", -"f+ c #A3A3A3", -"g+ c #747474", -"h+ c #4F4F4F", -"i+ c #A3E38F", -"j+ c #A2E28F", -"k+ c #A0E18F", -"l+ c #9FDF8F", -"m+ c #9DDE8F", -"n+ c #9CDC8F", -"o+ c #A9DAA1", -"p+ c #A0A0A0", -"q+ c #797979", -"r+ c #5F5F5F", -"s+ c #444444", -"t+ c #86B084", -"u+ c #90D28F", -"v+ c #8FD28F", -"w+ c #6666AC", -"x+ c #66DB30", -"y+ c #3FD000", -"z+ c #CEF2BF", -"A+ c #5DCA33", -"B+ c #8E8E8E", -"C+ c #5B5B5B", -"D+ c #353535", -"E+ c #52C930", -"F+ c #4EC630", -"G+ c #4287CB", -"H+ c #3F72FF", -"I+ c #4185CB", -"J+ c #58BC4B", -"K+ c #72976E", -"L+ c #52774F", -"M+ c #3D633B", -"N+ c #294E27", -"O+ c #2C912B", -"P+ c #24A624", -"Q+ c #6464AB", -"R+ c #AEED8F", -"S+ c #ADEC8F", -"T+ c #60D630", -"U+ c #CDF1BF", -"V+ c #35C600", -"W+ c #CBF0BF", -"X+ c #CAEFBF", -"Y+ c #22B600", -"Z+ c #3782BF", -"`+ c #3580BF", -" @ c #0AA000", -".@ c #069C00", -"+@ c #029900", -"@@ c #009700", -"#@ c #6262A9", -"$@ c #C7F2B3", -"%@ c #90E46B", -"&@ c #5DD330", -"*@ c #CCF1BF", -"=@ c #31C300", -"-@ c #CAEEBF", -";@ c #89BACB", -">@ c #82AEDF", -",@ c #87B8CB", -"'@ c #B3E0B3", -")@ c #5F5FA8", -"!@ c #F3F497", -"~@ c #EAE071", -"{@ c #F3DA70", -"]@ c #D6F47F", -"^@ c #F2DA70", -"/@ c #CBEF74", -"(@ c #F2D970", -"_@ c #D2E873", -":@ c #C7EC74", -"<@ c #F1D870", -"[@ c #307F30", -"}@ c #0C700C", -"|@ c #006C00", -"1@ c #5D5DA7", -"2@ c #FFF489", -"3@ c #FFDD67", -"4@ c #FFD256", -"5@ c #FFFF9A", -"6@ c #5B5BA6", -"7@ c #5959A5", -"8@ c #5A5AA5", -"9@ c #5757A4", -" ", -" . + @ @ # $ % ", -" & * * * * * * * * = - ", -" ; > > > > > > > > > > , ' ", -" ) ! ! ! ! ~ { { ~ ! ! ! ! ] ^ ", -" / ( ( ( ( ( _ { { _ ( ( ( ( ( : ", -" < [ } } } } } | 1 1 | } } } } } [ 2 ", -" 3 4 5 5 5 5 5 5 6 6 5 5 5 5 5 5 3 3 ", -" 7 7 8 9 9 9 9 0 { { 0 9 9 9 9 a 7 7 ", -"b b b c d d e f g g g h { { h g g g i j d d k ", -"l m m n o o o p q r r s { { s r r t p o o o u ", -"b v m w x x x x x y z A { { A B C x x x x x D E F G H I J K L ", -" b m M N O O O O O O P { { P O O O O O O O Q R S T U U V W L ", -" b m X Y Z Z Z Z Z Z ` { { ` Z Z Z Z Z Z ...+.@.#.$.$.%.&.L ", -" b m *. =.-.-.-.-.-.-.;.{ { ;.-.-.-.-.-.-.>.,.@.'.).!.!.~.{.L ", -" b m ]. =.^./././././.(.{ { (./././././._.:.<.[.}.|.1.1.2.3.L ", -" b m 4. =.5.6.7.7.7.7.7.8.8.7.7.7.7.7.9.0.a.b.c.d.e.f.f.g.h.L ", -" b m i. =.j.k.l.7.7.7.7.7.7.7.7.7.7.m.n.o.p.q.r.s.t.u.u.v.w.L ", -" b m x. =.y.z.A.B.C.7.7.7.7.7.7.D.E.F.G.H.I.J.K.L.M.N.N.O.P.L ", -" b m Q. =.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+;+>+,+L ", -" b m '+ =.)+!+~+{+]+^+/+(+_+:+<+[+}+'.).|+1+2+3+4+5+6+6+7+8+L ", -" b m 9+ =.0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+u+v+8+L ", -" b m w+ =.a+a+x+y+z+A+B+C+D+E+F+G+H+I+&.J+K+L+M+N+O+P+P+v+8+L ", -" b m Q+ =.R+S+d+T+U+V+W+X+E+}+Y+Z+H+`+f.u.N. @.@+@@@@@@@v+8+L ", -" b m #@ =.$@%@z+&@*@=@X+-@F+Y+m+;@>@,@g.v.O.>+7+v+v+v+v+'@8+L ", -" b m )@ =.!@~@{@]@^@/@(@(@_@:@<@=.=.=.=.=.[@[@[@[@[@[@[@}@|@L ", -" b m 1@ =.2@3@4@5@4@5@4@4@2@5@4@=. ", -" b m 6@ =.2@3@4@5@4@5@4@4@2@5@4@=. ", -" b m 7@ =.=.=.=.=.=.=.=.=.=.=.=.=. ", -" b 8@9@ ", -" ", -" "}; diff --git a/ubuntu/precise/tdebase/debian/kcontrol-trinity.install b/ubuntu/precise/tdebase/debian/kcontrol-trinity.install index 65a650cbc..46eb3b814 100644 --- a/ubuntu/precise/tdebase/debian/kcontrol-trinity.install +++ b/ubuntu/precise/tdebase/debian/kcontrol-trinity.install @@ -4,7 +4,6 @@ debian/tmp/opt/trinity/bin/kdeinstallktheme debian/tmp/opt/trinity/bin/keditfiletype debian/tmp/opt/trinity/bin/tdefontinst debian/tmp/opt/trinity/bin/tdefontview -debian/tmp/opt/trinity/bin/kinfocenter debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper debian/tmp/opt/trinity/bin/tderandrtray debian/tmp/opt/trinity/bin/krdb @@ -242,5 +241,3 @@ debian/tmp/opt/trinity/share/services/localdomainurifilter.desktop debian/icons/kcontrol.xpm /opt/trinity/share/pixmaps debian/icons/kcontrol-16.xpm /opt/trinity/share/pixmaps -debian/icons/kinfocenter.xpm /opt/trinity/share/pixmaps -debian/icons/kinfocenter-16.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/precise/tdebase/debian/kcontrol-trinity.menu b/ubuntu/precise/tdebase/debian/kcontrol-trinity.menu index f2bedef2b..3576cdae0 100644 --- a/ubuntu/precise/tdebase/debian/kcontrol-trinity.menu +++ b/ubuntu/precise/tdebase/debian/kcontrol-trinity.menu @@ -7,17 +7,5 @@ icon16x16="/opt/trinity/share/pixmaps/kcontrol-16.xpm"\ command="/opt/trinity/bin/kcontrol" -?package(kcontrol):\ - needs="X11"\ - section="Applications/System/Administration"\ - hints="TDE"\ - title="KInfoCenter"\ - icon32x32="/opt/trinity/share/pixmaps/kinfocenter.xpm"\ - icon16x16="/opt/trinity/share/pixmaps/kinfocenter-16.xpm"\ - command="/opt/trinity/bin/kinfocenter" - # Icon 32x32 kcontrol/kcontrol/cr32-app-kcontrol.png kcontrol.xpm # Icon 16x16 kcontrol/kcontrol/cr16-app-kcontrol.png kcontrol-16.xpm - -# Icon 32x32 kcontrol/pics/cr32-app-hwinfo.png kinfocenter.xpm -# Icon 16x16 kcontrol/pics/cr16-app-hwinfo.png kinfocenter-16.xpm diff --git a/ubuntu/precise/tdebase/debian/rules b/ubuntu/precise/tdebase/debian/rules index d33ef8289..44308e2c2 100755 --- a/ubuntu/precise/tdebase/debian/rules +++ b/ubuntu/precise/tdebase/debian/rules @@ -27,7 +27,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \ - -DAUTODETECT_QT_DIRS="ON" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH="OFF" \ @@ -79,7 +78,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop +DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ ksysguard-trinity twin-trinity libkonq4-trinity diff --git a/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install b/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install index e790d4894..9ae37a312 100644 --- a/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/precise/tdebase/debian/tdebase-data-trinity.install @@ -107,7 +107,6 @@ debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WindowsXP.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/YellowOnBlue.kcsrc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewpart.rc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewui.rc -debian/tmp/opt/trinity/share/apps/kinfocenter/kinfocenterui.rc debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png @@ -273,63 +272,63 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/access.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/acroread.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/applixware.png diff --git a/ubuntu/precise/tdegraphics/debian/kgamma-trinity.install b/ubuntu/precise/tdegraphics/debian/kgamma-trinity.install index ff83d71ab..3e8fa0bb8 100644 --- a/ubuntu/precise/tdegraphics/debian/kgamma-trinity.install +++ b/ubuntu/precise/tdegraphics/debian/kgamma-trinity.install @@ -1,7 +1,7 @@ debian/tmp/opt/trinity/bin/xf86gammacfg debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.la debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.so -debian/tmp/opt/trinity/share/applications/tde/kgamma.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/kgamma.desktop debian/tmp/opt/trinity/share/apps/kgamma/pics/background.png debian/tmp/opt/trinity/share/apps/kgamma/pics/cmyscale.png debian/tmp/opt/trinity/share/apps/kgamma/pics/darkgrey.png diff --git a/ubuntu/precise/tdeutils/debian/kdf-trinity.install b/ubuntu/precise/tdeutils/debian/kdf-trinity.install index 44a0e0bf3..a89e9bf6e 100644 --- a/ubuntu/precise/tdeutils/debian/kdf-trinity.install +++ b/ubuntu/precise/tdeutils/debian/kdf-trinity.install @@ -13,9 +13,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf_config.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.docbook debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdf.png diff --git a/ubuntu/precise/tdeutils/debian/rules b/ubuntu/precise/tdeutils/debian/rules index 772269551..eb3386805 100755 --- a/ubuntu/precise/tdeutils/debian/rules +++ b/ubuntu/precise/tdeutils/debian/rules @@ -36,7 +36,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_XMMS="ON" \ -DWITH_KNEWSTUFF="ON" -DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselect-trinity ksim-trinity +DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg diff --git a/ubuntu/raring/kdegraphics.automake/debian/kgamma-trinity.install b/ubuntu/raring/kdegraphics.automake/debian/kgamma-trinity.install index ff83d71ab..3e8fa0bb8 100644 --- a/ubuntu/raring/kdegraphics.automake/debian/kgamma-trinity.install +++ b/ubuntu/raring/kdegraphics.automake/debian/kgamma-trinity.install @@ -1,7 +1,7 @@ debian/tmp/opt/trinity/bin/xf86gammacfg debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.la debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.so -debian/tmp/opt/trinity/share/applications/tde/kgamma.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/kgamma.desktop debian/tmp/opt/trinity/share/apps/kgamma/pics/background.png debian/tmp/opt/trinity/share/apps/kgamma/pics/cmyscale.png debian/tmp/opt/trinity/share/apps/kgamma/pics/darkgrey.png diff --git a/ubuntu/raring/tdebase/debian/cdbs/debian-qt-kde.mk b/ubuntu/raring/tdebase/debian/cdbs/debian-qt-kde.mk index ec89756bb..4fd113539 100644 --- a/ubuntu/raring/tdebase/debian/cdbs/debian-qt-kde.mk +++ b/ubuntu/raring/tdebase/debian/cdbs/debian-qt-kde.mk @@ -13,7 +13,7 @@ debian/stamp-cvs-make: touch debian/stamp-cvs-make include debian/cdbs/kde.mk$(_cdbs_makefile_suffix) -include debian/cdbs/uploaders.mk +#include debian/cdbs/uploaders.mk ifndef _cdbs_rules_patchsys_quilt DEB_PATCHDIRS := debian/patches/common debian/patches diff --git a/ubuntu/raring/tdebase/debian/icons/kinfocenter-16.xpm b/ubuntu/raring/tdebase/debian/icons/kinfocenter-16.xpm deleted file mode 100644 index 615bbf46b..000000000 --- a/ubuntu/raring/tdebase/debian/icons/kinfocenter-16.xpm +++ /dev/null @@ -1,193 +0,0 @@ -/* XPM */ -static char * kinfocenter_16_xpm[] = { -"16 16 174 2", -" c None", -". c #A6DBF4", -"+ c #CFEBF9", -"@ c #C9EAF9", -"# c #A1DCF7", -"$ c #CEE0F3", -"% c #D9E4F4", -"& c #E6EEF8", -"* c #E7EEF8", -"= c #DCE5F5", -"- c #BCE3FF", -"; c #256589", -"> c #64B0E5", -", c #B2CBEA", -"' c #A3C5E9", -") c #DEEAF7", -"! c #B4CDED", -"~ c #5CB5F0", -"{ c #419CDF", -"] c #86B0DF", -"^ c #7CACDF", -"/ c #B8D2EE", -"( c #86AFDF", -"_ c #3CA2EB", -": c #004D85", -"< c #A3A3CF", -"[ c #9188AD", -"} c #034A82", -"| c #0884DF", -"1 c #428FD6", -"2 c #5995D6", -"3 c #DAE7F6", -"4 c #DBE7F6", -"5 c #3E8ED5", -"6 c #0683DD", -"7 c #005FA0", -"8 c #8B8BAC", -"9 c #ACA3B8", -"0 c #01386D", -"a c #0078DA", -"b c #0072CE", -"c c #1377CD", -"d c #CAE0F4", -"e c #1177CD", -"f c #0071D9", -"g c #0F7B8C", -"h c #378B1E", -"i c #399D25", -"j c #34A721", -"k c #0D7A05", -"l c #4C4C5F", -"m c #ABA4C5", -"n c #0A3C47", -"o c #006DC9", -"p c #0067C9", -"q c #0067C8", -"r c #CAE1F4", -"s c #0068C8", -"t c #0063C8", -"u c #3C9E7A", -"v c #80E35A", -"w c #5DCF47", -"x c #80DB6D", -"y c #2B9022", -"z c #8989B1", -"A c #9D98BD", -"B c #254925", -"C c #358FAE", -"D c #0056C6", -"E c #005BC3", -"F c #8EB8E3", -"G c #005BC2", -"H c #0059CC", -"I c #2775BB", -"J c #8BA78C", -"K c #739B66", -"L c #14A100", -"M c #54C841", -"N c #2E8F29", -"O c #9D9DCD", -"P c #9792B8", -"Q c #254B25", -"R c #A2ED8B", -"S c #3589A8", -"T c #0057BA", -"U c #0058C3", -"V c #0059C8", -"W c #005AC2", -"X c #096F88", -"Y c #4DA653", -"Z c #75906A", -"` c #415E3E", -" . c #089000", -".. c #4CC33F", -"+. c #2B8D29", -"@. c #9A9AC8", -"#. c #9691B8", -"$. c #204624", -"%. c #BAED84", -"&. c #B4EF90", -"*. c #55B464", -"=. c #4B9092", -"-. c #489093", -";. c #59A87D", -">. c #67C14F", -",. c #7ACF60", -"'. c #96C38D", -"). c #7EAB78", -"!. c #70C06C", -"~. c #7ED279", -"{. c #218821", -"]. c #9491B8", -"^. c #254022", -"/. c #D7A95B", -"(. c #8CE254", -"_. c #A0E879", -":. c #86847C", -"<. c #699351", -"[. c #6FD35D", -"}. c #65C173", -"|. c #79CC6C", -"1. c #919091", -"2. c #555455", -"3. c #70B06E", -"4. c #88D688", -"5. c #1F861F", -"6. c #938FB6", -"7. c #214325", -"8. c #BAD581", -"9. c #86E262", -"0. c #7BDA61", -"a. c #92B98F", -"b. c #3BAB1A", -"c. c #48AB88", -"d. c #548DF3", -"e. c #4BC042", -"f. c #46AA3E", -"g. c #31942F", -"h. c #2AA72A", -"i. c #62CC62", -"j. c #289028", -"k. c #908BB4", -"l. c #234729", -"m. c #D6F289", -"n. c #DAEA82", -"o. c #C2E56D", -"p. c #E2EA86", -"q. c #B0E85D", -"r. c #8BB66D", -"s. c #447F68", -"t. c #4C8F4B", -"u. c #4A9148", -"v. c #4B924B", -"w. c #4D8E4D", -"x. c #498E49", -"y. c #0D650D", -"z. c #A0A0CE", -"A. c #9490BA", -"B. c #234A27", -"C. c #E6E569", -"D. c #F0E26C", -"E. c #F1E978", -"F. c #EFD85C", -"G. c #F5FA8B", -"H. c #8EA842", -"I. c #000100", -"J. c #686699", -"K. c #0C1E12", -"L. c #1E4018", -"M. c #1D3D18", -"N. c #1E3E18", -"O. c #1D3D17", -"P. c #1E3F1A", -"Q. c #183815", -" . + @ # ", -" $ % & * = - ; ", -" > , ' ) ) ' ! ~ ", -" { ] ^ / / ^ ( _ : ", -"< [ } | 1 2 3 4 2 5 6 7 ", -"8 9 0 a b c d d e b f g h i j k ", -"l m n o p q r r q s t u v w x y ", -"z A B C D E F F G H I J K L M N ", -"O P Q R S T U V W X Y Z ` ...+.", -"@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.", -"@.].^./.(._.:.<.[.}.|.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.q.r.s.t.u.v.w.x.y.", -"z.A.B.C.D.E.F.G.H.I. ", -" J.K.L.M.N.O.P.Q. ", -" "}; diff --git a/ubuntu/raring/tdebase/debian/icons/kinfocenter.xpm b/ubuntu/raring/tdebase/debian/icons/kinfocenter.xpm deleted file mode 100644 index 04fcb0013..000000000 --- a/ubuntu/raring/tdebase/debian/icons/kinfocenter.xpm +++ /dev/null @@ -1,349 +0,0 @@ -/* XPM */ -static char * kinfocenter_xpm[] = { -"32 32 314 2", -" c None", -". c #98DBF8", -"+ c #ABE2F9", -"@ c #BBE7FA", -"# c #9CDCF8", -"$ c #85D4F6", -"% c #3DBBF1", -"& c #B8E0F6", -"* c #E8F1F9", -"= c #97D3F2", -"- c #1BA6E6", -"; c #C6DFF3", -"> c #D4E4F4", -", c #ABD6F2", -"' c #1399DB", -") c #9BCAED", -"! c #C0D7F0", -"~ c #D5E4F5", -"{ c #FFFFFF", -"] c #77BFEB", -"^ c #0089CF", -"/ c #229DE3", -"( c #ADCBEB", -"_ c #D6E5F5", -": c #0093E1", -"< c #008DDE", -"[ c #269AE0", -"} c #98BEE6", -"| c #AAC9EA", -"1 c #F8FBFD", -"2 c #007DC6", -"3 c #0088DB", -"4 c #1990DC", -"5 c #84B1E1", -"6 c #A4C6E9", -"7 c #0083D8", -"8 c #559CDB", -"9 c #70A4DC", -"0 c #AFCCEB", -"a c #4698DA", -"b c #8A8ABF", -"c c #8181BB", -"d c #007ED5", -"e c #0C81D5", -"f c #5796D7", -"g c #5C98D7", -"h c #AECBEB", -"i c #4C93D6", -"j c #0680D5", -"k c #005A9E", -"l c #8888BE", -"m c #E4E4E4", -"n c #7F7FBA", -"o c #0079D2", -"p c #057AD2", -"q c #3085D2", -"r c #498CD2", -"s c #A4C5E9", -"t c #2B84D2", -"u c #006183", -"v c #8383BC", -"w c #7D7DB9", -"x c #0074CF", -"y c #0876CE", -"z c #1A7ACE", -"A c #8EBDE7", -"B c #1679CE", -"C c #0475CE", -"D c #107A39", -"E c #178A02", -"F c #178E00", -"G c #158D00", -"H c #138B00", -"I c #118900", -"J c #0F8800", -"K c #0E8600", -"L c #005D00", -"M c #7B7BB7", -"N c #006EBF", -"O c #006FCB", -"P c #80B7E5", -"Q c #46A948", -"R c #78D05E", -"S c #7AD660", -"T c #78D460", -"U c #76D260", -"V c #73D060", -"W c #31B718", -"X c #7979B6", -"Y c #0E797D", -"Z c #006AC8", -"` c #80B4E4", -" . c #0875A4", -".. c #6AB859", -"+. c #9EDD8D", -"@. c #77D360", -"#. c #75D160", -"$. c #73CF60", -"%. c #B1E4A7", -"&. c #43BC30", -"*. c #7777B5", -"=. c #318030", -"-. c #0065C5", -";. c #80B2E2", -">. c #1A9042", -",. c #6EBD5C", -"'. c #23B600", -"). c #1FB300", -"!. c #1CB000", -"~. c #9ADB8F", -"{. c #40B930", -"]. c #7575B4", -"^. c #6CAEC0", -"/. c #005FC2", -"(. c #5091D5", -"_. c #297AAC", -":. c #8DAD8B", -"<. c #A2B69F", -"[. c #9DB497", -"}. c #7BA073", -"|. c #31AA1B", -"1. c #18AD00", -"2. c #98DA8F", -"3. c #3DB630", -"4. c #7373B3", -"5. c #B9F78F", -"6. c #369099", -"7. c #005DC0", -"8. c #307BCC", -"9. c #2072BC", -"0. c #94BB9D", -"a. c #95959B", -"b. c #848484", -"c. c #6A6A6A", -"d. c #505050", -"e. c #219110", -"f. c #14A900", -"g. c #97D88F", -"h. c #3AB430", -"i. c #7070B2", -"j. c #B7F58F", -"k. c #B4F28E", -"l. c #4695A4", -"m. c #0C7386", -"n. c #3BA431", -"o. c #61AE54", -"p. c #979798", -"q. c #727272", -"r. c #585858", -"s. c #3E3E3E", -"t. c #1A8A0B", -"u. c #11A600", -"v. c #95D78F", -"w. c #37B130", -"x. c #6E6EB0", -"y. c #B6F48F", -"z. c #B5F38F", -"A. c #B1EF8E", -"B. c #74BC7F", -"C. c #17807B", -"D. c #0D7386", -"E. c #1C9135", -"F. c #24A007", -"G. c #22A306", -"H. c #2DB30E", -"I. c #3BAA24", -"J. c #2E9D1A", -"K. c #259413", -"L. c #1B8B0D", -"M. c #129E02", -"N. c #0DA300", -"O. c #94D58F", -"P. c #34AE30", -"Q. c #6C6CAF", -"R. c #B4F28F", -"S. c #B3F28F", -"T. c #B2F08F", -"U. c #9FEB77", -"V. c #64CE33", -"W. c #3AB607", -"X. c #84B2B0", -"Y. c #269A35", -"Z. c #6BAB91", -"`. c #83B1B0", -" + c #A3C5AB", -".+ c #ACCBAA", -"++ c #AECDAB", -"@+ c #BADCB5", -"#+ c #C6EABE", -"$+ c #CBEBC4", -"%+ c #D2E4CE", -"&+ c #CBDEC8", -"*+ c #C5D8C2", -"=+ c #BFD1BC", -"-+ c #C0E1BE", -";+ c #93D58F", -">+ c #92D48F", -",+ c #31AC30", -"'+ c #6A6AAE", -")+ c #DCB46B", -"!+ c #DBB46B", -"~+ c #B0EF8F", -"{+ c #D1F5BF", -"]+ c #D0F4BF", -"^+ c #69D539", -"/+ c #BFBFC1", -"(+ c #99999C", -"_+ c #7F7F83", -":+ c #2DB404", -"<+ c #2AB104", -"[+ c #28B502", -"}+ c #26B900", -"|+ c #4DBC38", -"1+ c #B0B0B0", -"2+ c #8A8A8A", -"3+ c #707070", -"4+ c #565656", -"5+ c #479B41", -"6+ c #92D38F", -"7+ c #91D38F", -"8+ c #30AB30", -"9+ c #6868AD", -"0+ c #E9A060", -"a+ c #E89F60", -"b+ c #69DE30", -"c+ c #43D300", -"d+ c #CFF3BF", -"e+ c #63D036", -"f+ c #A3A3A3", -"g+ c #747474", -"h+ c #4F4F4F", -"i+ c #A3E38F", -"j+ c #A2E28F", -"k+ c #A0E18F", -"l+ c #9FDF8F", -"m+ c #9DDE8F", -"n+ c #9CDC8F", -"o+ c #A9DAA1", -"p+ c #A0A0A0", -"q+ c #797979", -"r+ c #5F5F5F", -"s+ c #444444", -"t+ c #86B084", -"u+ c #90D28F", -"v+ c #8FD28F", -"w+ c #6666AC", -"x+ c #66DB30", -"y+ c #3FD000", -"z+ c #CEF2BF", -"A+ c #5DCA33", -"B+ c #8E8E8E", -"C+ c #5B5B5B", -"D+ c #353535", -"E+ c #52C930", -"F+ c #4EC630", -"G+ c #4287CB", -"H+ c #3F72FF", -"I+ c #4185CB", -"J+ c #58BC4B", -"K+ c #72976E", -"L+ c #52774F", -"M+ c #3D633B", -"N+ c #294E27", -"O+ c #2C912B", -"P+ c #24A624", -"Q+ c #6464AB", -"R+ c #AEED8F", -"S+ c #ADEC8F", -"T+ c #60D630", -"U+ c #CDF1BF", -"V+ c #35C600", -"W+ c #CBF0BF", -"X+ c #CAEFBF", -"Y+ c #22B600", -"Z+ c #3782BF", -"`+ c #3580BF", -" @ c #0AA000", -".@ c #069C00", -"+@ c #029900", -"@@ c #009700", -"#@ c #6262A9", -"$@ c #C7F2B3", -"%@ c #90E46B", -"&@ c #5DD330", -"*@ c #CCF1BF", -"=@ c #31C300", -"-@ c #CAEEBF", -";@ c #89BACB", -">@ c #82AEDF", -",@ c #87B8CB", -"'@ c #B3E0B3", -")@ c #5F5FA8", -"!@ c #F3F497", -"~@ c #EAE071", -"{@ c #F3DA70", -"]@ c #D6F47F", -"^@ c #F2DA70", -"/@ c #CBEF74", -"(@ c #F2D970", -"_@ c #D2E873", -":@ c #C7EC74", -"<@ c #F1D870", -"[@ c #307F30", -"}@ c #0C700C", -"|@ c #006C00", -"1@ c #5D5DA7", -"2@ c #FFF489", -"3@ c #FFDD67", -"4@ c #FFD256", -"5@ c #FFFF9A", -"6@ c #5B5BA6", -"7@ c #5959A5", -"8@ c #5A5AA5", -"9@ c #5757A4", -" ", -" . + @ @ # $ % ", -" & * * * * * * * * = - ", -" ; > > > > > > > > > > , ' ", -" ) ! ! ! ! ~ { { ~ ! ! ! ! ] ^ ", -" / ( ( ( ( ( _ { { _ ( ( ( ( ( : ", -" < [ } } } } } | 1 1 | } } } } } [ 2 ", -" 3 4 5 5 5 5 5 5 6 6 5 5 5 5 5 5 3 3 ", -" 7 7 8 9 9 9 9 0 { { 0 9 9 9 9 a 7 7 ", -"b b b c d d e f g g g h { { h g g g i j d d k ", -"l m m n o o o p q r r s { { s r r t p o o o u ", -"b v m w x x x x x y z A { { A B C x x x x x D E F G H I J K L ", -" b m M N O O O O O O P { { P O O O O O O O Q R S T U U V W L ", -" b m X Y Z Z Z Z Z Z ` { { ` Z Z Z Z Z Z ...+.@.#.$.$.%.&.L ", -" b m *. =.-.-.-.-.-.-.;.{ { ;.-.-.-.-.-.-.>.,.@.'.).!.!.~.{.L ", -" b m ]. =.^./././././.(.{ { (./././././._.:.<.[.}.|.1.1.2.3.L ", -" b m 4. =.5.6.7.7.7.7.7.8.8.7.7.7.7.7.9.0.a.b.c.d.e.f.f.g.h.L ", -" b m i. =.j.k.l.7.7.7.7.7.7.7.7.7.7.m.n.o.p.q.r.s.t.u.u.v.w.L ", -" b m x. =.y.z.A.B.C.7.7.7.7.7.7.D.E.F.G.H.I.J.K.L.M.N.N.O.P.L ", -" b m Q. =.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+;+>+,+L ", -" b m '+ =.)+!+~+{+]+^+/+(+_+:+<+[+}+'.).|+1+2+3+4+5+6+6+7+8+L ", -" b m 9+ =.0+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+u+v+8+L ", -" b m w+ =.a+a+x+y+z+A+B+C+D+E+F+G+H+I+&.J+K+L+M+N+O+P+P+v+8+L ", -" b m Q+ =.R+S+d+T+U+V+W+X+E+}+Y+Z+H+`+f.u.N. @.@+@@@@@@@v+8+L ", -" b m #@ =.$@%@z+&@*@=@X+-@F+Y+m+;@>@,@g.v.O.>+7+v+v+v+v+'@8+L ", -" b m )@ =.!@~@{@]@^@/@(@(@_@:@<@=.=.=.=.=.[@[@[@[@[@[@[@}@|@L ", -" b m 1@ =.2@3@4@5@4@5@4@4@2@5@4@=. ", -" b m 6@ =.2@3@4@5@4@5@4@4@2@5@4@=. ", -" b m 7@ =.=.=.=.=.=.=.=.=.=.=.=.=. ", -" b 8@9@ ", -" ", -" "}; diff --git a/ubuntu/raring/tdebase/debian/kcontrol-trinity.install b/ubuntu/raring/tdebase/debian/kcontrol-trinity.install index 65a650cbc..46eb3b814 100644 --- a/ubuntu/raring/tdebase/debian/kcontrol-trinity.install +++ b/ubuntu/raring/tdebase/debian/kcontrol-trinity.install @@ -4,7 +4,6 @@ debian/tmp/opt/trinity/bin/kdeinstallktheme debian/tmp/opt/trinity/bin/keditfiletype debian/tmp/opt/trinity/bin/tdefontinst debian/tmp/opt/trinity/bin/tdefontview -debian/tmp/opt/trinity/bin/kinfocenter debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper debian/tmp/opt/trinity/bin/tderandrtray debian/tmp/opt/trinity/bin/krdb @@ -242,5 +241,3 @@ debian/tmp/opt/trinity/share/services/localdomainurifilter.desktop debian/icons/kcontrol.xpm /opt/trinity/share/pixmaps debian/icons/kcontrol-16.xpm /opt/trinity/share/pixmaps -debian/icons/kinfocenter.xpm /opt/trinity/share/pixmaps -debian/icons/kinfocenter-16.xpm /opt/trinity/share/pixmaps diff --git a/ubuntu/raring/tdebase/debian/kcontrol-trinity.menu b/ubuntu/raring/tdebase/debian/kcontrol-trinity.menu index f2bedef2b..3576cdae0 100644 --- a/ubuntu/raring/tdebase/debian/kcontrol-trinity.menu +++ b/ubuntu/raring/tdebase/debian/kcontrol-trinity.menu @@ -7,17 +7,5 @@ icon16x16="/opt/trinity/share/pixmaps/kcontrol-16.xpm"\ command="/opt/trinity/bin/kcontrol" -?package(kcontrol):\ - needs="X11"\ - section="Applications/System/Administration"\ - hints="TDE"\ - title="KInfoCenter"\ - icon32x32="/opt/trinity/share/pixmaps/kinfocenter.xpm"\ - icon16x16="/opt/trinity/share/pixmaps/kinfocenter-16.xpm"\ - command="/opt/trinity/bin/kinfocenter" - # Icon 32x32 kcontrol/kcontrol/cr32-app-kcontrol.png kcontrol.xpm # Icon 16x16 kcontrol/kcontrol/cr16-app-kcontrol.png kcontrol-16.xpm - -# Icon 32x32 kcontrol/pics/cr32-app-hwinfo.png kinfocenter.xpm -# Icon 16x16 kcontrol/pics/cr16-app-hwinfo.png kinfocenter-16.xpm diff --git a/ubuntu/raring/tdebase/debian/rules b/ubuntu/raring/tdebase/debian/rules index d33ef8289..44308e2c2 100755 --- a/ubuntu/raring/tdebase/debian/rules +++ b/ubuntu/raring/tdebase/debian/rules @@ -27,7 +27,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" \ -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" \ - -DAUTODETECT_QT_DIRS="ON" \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH="OFF" \ @@ -79,7 +78,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) -DOC_HTML_PRUNE := kinfocenter ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop +DOC_HTML_PRUNE := ksplashml kcontrol khelpcenter tdesu knetattach tdeioslave kxkb tdedebugdialog kdcop PACKAGES_WITH_LIBS := kate-trinity kcontrol-trinity tdebase-trinity-bin kicker-trinity konqueror-trinity ksplash-trinity \ ksysguard-trinity twin-trinity libkonq4-trinity diff --git a/ubuntu/raring/tdebase/debian/tdebase-data-trinity.install b/ubuntu/raring/tdebase/debian/tdebase-data-trinity.install index e790d4894..9ae37a312 100644 --- a/ubuntu/raring/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/raring/tdebase/debian/tdebase-data-trinity.install @@ -107,7 +107,6 @@ debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/WindowsXP.kcsrc debian/tmp/opt/trinity/share/apps/tdedisplay/color-schemes/YellowOnBlue.kcsrc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewpart.rc debian/tmp/opt/trinity/share/apps/tdefontview/tdefontviewui.rc -debian/tmp/opt/trinity/share/apps/kinfocenter/kinfocenterui.rc debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml debian/tmp/opt/trinity/share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png @@ -273,63 +272,63 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/useragent/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/common debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/windowmanagement/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/cdinfo/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/devices/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/dma/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/interrupts/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/ioports/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/memory/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/nics/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/opengl/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/partitions/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pci/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/pcmcia/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/processor/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/protocols/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/samba/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/scsi/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/sound/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/usb/index.docbook -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/xserver/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/cdinfo/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/devices/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/dma/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/interrupts/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/ioports/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/memory/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/nics/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/opengl/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/partitions/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pci/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/pcmcia/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/processor/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/protocols/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/samba/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/scsi/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/sound/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/usb/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/xserver/index.docbook debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/access.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/acroread.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/applixware.png diff --git a/ubuntu/raring/tdegraphics/debian/kgamma-trinity.install b/ubuntu/raring/tdegraphics/debian/kgamma-trinity.install index ff83d71ab..3e8fa0bb8 100644 --- a/ubuntu/raring/tdegraphics/debian/kgamma-trinity.install +++ b/ubuntu/raring/tdegraphics/debian/kgamma-trinity.install @@ -1,7 +1,7 @@ debian/tmp/opt/trinity/bin/xf86gammacfg debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.la debian/tmp/opt/trinity/lib/trinity/kcm_kgamma.so -debian/tmp/opt/trinity/share/applications/tde/kgamma.desktop +debian/tmp/opt/trinity/share/applnk/.hidden/kgamma.desktop debian/tmp/opt/trinity/share/apps/kgamma/pics/background.png debian/tmp/opt/trinity/share/apps/kgamma/pics/cmyscale.png debian/tmp/opt/trinity/share/apps/kgamma/pics/darkgrey.png diff --git a/ubuntu/raring/tdeutils/debian/kdf-trinity.install b/ubuntu/raring/tdeutils/debian/kdf-trinity.install index 44a0e0bf3..a89e9bf6e 100644 --- a/ubuntu/raring/tdeutils/debian/kdf-trinity.install +++ b/ubuntu/raring/tdeutils/debian/kdf-trinity.install @@ -13,9 +13,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/index.cache.bz2 debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/index.docbook debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf.png debian/tmp/opt/trinity/share/doc/tde/HTML/en/kdf/kdf_config.png -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/common -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/tde/HTML/en/kinfocenter/storagedevices/index.docbook +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/common +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/storagedevices/index.docbook debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmdf.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmdf.png diff --git a/ubuntu/raring/tdeutils/debian/rules b/ubuntu/raring/tdeutils/debian/rules index 772269551..eb3386805 100755 --- a/ubuntu/raring/tdeutils/debian/rules +++ b/ubuntu/raring/tdeutils/debian/rules @@ -36,7 +36,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_XMMS="ON" \ -DWITH_KNEWSTUFF="ON" -DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselect-trinity ksim-trinity +DOC_HTML_PRUNE := kcontrol-trinity ktimer-trinity kcharselect-trinity ksim-trinity DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg