rev 14202 - in kde-extras/kvirc/trunk/debian: . patches

Raúl Sánchez Siles kebianizao-guest at alioth.debian.org
Fri Apr 3 16:14:48 UTC 2009


Author: kebianizao-guest
Date: 2009-04-03 16:14:48 +0000 (Fri, 03 Apr 2009)
New Revision: 14202

Modified:
   kde-extras/kvirc/trunk/debian/changelog
   kde-extras/kvirc/trunk/debian/kvirc.menu
   kde-extras/kvirc/trunk/debian/patches/05_xpmicon.patch
Log:
* Menu: Correctly point to 32x32 icon. Reworked 05_xpmicon.patch to only include 32x32 icons.
Reformat menu section in changelog.

Modified: kde-extras/kvirc/trunk/debian/changelog
===================================================================
--- kde-extras/kvirc/trunk/debian/changelog	2009-04-03 16:14:23 UTC (rev 14201)
+++ kde-extras/kvirc/trunk/debian/changelog	2009-04-03 16:14:48 UTC (rev 14202)
@@ -12,7 +12,10 @@
   * Added DEB_DH_ALWAYS_EXCLUDE
   * Fixed installing files per package paths.
   * Setting back maintainer to Debian KDE Extras Team.
-  * Fixed menu file syntax error.
+  * Menu:
+    - Fixed menu file syntax error.
+    - Correctly point to 32x32 icon.
+    - Reworked 05_xpmicon.patch to only include 32x32 icons.
   * Moved desktop file from kvirc-data to kvirc package.
   * Disabled coexistence with kvirc3.
   * Moving manpage from kvirc-data to kvirc package.

Modified: kde-extras/kvirc/trunk/debian/kvirc.menu
===================================================================
--- kde-extras/kvirc/trunk/debian/kvirc.menu	2009-04-03 16:14:23 UTC (rev 14201)
+++ kde-extras/kvirc/trunk/debian/kvirc.menu	2009-04-03 16:14:48 UTC (rev 14202)
@@ -4,6 +4,4 @@
  title="KVIrc"\
  command="/usr/bin/kvirc"\
  hints="KDE,irc,scripting"\
- icon="/usr/share/pixmaps/kvirc32x32.xpm"\
- icon32x32="/usr/share/pixmaps/kvirc32x32.xpm"\
- icon48x48="/usr/share/pixmaps/kvirc48x48.xpm"
+ icon="/usr/share/pixmaps/kvirc32x32.xpm"

Modified: kde-extras/kvirc/trunk/debian/patches/05_xpmicon.patch
===================================================================
--- kde-extras/kvirc/trunk/debian/patches/05_xpmicon.patch	2009-04-03 16:14:23 UTC (rev 14201)
+++ kde-extras/kvirc/trunk/debian/patches/05_xpmicon.patch	2009-04-03 16:14:48 UTC (rev 14202)
@@ -316,333 +316,5 @@
 +};
 Index: kvirc-4.0.0~svn3039/data/icons/48x48/CMakeLists.txt
 ===================================================================
---- kvirc-4.0.0~svn3039.orig/data/icons/48x48/CMakeLists.txt	2009-02-25 05:48:23.828060270 +0100
-+++ kvirc-4.0.0~svn3039/data/icons/48x48/CMakeLists.txt	2009-02-25 05:49:08.121441032 +0100
-@@ -7,7 +7,10 @@
- 		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/icons/48x48/)
- 	ELSE()
- 		# Assume linux
--		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/)
-+		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps/)
-+		# Install xpm for ${CMAKE_INSTALL_PREFIX}/share/menu/kvirc
-+		FILE(GLOB files "*.xpm")
-+		INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps/)
- 	ENDIF()
- ELSEIF(WIN32)
- 	INSTALL(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/48x48/)
 Index: kvirc-4.0.0~svn3039/data/icons/48x48/kvirc48x48.xpm
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ kvirc-4.0.0~svn3039/data/icons/48x48/kvirc48x48.xpm	2009-02-25 05:46:39.208346945 +0100
-@@ -0,0 +1,311 @@
-+/* XPM */
-+static char *kvirc3[] = {
-+/* columns rows colors chars-per-pixel */
-+"48 48 257 2",
-+"   c #000000",
-+".  c #09060B",
-+"X  c #150B17",
-+"o  c #181019",
-+"O  c #1E1122",
-+"+  c #251528",
-+"@  c #2D1932",
-+"#  c #331C35",
-+"$  c #351D38",
-+"%  c #38273B",
-+"&  c #2D2931",
-+"*  c #3E2242",
-+"=  c #5A2C33",
-+"-  c #633201",
-+";  c #68301A",
-+":  c #442549",
-+">  c #4E2B52",
-+",  c #423B45",
-+"<  c #522C55",
-+"1  c #542E59",
-+"2  c #54345A",
-+"3  c #542E62",
-+"4  c #562E65",
-+"5  c #573062",
-+"6  c #5B3162",
-+"7  c #5B326B",
-+"8  c #5A3467",
-+"9  c #5D3271",
-+"0  c #613565",
-+"q  c #62356B",
-+"w  c #65396D",
-+"e  c #693A6C",
-+"r  c #623572",
-+"t  c #663873",
-+"y  c #6B3B73",
-+"u  c #6B3A7B",
-+"i  c #653679",
-+"p  c #713E7A",
-+"a  c #703C76",
-+"s  c #7A5616",
-+"d  c #75480C",
-+"f  c #6E4B21",
-+"g  c #6D5529",
-+"h  c #78713E",
-+"j  c #504D52",
-+"k  c #454345",
-+"l  c #704259",
-+"z  c #654365",
-+"x  c #67546C",
-+"c  c #6C5A73",
-+"v  c #75407B",
-+"b  c #77447C",
-+"n  c #6E6072",
-+"m  c #6C3A82",
-+"M  c #733D82",
-+"N  c #773D89",
-+"B  c #7B4383",
-+"V  c #7C428B",
-+"C  c #764087",
-+"Z  c #7F4592",
-+"A  c #795680",
-+"S  c #843D00",
-+"D  c #863E16",
-+"F  c #8B4400",
-+"G  c #954600",
-+"H  c #955204",
-+"J  c #845A11",
-+"K  c #884332",
-+"L  c #98631E",
-+"P  c #8D6512",
-+"I  c #967823",
-+"U  c #856A22",
-+"Y  c #A44800",
-+"T  c #B45100",
-+"R  c #BA5400",
-+"E  c #B65D0B",
-+"W  c #A45407",
-+"Q  c #A97F1E",
-+"!  c #BD600C",
-+"~  c #A56E13",
-+"^  c #A17936",
-+"/  c #AA6C24",
-+"(  c #914B45",
-+")  c #895965",
-+"_  c #8A5878",
-+"`  c #955C6C",
-+"'  c #986A54",
-+"]  c #896A7A",
-+"[  c #977262",
-+"{  c #BA7353",
-+"}  c #A67F6A",
-+"|  c #C35600",
-+" . c #C55800",
-+".. c #CB5A00",
-+"X. c #D25D00",
-+"o. c #D46100",
-+"O. c #DC6200",
-+"+. c #D46E09",
-+"@. c #CA792B",
-+"#. c #E46500",
-+"$. c #E86700",
-+"%. c #EA6800",
-+"&. c #E36900",
-+"*. c #F36C00",
-+"=. c #FE7300",
-+"-. c #FF7B00",
-+";. c #F47403",
-+":. c #82468A",
-+">. c #83498A",
-+",. c #854991",
-+"<. c #874895",
-+"1. c #915B9D",
-+"2. c #8C5098",
-+"3. c #9753A5",
-+"4. c #9B54B3",
-+"5. c #924FA6",
-+"6. c #86658D",
-+"7. c #8D6A94",
-+"8. c #807182",
-+"9. c #8C7792",
-+"0. c #96799A",
-+"q. c #986483",
-+"w. c #9963A3",
-+"e. c #9C77A4",
-+"r. c #A459AC",
-+"t. c #A355BB",
-+"y. c #A459B3",
-+"u. c #A45ABA",
-+"i. c #AA5CB4",
-+"p. c #A75AB7",
-+"a. c #AF63BB",
-+"s. c #B162BA",
-+"d. c #B26BBC",
-+"f. c #AF73A7",
-+"g. c #AC5DC2",
-+"h. c #B35DC8",
-+"j. c #B363C2",
-+"k. c #BC69CB",
-+"l. c #B765C8",
-+"z. c #BC66D1",
-+"x. c #BA76C5",
-+"c. c #C06CCF",
-+"v. c #C26BD5",
-+"b. c #C46CD7",
-+"n. c #C07BC9",
-+"m. c #C473D4",
-+"M. c #C97CD4",
-+"N. c #CC7ADB",
-+"B. c #C773D8",
-+"V. c #9C803F",
-+"C. c #AA8729",
-+"Z. c #A98B32",
-+"A. c #8C8240",
-+"S. c #BE9D63",
-+"D. c #AA8C6F",
-+"F. c #BEAE4F",
-+"G. c #B7AA59",
-+"H. c #B9A56B",
-+"J. c #D38837",
-+"K. c #C88C37",
-+"L. c #EF821D",
-+"P. c #FF8102",
-+"I. c #FF850C",
-+"U. c #FF890B",
-+"Y. c #FF8C14",
-+"T. c #FF8C1A",
-+"R. c #FF901A",
-+"E. c #EE8321",
-+"W. c #E69426",
-+"Q. c #FF8F21",
-+"!. c #FF9324",
-+"~. c #FF9928",
-+"^. c #FF9A33",
-+"/. c #FF9F3E",
-+"(. c #FFB607",
-+"). c #FFBC16",
-+"_. c #EFAC2D",
-+"`. c #EDB033",
-+"'. c #FFA03C",
-+"]. c #F6A533",
-+"[. c #D6AA2E",
-+"{. c #C49140",
-+"}. c #C89155",
-+"|. c #C69774",
-+" X c #D68E72",
-+".X c #D3AC5C",
-+"XX c #D1BD53",
-+"oX c #CCA777",
-+"OX c #EB9D47",
-+"+X c #EBA250",
-+"@X c #FFA542",
-+"#X c #FFAB47",
-+"$X c #FFAC53",
-+"%X c #FFB25C",
-+"&X c #FFBB63",
-+"*X c #FFBD70",
-+"=X c #E4B070",
-+"-X c #FFC517",
-+";X c #FFC82A",
-+":X c #F9C535",
-+">X c #FFD227",
-+",X c #FFD333",
-+"<X c #D0C876",
-+"1X c #F2CF4C",
-+"2X c #FED546",
-+"3X c #FBDB54",
-+"4X c #E6C952",
-+"5X c #ECD279",
-+"6X c #FFC37B",
-+"7X c #FFC373",
-+"8X c #E1C66E",
-+"9X c #FFE448",
-+"0X c #FFE656",
-+"qX c #FFE56A",
-+"wX c #FFE67B",
-+"eX c #FAE97F",
-+"rX c #FFF56B",
-+"tX c #FFF264",
-+"yX c #FFFC75",
-+"uX c #98829A",
-+"iX c #BB9D80",
-+"pX c #A585AA",
-+"aX c #A981B3",
-+"sX c #B48DBC",
-+"dX c #BA86C4",
-+"fX c #D5BC9E",
-+"gX c #C281C9",
-+"hX c #CB82D4",
-+"jX c #C789D2",
-+"kX c #C494CD",
-+"lX c #D193DA",
-+"zX c #D086D7",
-+"xX c #D8A2E1",
-+"cX c #FFC680",
-+"vX c #FFCC84",
-+"bX c #FFD79B",
-+"nX c #FFD9A1",
-+"mX c #FFDCA8",
-+"MX c #FFDAB3",
-+"NX c #FEEC87",
-+"BX c #FFF38B",
-+"VX c #FFF49C",
-+"CX c #FFF794",
-+"ZX c #FFE4AC",
-+"AX c #FFE5B7",
-+"SX c #FFF8A9",
-+"DX c #EEE5A4",
-+"FX c #F4DFC1",
-+"GX c #FFECC2",
-+"HX c #FBE5C7",
-+"JX c #FBECD6",
-+"KX c #FFF5CF",
-+"LX c #FFF6DA",
-+"PX c #FFFDE3",
-+"IX c #FFFFEA",
-+"UX c #FFFFFE",
-+"YX c None",
-+/* pixels */
-+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX                    YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  j uXuXuX0.uXuXk   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  uXgXgXgXdXn.x.]   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  pXgXn.zXhXx.d.pX    YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-+"YXYXYXYXYXYXYXYXYX      YXYXYXYXYX      kXx.zXhXhXhXd.dX      YXYXYXYXYX      YXYXYXYXYXYXYXYXYX",
-+"YXYXYXYXYXYXYXYX    ,             . n dXgXhXhXM.M.M.gXd.aXn .             ,     YXYXYXYXYXYXYXYX",
-+"YXYXYXYXYXYXYX    pXxXuXX     % 9.kXx.x.hXhXM.N.N.M.m.k.a.a.dXA &     X e.n.0.    YXYXYXYXYXYXYX",
-+"YXYXYXYXYXYX    pXlXjXlXdXn e.jXx.x.M.M.N.N.N.N.N.B.B.k.l.j.a.a.x.e.c x.i.i.s.7.    YXYXYXYXYXYX",
-+"YXYXYXYXYX    x w.w.w.w.1.1.1.1.4.x.N.zXN.N.N.B.b.B.b.v.h.h.r.V N N N :.N V V >.x     YXYXYXYXYX",
-+"YXYXYXYX    0.D.JXJXHXGXHXHXHXFXHX6.N.x.b.B.b.z.v.v.v.v.h.h.] FXJXJXJXJXJXJXLXHX) 7.    YXYXYXYX",
-+"YXYXYXYX  % lXq.LXUXUXUXUXUXUXUXIXiXj.k.z.z.h.l.h.h.h.h.g.<.fXUXUXUXUXUXUXUXUXMXy d.+   YXYXYXYX",
-+"YXYXYXYX    7.x.|.PXUXUXUXUXUXUXIXAXC h.g.t.t.g.t.t.t.t.t.e KXUXUXUXUXIXPXPXKX[ 3.A     YXYXYXYX",
-+"YXYXYXYXYX  . dX` ZXPXIXPXPXPXLXGXnX) 4.f. X$X].].OX Xf.4.' HXPXPXKXGXAXAXZXvX0 w..   YXYXYXYXYX",
-+"YXYXYXYXYX    z j.}.ZXGXGXGXGXAXbX6X}.K.).`.,X2X,X;X(.(./ =XnXAXmXbXnXbX6X6X' ,.2     YXYXYXYXYX",
-+"YXYXYXYXYX    w.x.) 6XbXnXbXbXcX*X%X%XZ.NXwXwXwXqX2X2X(.P *X*XcXcXvX7X7X7X%X< 2.,.    YXYXYXYXYX",
-+"YXYXYXYXYX  @ x.B.l. at .&X6X6X7X%X%X/. at X/ NXBXNXNXNXqX0X`.L %X%X&X%X#X].'.]./ C Z 3.O   YXYXYXYXYX",
-+"YXYXYXYXYX  b c.B.B.( ].$X%X at X'.^.!.!.;.H.VXVXCXNXNXqXZ.L././.'.~.~.!.R.~.= Z Z Z 9     YXYXYXYX",
-+"YXYXYXYX  . d.m.B.B.r.+.~. at X^.~.!.T.Q.!.^ SXSXVXCXBXrXP !.^.^.R.Y.Y.R.R.! i V V V 2.    YXYXYXYX",
-+"YXYXYXYX  2 c.c.b.b.z.K U.R.R.~.Q.I.L.I.! DXSXSXVXNX8XH Q.~.Y.I.U.U.U.U.= N N C C B >     YXYXYX",
-+"          3.c.c.b.v.l.,.&.U.Y.Y.Y.I.-.-.P.D.SXSXVXBXV.&.-.-.P.-.P.P.P.o.5 C C C C C B           ",
-+"  % w >.i.k.k.c.v.h.g.g.D -.U.U.-.-.-.-.-.L SXVXBXNXs =.;.-.-.-.-.-.-.; m M M M M p p >.y 6 #   ",
-+"  v d.s.d.k.k.c.z.h.g.4.l $.-.P.P.=.=.=.=.X.<XCXCX<XY =.=.-.=.=.-.-.&.z m m m m u p p u a p 6   ",
-+"  a s.s.k.j.l.z.l.g.g.4.J.H -.-.-.=.=.=.=.=.' BXBXh *.=.=.=.=.=.=.=.H |.m m u u u u y y a y 1   ",
-+"  e s.s.k.j.j.h.g.g.4.4.W.~ $.-.=.*.*.*.*.*.H BXNXd *.%.*.*.*.*.*.O.Z.=Xm m u u u y y y e e <   ",
-+"  e i.i.d.s.s.s.u.u.y.4.W.;XG *.*.%.$.$.$.%.X.G.G.G $.#.$.$.$.$.%.F qX=Xi i r r r r w w w e >   ",
-+"  0 i.r.s.s.s.i.y.y.4.4.J.,XI X.O.O.O.O.O.O.O.L g O.O.O.O.O.O.&.o.I tXoXi i r r w w w w 6 6 >   ",
-+"  0 r.r.r.i.i.p.r.t.t.4.{ ;X2XS X.X.X.X.X.X.X.S - ......X.X.X.o.S 3XyXD.r r r w 7 q 8 8 6 0 >   ",
-+"  + : e :.r.i.p.i.4.4.3._ -X9XI  ..... . . .| | Y |  . .|  .....U rXrXb 9 9 7 7 7 6 7 4 > = o   ",
-+"          a i.r.y.4.4.5.Z W.9X1XS | R R R R R T R T R R R R R S 4XyX8X9 7 7 7 6 6 6 <           ",
-+"YXYXYX    # 3.r.r.3.3.2.,.` >X9XU T T T T T T T T T T T T T R s yXyX_ 9 7 4 6 5 4 6 +     YXYXYX",
-+"YXYXYXYX    B 5.3.1.2.Z Z C J.9X4XS T T T T T T T T T T T R F XXyXoX4 4 4 4 5 6 6 5     YXYXYXYX",
-+"YXYXYXYXYX  : 2.2.,.,.Z Z V v _.3XJ T T T T T T T T T R R R s yX5X7 4 3 3 3 6 1 6 #     YXYXYXYX",
-+"YXYXYXYXYX  . :.<.,.:.V N N M v `.[.F T T R R R R R R R R G .X5X8 3 3 3 3 1 6 6 6 .   YXYXYXYXYX",
-+"YXYXYXYXYX    1 ,.>.:.B :.M M M v {.J R R R | R R R R R R d H.2 3 3 3 1 3 6 6 6 *     YXYXYXYXYX",
-+"YXYXYXYXYXYX  + >.>.:.N B C p M u i < f Q C.C.C.C.Z.Z.Z.g * 3 3 3 3 3 3 6 6 6 6 O     YXYXYXYXYX",
-+"YXYXYXYXYX    e >.>._ N C p v u u u t r z [ }..X.XS.} z 3 3 3 1 3 3 3 5 6 0 6 0 <     YXYXYXYXYX",
-+"YXYXYXYX    : >.:.:.B B p p p u y r r 9 r 9 7 7 8 4 3 3 3 3 3 3 5 5 6 6 6 0 0 0 e $     YXYXYXYX",
-+"YXYXYXYX  X p :._ :.b p v p u y t r r w 7 7 4 4 3 3 3 3 3 3 3 3 5 6 6 6 6 0 0 0 0 0 .   YXYXYXYX",
-+"YXYXYXYX    : :.M M b b v y y y w w q 7 4 6 5 3 3 3 5 3 3 3 6 6 6 6 6 6 0 0 0 0 0 $     YXYXYXYX",
-+"YXYXYXYXYX    % _ p v v y y y w q q 6 7 6 5 5 5 5 5 5 5 6 6 6 6 0 6 0 0 0 0 0 0 $     YXYXYXYXYX",
-+"YXYXYXYXYXYX    * a p y 1 + : 6 q 6 6 6 6 6 6 6 1 6 6 6 6 6 6 6 1 : + 1 0 0 0 $       YXYXYXYXYX",
-+"YXYXYXYXYXYXYX    * e $       . @ 1 6 6 6 1 2 6 6 6 6 6 6 6 < @ .       % 0 $       YXYXYXYXYXYX",
-+"YXYXYXYXYXYXYXYX    .               O : 6 6 6 0 6 6 6 6 : o               .       YXYXYXYXYXYXYX",
-+"YXYXYXYXYXYXYXYXYX      YXYXYXYX        1 6 0 2 0 6 6 <         YXYXYXYX      YXYXYXYXYXYXYXYXYX",
-+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  : 2 0 6 0 0 2 :     YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  # 0 0 0 6 0 0 +   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX  X # # # # # # X   YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
-+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX                    YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
-+};




More information about the pkg-kde-commits mailing list