[Gnash-commit] /srv/bzr/gnash/trunk r10103: merge from build branch

[rob]

------------------------------------------------------------
revno: 10103
committer: address@hidden
branch nick: trunk
timestamp: Sat 2008-10-25 11:48:00 -0600
message:
  merge from build branch
removed:
  packaging/klash.xpm
added:
  packaging/klash.xpm
modified:
  packaging/redhat/gnash.spec
  packaging/rpm.am
  packaging/snapshot.am
  plugin/klash/Makefile.am
    ------------------------------------------------------------
    revno: 10080.1.1
    committer: address@hidden
    branch nick: build
    timestamp: Fri 2008-10-24 11:43:27 -0600
    message:
      add klash icon
    added:
      packaging/klash.xpm
    ------------------------------------------------------------
    revno: 10080.1.2
    committer: address@hidden
    branch nick: build
    timestamp: Fri 2008-10-24 17:00:19 -0600
    message:
      fix rpm building
    modified:
      packaging/redhat/gnash.spec
      packaging/rpm.am
      packaging/snapshot.am
      plugin/klash/Makefile.am

=== added file 'packaging/klash.xpm'
--- a/packaging/klash.xpm       1970-01-01 00:00:00 +0000
+++ b/packaging/klash.xpm       2008-10-24 17:43:27 +0000
@@ -0,0 +1,310 @@
+/* XPM */
+static char *dummy[]={
+"32 32 275 2",
+".A c #152c41",
+".L c #162d42",
+".K c #172e43",
+".X c #182f45",
+".M c #192f45",
+".N c #1a2f45",
+".p c #1a3045",
+".O c #1a3046",
+".Y c #1c3248",
+".Z c #1d3349",
+".0 c #1e344a",
+".W c #1f354a",
+"#m c #20364b",
+".9 c #21364c",
+".8 c #21374c",
+"#. c #23384e",
+"#l c #23394e",
+"#a c #24394e",
+"## c #24394f",
+"#n c #253a4f",
+"#y c #253a50",
+".z c #263b4f",
+"#b c #273c51",
+"#x c #283e52",
+"#z c #293d52",
+"#o c #293d53",
+"#p c #293e53",
+"#q c #2b3f54",
+"#A c #2e4257",
+"#B c #2e4258",
+"#E c #2f4358",
+"#u c #304459",
+"#t c #314459",
+"#H c #34475c",
+"#P c #35485d",
+".B c #36495c",
+"#1 c #36495d",
+"a. c #36495e",
+".q c #374a5c",
+"#Q c #374a5f",
+".1 c #384b5e",
+"#R c #394c61",
+"#0 c #3a4d62",
+"a# c #3b4e62",
+"#Z c #3c4e63",
+"#c c #3d4f62",
+"#Y c #3d5064",
+"#2 c #3e5064",
+"#9 c #3e5065",
+"#3 c #3f5166",
+"as c #405267",
+"#8 c #405367",
+"#O c #40566c",
+"#L c #41586f",
+"#F c #415971",
+"#7 c #425368",
+"aa c #435569",
+"#k c #44627a",
+"ab c #45566a",
+"ac c #45566b",
+"#f c #455769",
+"#g c #45576a",
+"ah c #46576c",
+"ag c #47586d",
+"#I c #486179",
+"ai c #495a6e",
+".P c #495b6b",
+"#h c #495c6e",
+".y c #4a5b6c",
+"ak c #4a5c70",
+"al c #4b5b70",
+"aj c #4b5c70",
+".f c #4c5d6d",
+"ar c #4c5d71",
+"aC c #4d5d72",
+"aq c #4d5e72",
+"am c #4e6075",
+"aD c #4f5f73",
+"aB c #506074",
+"au c #506075",
+"at c #506175",
+"ap c #506176",
+".7 c #516272",
+"aA c #526276",
+"a2 c #526277",
+"bb c #526377",
+"az c #536277",
+"ay c #536377",
+".# c #556574",
+"#S c #557189",
+"aO c #566579",
+"aF c #56657a",
+"aE c #56667a",
+"av c #56687e",
+"bc c #57667a",
+"aN c #57677b",
+"aM c #58687c",
+"aP c #5a6a7e",
+"a0 c #5b6a7d",
+"aZ c #5b6a7e",
+"aQ c #5b6b7e",
+"aR c #5b6b7f",
+"a1 c #5c6a7e",
+"aS c #5c6b7e",
+"a3 c #5c6b7f",
+".r c #5c6c7b",
+"af c #5d778e",
+"bN c #5e6d80",
+"#D c #5e7f99",
+"a8 c #606e82",
+"a5 c #606f82",
+"a4 c #616f83",
+"bo c #617084",
+"aV c #617388",
+"#K c #61829c",
+"bA c #627184",
+"ba c #627186",
+".o c #637281",
+".e c #647280",
+"bd c #647286",
+".J c #647382",
+".2 c #657482",
+"bO c #657589",
+"#6 c #65829b",
+".a c #667482",
+"be c #667588",
+"bn c #677488",
+".g c #677683",
+".6 c #677684",
+"aY c #677c93",
+"bf c #68768a",
+"aI c #688097",
+"#U c #6889a4",
+"bj c #69768b",
+"bm c #69778a",
+"#i c #69869e",
+"bi c #6a778b",
+"aG c #6a839b",
+"bB c #6b798c",
+"aL c #6b849b",
+"bp c #6c7a8d",
+"b0 c #6d7b8d",
+".5 c #6d8091",
+".d c #6e7c89",
+"bz c #6e7c8f",
+"b1 c #707e90",
+".V c #717f8c",
+"bM c #717f91",
+"#d c #7192ab",
+"bq c #728094",
+"#X c #7397b3",
+"#4 c #7497b3",
+"by c #758296",
+"ca c #758393",
+".b c #778490",
+"bu c #78869a",
+"a9 c #7892ab",
+"bP c #798598",
+"bt c #79869a",
+"ck c #798796",
+".c c #7a8692",
+".n c #7b8793",
+"bv c #7b8b9f",
+"#v c #7ba3c0",
+"#j c #7ca3c0",
+"bC c #7d8a9d",
+"#s c #7ea6c4",
+"b2 c #7f8c9e",
+"aT c #7fa0bb",
+"ax c #7fa1bd",
+"cl c #808d9e",
+"bk c #819cb6",
+"bh c #819db7",
+"cm c #828f9f",
+"c# c #8390a0",
+"bL c #8490a3",
+".3 c #84a3bb",
+"#N c #84aecc",
+"cp c #8591a2",
+"bs c #859db4",
+"cq c #8692a2",
+"bl c #86a5c0",
+"ad c #86aecc",
+"bZ c #8793a3",
+"cn c #8894a5",
+"cj c #8995a5",
+"co c #8995a6",
+"cb c #8996a7",
+"bx c #89a4bd",
+"ao c #89b1cf",
+".h c #8a95a0",
+".x c #8a96a0",
+"cc c #8a96a8",
+"bD c #8a99ad",
+"#r c #8bb7d7",
+".Q c #8c97a2",
+"bK c #8c99ab",
+".U c #8d98a3",
+"bH c #8d9aae",
+"bG c #8d9bae",
+"a6 c #8db3d0",
+"bI c #8f9eb2",
+"aw c #8fb9d7",
+"#G c #8fbcdc",
+"bE c #90a2b6",
+"bQ c #919dae",
+"bF c #91a2b7",
+"bJ c #92a2b8",
+".R c #93a4b2",
+".T c #93a6b5",
+"b# c #93bcdb",
+"ae c #93bfdf",
+"#e c #94c1e1",
+"#C c #96c5e6",
+"aU c #97c2e2",
+"a7 c #97c3e2",
+"aJ c #98c4e4",
+"bY c #99a5b6",
+"an c #99c8e9",
+"#M c #99c9ea",
+"bR c #9aa6b9",
+"bT c #9ba9bc",
+"bU c #9ba9bd",
+"cd c #9ca7b7",
+"bS c #9ca9bc",
+"bV c #9ca9bd",
+"bw c #9cc4e3",
+"br c #9cc6e6",
+"bX c #9da9bc",
+"bW c #9da9bd",
+"aW c #9eceef",
+"#V c #9fd0f2",
+"#w c #9fd1f3",
+"bg c #a0cff0",
+"#5 c #a0d2f4",
+".4 c #a1d2f3",
+".C c #a2abb4",
+"ci c #a2adbc",
+"b3 c #a2aec0",
+"b6 c #a2b0c3",
+"c. c #a3aebd",
+"b5 c #a3b0c3",
+"b7 c #a3b1c4",
+"#J c #a3d5f8",
+".m c #a4adb5",
+"ce c #a4aebe",
+"b4 c #a4b0c2",
+"aX c #a4d6f8",
+"aK c #a4d7f9",
+"b8 c #a5b2c4",
+"ch c #a7b1c1",
+"cf c #a7b2c2",
+"b9 c #a7b2c3",
+"#T c #a7dafd",
+"aH c #a7dbfd",
+"#W c #a7dbfe",
+"cg c #a8b2c2",
+"b. c #a8dbfe",
+".S c #a8dcff",
+".I c #b1b9c0",
+".D c #b5bcc3",
+".H c #b5bcc4",
+".E c #b5bdc4",
+".G c #b6bcc4",
+".F c #b6bdc4",
+".s c #bcc2c8",
+".i c #bec5cb",
+".l c #cbd0d5",
+".w c #ced2d7",
+".t c #d8dce0",
+".j c #dadde1",
+".v c #dadee1",
+".u c #dbdee2",
+".k c #dfe2e5",
+"Qt c #ffffff",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQt.#.a.b.c.d.eQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQt.f.g.h.i.j.k.l.m.n.oQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQt.p.q.r.s.t.u.u.u.u.v.w.x.y.zQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQt.A.A.B.C.D.E.E.F.G.H.F.H.I.J.K.LQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQt.M.N.O.P.Q.R.S.S.S.T.U.U.U.U.V.W.p.XQtQtQtQtQtQtQt",
+"QtQtQtQtQtQt.Y.Z.0.W.1.2.3.S.S.4.5.6.6.6.6.7.8.0.Z.YQtQtQtQtQtQt",
+"QtQtQtQtQtQt.9#.###a#b#c#d.S.S#e#f#g#g#h#i#j#k###l#mQtQtQtQtQtQt",
+"QtQtQtQtQt#n#b#o#p#p#p#q#r.S.S#s#t#u#u#v.S.S#w#p#x#b#yQtQtQtQtQt",
+"QtQtQtQtQt#z#A#B#B#B#B#B#C.S.S#D#E#F#C.S.S.S#G#E#B#A#zQtQtQtQtQt",
+"QtQtQtQt#q#u#H#H#H#H#H#I#J.S.S#K#L#M.S.S.S#N#O#P#H#H#u#qQtQtQtQt",
+"QtQtQtQt#E#Q#R#R#R#R#R#S.S.S#T#U#V.S.S#W#X#Y#Z#0#R#R#Q#EQtQtQtQt",
+"QtQtQtQt#1#2#3#3#3#3#3#4.S.S.S.S.S.S#5#6#7#7#7#8#3#3#9a.QtQtQtQt",
+"QtQtQtQta#aaabacabacabad.S.S.S.S.Saeafagagagagahacacaaa#QtQtQtQt",
+"QtQtQtQt#3aiajakalakaman.S.S.S.S.Saoapaqaqaqaqarajajai#3QtQtQtQt",
+"QtQtQtQtasaqatauatauav.S.S.Saw.S.S.SaxayazayazaAauaBaCasQtQtQtQt",
+"QtQtQtQtaaaDaEaFaEaEaG.S.SaHaIaJ.S.SaKaLaMaMaMaNaEaOaDaaQtQtQtQt",
+"QtQtQtQtQtaqaPaQaRaSaT.S.SaUaRaVaW.S.SaXaYaZa0aZa1aPaCQtQtQtQtQt",
+"QtQtQtQtQta2a3a4a5a4a6.S.Sa7a8a4a9b..S.Sb#baa4a4a4a3bbQtQtQtQtQt",
+"QtQtQtQtQtQtbcbdbebfbg.S.Sbhbibibjbk.S.S.SblbmbnbdbcQtQtQtQtQtQt",
+"QtQtQtQtQtQtaEbobpbqbr.Sb.bsbtbububvbw.S.SbxbybzbAaEQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtaPbBbCbDbEbFbGbGbHbHbGbIbJbFbKbLbMbNQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtbObPbQbRbSbTbTbUbUbVbVbWbXbYbZb0QtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtb1b2bYb3b4b5b6b6b7b8b9c.c#caQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtcbcccdcecfcgchcibQcjckQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtclcmcncocpcqQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
+"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"};

=== removed file 'packaging/klash.xpm'
--- a/packaging/klash.xpm       2008-10-25 17:41:38 +0000
+++ b/packaging/klash.xpm       1970-01-01 00:00:00 +0000
@@ -1,310 +0,0 @@
-/* XPM */
-static char *dummy[]={
-"32 32 275 2",
-".A c #152c41",
-".L c #162d42",
-".K c #172e43",
-".X c #182f45",
-".M c #192f45",
-".N c #1a2f45",
-".p c #1a3045",
-".O c #1a3046",
-".Y c #1c3248",
-".Z c #1d3349",
-".0 c #1e344a",
-".W c #1f354a",
-"#m c #20364b",
-".9 c #21364c",
-".8 c #21374c",
-"#. c #23384e",
-"#l c #23394e",
-"#a c #24394e",
-"## c #24394f",
-"#n c #253a4f",
-"#y c #253a50",
-".z c #263b4f",
-"#b c #273c51",
-"#x c #283e52",
-"#z c #293d52",
-"#o c #293d53",
-"#p c #293e53",
-"#q c #2b3f54",
-"#A c #2e4257",
-"#B c #2e4258",
-"#E c #2f4358",
-"#u c #304459",
-"#t c #314459",
-"#H c #34475c",
-"#P c #35485d",
-".B c #36495c",
-"#1 c #36495d",
-"a. c #36495e",
-".q c #374a5c",
-"#Q c #374a5f",
-".1 c #384b5e",
-"#R c #394c61",
-"#0 c #3a4d62",
-"a# c #3b4e62",
-"#Z c #3c4e63",
-"#c c #3d4f62",
-"#Y c #3d5064",
-"#2 c #3e5064",
-"#9 c #3e5065",
-"#3 c #3f5166",
-"as c #405267",
-"#8 c #405367",
-"#O c #40566c",
-"#L c #41586f",
-"#F c #415971",
-"#7 c #425368",
-"aa c #435569",
-"#k c #44627a",
-"ab c #45566a",
-"ac c #45566b",
-"#f c #455769",
-"#g c #45576a",
-"ah c #46576c",
-"ag c #47586d",
-"#I c #486179",
-"ai c #495a6e",
-".P c #495b6b",
-"#h c #495c6e",
-".y c #4a5b6c",
-"ak c #4a5c70",
-"al c #4b5b70",
-"aj c #4b5c70",
-".f c #4c5d6d",
-"ar c #4c5d71",
-"aC c #4d5d72",
-"aq c #4d5e72",
-"am c #4e6075",
-"aD c #4f5f73",
-"aB c #506074",
-"au c #506075",
-"at c #506175",
-"ap c #506176",
-".7 c #516272",
-"aA c #526276",
-"a2 c #526277",
-"bb c #526377",
-"az c #536277",
-"ay c #536377",
-".# c #556574",
-"#S c #557189",
-"aO c #566579",
-"aF c #56657a",
-"aE c #56667a",
-"av c #56687e",
-"bc c #57667a",
-"aN c #57677b",
-"aM c #58687c",
-"aP c #5a6a7e",
-"a0 c #5b6a7d",
-"aZ c #5b6a7e",
-"aQ c #5b6b7e",
-"aR c #5b6b7f",
-"a1 c #5c6a7e",
-"aS c #5c6b7e",
-"a3 c #5c6b7f",
-".r c #5c6c7b",
-"af c #5d778e",
-"bN c #5e6d80",
-"#D c #5e7f99",
-"a8 c #606e82",
-"a5 c #606f82",
-"a4 c #616f83",
-"bo c #617084",
-"aV c #617388",
-"#K c #61829c",
-"bA c #627184",
-"ba c #627186",
-".o c #637281",
-".e c #647280",
-"bd c #647286",
-".J c #647382",
-".2 c #657482",
-"bO c #657589",
-"#6 c #65829b",
-".a c #667482",
-"be c #667588",
-"bn c #677488",
-".g c #677683",
-".6 c #677684",
-"aY c #677c93",
-"bf c #68768a",
-"aI c #688097",
-"#U c #6889a4",
-"bj c #69768b",
-"bm c #69778a",
-"#i c #69869e",
-"bi c #6a778b",
-"aG c #6a839b",
-"bB c #6b798c",
-"aL c #6b849b",
-"bp c #6c7a8d",
-"b0 c #6d7b8d",
-".5 c #6d8091",
-".d c #6e7c89",
-"bz c #6e7c8f",
-"b1 c #707e90",
-".V c #717f8c",
-"bM c #717f91",
-"#d c #7192ab",
-"bq c #728094",
-"#X c #7397b3",
-"#4 c #7497b3",
-"by c #758296",
-"ca c #758393",
-".b c #778490",
-"bu c #78869a",
-"a9 c #7892ab",
-"bP c #798598",
-"bt c #79869a",
-"ck c #798796",
-".c c #7a8692",
-".n c #7b8793",
-"bv c #7b8b9f",
-"#v c #7ba3c0",
-"#j c #7ca3c0",
-"bC c #7d8a9d",
-"#s c #7ea6c4",
-"b2 c #7f8c9e",
-"aT c #7fa0bb",
-"ax c #7fa1bd",
-"cl c #808d9e",
-"bk c #819cb6",
-"bh c #819db7",
-"cm c #828f9f",
-"c# c #8390a0",
-"bL c #8490a3",
-".3 c #84a3bb",
-"#N c #84aecc",
-"cp c #8591a2",
-"bs c #859db4",
-"cq c #8692a2",
-"bl c #86a5c0",
-"ad c #86aecc",
-"bZ c #8793a3",
-"cn c #8894a5",
-"cj c #8995a5",
-"co c #8995a6",
-"cb c #8996a7",
-"bx c #89a4bd",
-"ao c #89b1cf",
-".h c #8a95a0",
-".x c #8a96a0",
-"cc c #8a96a8",
-"bD c #8a99ad",
-"#r c #8bb7d7",
-".Q c #8c97a2",
-"bK c #8c99ab",
-".U c #8d98a3",
-"bH c #8d9aae",
-"bG c #8d9bae",
-"a6 c #8db3d0",
-"bI c #8f9eb2",
-"aw c #8fb9d7",
-"#G c #8fbcdc",
-"bE c #90a2b6",
-"bQ c #919dae",
-"bF c #91a2b7",
-"bJ c #92a2b8",
-".R c #93a4b2",
-".T c #93a6b5",
-"b# c #93bcdb",
-"ae c #93bfdf",
-"#e c #94c1e1",
-"#C c #96c5e6",
-"aU c #97c2e2",
-"a7 c #97c3e2",
-"aJ c #98c4e4",
-"bY c #99a5b6",
-"an c #99c8e9",
-"#M c #99c9ea",
-"bR c #9aa6b9",
-"bT c #9ba9bc",
-"bU c #9ba9bd",
-"cd c #9ca7b7",
-"bS c #9ca9bc",
-"bV c #9ca9bd",
-"bw c #9cc4e3",
-"br c #9cc6e6",
-"bX c #9da9bc",
-"bW c #9da9bd",
-"aW c #9eceef",
-"#V c #9fd0f2",
-"#w c #9fd1f3",
-"bg c #a0cff0",
-"#5 c #a0d2f4",
-".4 c #a1d2f3",
-".C c #a2abb4",
-"ci c #a2adbc",
-"b3 c #a2aec0",
-"b6 c #a2b0c3",
-"c. c #a3aebd",
-"b5 c #a3b0c3",
-"b7 c #a3b1c4",
-"#J c #a3d5f8",
-".m c #a4adb5",
-"ce c #a4aebe",
-"b4 c #a4b0c2",
-"aX c #a4d6f8",
-"aK c #a4d7f9",
-"b8 c #a5b2c4",
-"ch c #a7b1c1",
-"cf c #a7b2c2",
-"b9 c #a7b2c3",
-"#T c #a7dafd",
-"aH c #a7dbfd",
-"#W c #a7dbfe",
-"cg c #a8b2c2",
-"b. c #a8dbfe",
-".S c #a8dcff",
-".I c #b1b9c0",
-".D c #b5bcc3",
-".H c #b5bcc4",
-".E c #b5bdc4",
-".G c #b6bcc4",
-".F c #b6bdc4",
-".s c #bcc2c8",
-".i c #bec5cb",
-".l c #cbd0d5",
-".w c #ced2d7",
-".t c #d8dce0",
-".j c #dadde1",
-".v c #dadee1",
-".u c #dbdee2",
-".k c #dfe2e5",
-"Qt c #ffffff",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQt.#.a.b.c.d.eQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQt.f.g.h.i.j.k.l.m.n.oQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQt.p.q.r.s.t.u.u.u.u.v.w.x.y.zQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQt.A.A.B.C.D.E.E.F.G.H.F.H.I.J.K.LQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQt.M.N.O.P.Q.R.S.S.S.T.U.U.U.U.V.W.p.XQtQtQtQtQtQtQt",
-"QtQtQtQtQtQt.Y.Z.0.W.1.2.3.S.S.4.5.6.6.6.6.7.8.0.Z.YQtQtQtQtQtQt",
-"QtQtQtQtQtQt.9#.###a#b#c#d.S.S#e#f#g#g#h#i#j#k###l#mQtQtQtQtQtQt",
-"QtQtQtQtQt#n#b#o#p#p#p#q#r.S.S#s#t#u#u#v.S.S#w#p#x#b#yQtQtQtQtQt",
-"QtQtQtQtQt#z#A#B#B#B#B#B#C.S.S#D#E#F#C.S.S.S#G#E#B#A#zQtQtQtQtQt",
-"QtQtQtQt#q#u#H#H#H#H#H#I#J.S.S#K#L#M.S.S.S#N#O#P#H#H#u#qQtQtQtQt",
-"QtQtQtQt#E#Q#R#R#R#R#R#S.S.S#T#U#V.S.S#W#X#Y#Z#0#R#R#Q#EQtQtQtQt",
-"QtQtQtQt#1#2#3#3#3#3#3#4.S.S.S.S.S.S#5#6#7#7#7#8#3#3#9a.QtQtQtQt",
-"QtQtQtQta#aaabacabacabad.S.S.S.S.Saeafagagagagahacacaaa#QtQtQtQt",
-"QtQtQtQt#3aiajakalakaman.S.S.S.S.Saoapaqaqaqaqarajajai#3QtQtQtQt",
-"QtQtQtQtasaqatauatauav.S.S.Saw.S.S.SaxayazayazaAauaBaCasQtQtQtQt",
-"QtQtQtQtaaaDaEaFaEaEaG.S.SaHaIaJ.S.SaKaLaMaMaMaNaEaOaDaaQtQtQtQt",
-"QtQtQtQtQtaqaPaQaRaSaT.S.SaUaRaVaW.S.SaXaYaZa0aZa1aPaCQtQtQtQtQt",
-"QtQtQtQtQta2a3a4a5a4a6.S.Sa7a8a4a9b..S.Sb#baa4a4a4a3bbQtQtQtQtQt",
-"QtQtQtQtQtQtbcbdbebfbg.S.Sbhbibibjbk.S.S.SblbmbnbdbcQtQtQtQtQtQt",
-"QtQtQtQtQtQtaEbobpbqbr.Sb.bsbtbububvbw.S.SbxbybzbAaEQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtaPbBbCbDbEbFbGbGbHbHbGbIbJbFbKbLbMbNQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtbObPbQbRbSbTbTbUbUbVbVbWbXbYbZb0QtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtb1b2bYb3b4b5b6b6b7b8b9c.c#caQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtcbcccdcecfcgchcibQcjckQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtclcmcncocpcqQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"};

=== modified file 'packaging/redhat/gnash.spec'
--- a/packaging/redhat/gnash.spec       2008-09-12 21:18:45 +0000
+++ b/packaging/redhat/gnash.spec       2008-10-25 17:48:00 +0000
@@ -1,7 +1,7 @@
-%define version 0.8.3
 Name:           gnash
-Version:        %{version}
-Release:        1%{?dist}
+Version:        20081024
+Release:        1
+Distribution:  fc9
 Summary:        GNU SWF player
 
 Group:          Applications/Multimedia
@@ -9,26 +9,27 @@
 Packager:      Rob Savoye <address@hidden>
 License:        GPLv3
 URL:            http://www.gnu.org/software/gnash/
-Source0:        
http://www.gnu.org/software/gnash/releases/%{name}-%{version}.tar.gz
+Source0:        
http://www.getgnash.org/packages/snapshots/fedora/%{name}_%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-%{_target_cpu}
 
+
 #AutoReqProv: no
 
 BuildRequires:  libpng-devel libjpeg-devel libogg-devel
 BuildRequires:  gtk2-devel libX11-devel libXt-devel glib2-devel
 BuildRequires:  cairo-devel atk-devel pango-devel
 BuildRequires:  agg-devel libxml2-devel boost-devel curl-devel libXt-devel
-# the opengl devel packages are required by monolithic Xorg
-BuildRequires:  xorg-x11-proto-devel gtkglext-devel
-BuildRequires:  libGLU-devel libGL-devel
-BuildRequires:  SDL-devel
-BuildRequires:  kdelibs-devel kdebase-devel qt-devel
+BuildRequires:  xorg-x11-proto-devel SDL-devel
+BuildRequires:  kdelibs3-devel kdebase3-devel qt3-devel
 BuildRequires:  gstreamer >= 0.10, gstreamer-ffmpeg
 
 # Installation requirements
-Requires: gstreamer >= 0.10
-Requires: gstreamer-plugins-base, gstreamer-plugins-ugly, gstreamer-plugins-bad
-Requires: gtk2 libX11 libpng libjpeg cairo atk pango Xt
+Requires: libpng libjpeg libogg
+Requires: gtk2 libX11 libXt glib2 cairo atk pango
+Requires: agg libxml2 boost libcurl libXt SDL
+Requires: gstreamer >= 0.10  gstreamer-ffmpeg
+Requires: gstreamer-plugins-base
+#Requires: xorg-x11-proto kdelibs3 kdebase3 qt3
 
 # BuildRequires:  scrollkeeper
 
@@ -142,7 +143,7 @@
        --disable-rpath \
        --with-plugindir=%{_libdir}/mozilla/plugins
 
-make %{?_smp_mflags} dumpconfig all
+make %{?_smp_mflags} $(MAKEFLAGS) dumpconfig all
 %else
 ./configure \
        $CROSS_OPTS \
@@ -151,20 +152,19 @@
        --disable-dependency-tracking \
        --disable-rpath \
        --disable-cygnal \
-        --prefix=/usr \
-       --mandir=/usr/share/man \
-       --infodir=/usr/share/info \
-       --disable-static \
        --enable-shared \
        --disable-testsuite \
-       --with-plugindir=%{_libdir}/mozilla/plugins \
+        --prefix=/usr \
+       --mandir=%{_prefix}/share/man \
+       --infodir=%{_prefix}/share/info \
+       --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
         --with-kde-plugindir=%{_libdir}/kde3 \
-        --with-kde-servicesdir=${datadir}/services \
-        --with-kde-configdir=${datadir}/config \
-        --with-kde-appsdatadir=${datadir}/apps \
-        --with-kde-pluginprefix=/usr
+        --with-kde-pluginprefix=%{_prefix} \
+        --with-kde-servicesdir=%{_prefix}/share/services \
+        --with-kde-appsdatadir=%{_prefix}/share/apps/klash \
+        --with-kde-configdir=${_datadir}/config
 
-make dumpconfig all
+make $(MAKEFLAGS) dumpconfig all
 %endif
 
 %install
@@ -208,10 +208,10 @@
 %{_bindir}/gtk-gnash
 %{_bindir}/gprocessor
 %{_bindir}/soldumper
+%{_bindir}/flvdumper
 %{_bindir}/dumpshm
 %{_libdir}/gnash/*.so*
 %{_libdir}/mozilla/plugins/*.so
-%{_prefix}/include/ltdl.h
 %{_prefix}/share/gnash/GnashG.png
 %{_prefix}/share/gnash/gnash_128_96.ico
 %{_datadir}/man/man1/*.1*
@@ -239,9 +239,9 @@
 %if !%{cross_compile}
 %{_bindir}/kde-gnash
 %{_libdir}/kde3/libklashpart.*
-%{_datadir}/apps/klash/klashpartui.rc
-%{_datadir}/apps/klash/pluginsinfo
-%{_datadir}/services/klash_part.desktop
+%{_prefix}/share/apps/klash/klashpartui.rc
+%{_prefix}/share/apps/klash/pluginsinfo
+%{_prefix}/share/services/klash_part.desktop
 %endif
 
 # %files cygnal
@@ -249,6 +249,9 @@
 # %{_bindir}/cygnal
 
 %changelog
+* Sat Oct 24 2008 Rob Savoye <address@hidden> - trunk
+- Adjust dependencies for current bzr trunk
+
 * Sat Feb  16 2008 Rob Savoye <address@hidden> - %{version}-%{release}
 - Adjust dependencies for current cvs HEAD
 

=== modified file 'packaging/rpm.am'
--- a/packaging/rpm.am  2008-02-07 03:20:44 +0000
+++ b/packaging/rpm.am  2008-10-25 17:48:00 +0000
@@ -22,11 +22,22 @@
 #      rpmbuild -rcfile=$(srcdir)/packaging/redhat/rpmrc:/usr/lib/rpm/rpmrc \
 #               -ba --target=geode-olpc /usr/src/redhat/SPECS/gnash.spec
 
+RPMBUILD_FLAGS = --clean --rmsource --rmspec
+
+spec: $(srcdir)/packaging/redhat/gnash.spec
+       @echo "Editing the version in the spec file ..."
+       address@hidden "+%Y%m%d"`; \
+       pkgname="gnash-trunk_$${now}"; \
+       snapshot_tar="$${pkgname}.tar.gz"; \
+       sed -e "s/Version.*/Version:    $${now}/" 
$(srcdir)/packaging/redhat/gnash.spec > gnash.spec;
+
 # Build an Redhat/Fedora .rpm package
-rpm redhat: dist-gzip $(srcdir)/packaging/redhat/gnash.spec
-       cp -f $(srcdir)/packaging/redhat/gnash.spec /usr/src/redhat/SPECS/
-       cp -f gnash-$(VERSION).tar.gz /usr/src/redhat/SOURCES/
-       rpmbuild -ba /usr/src/redhat/SPECS/gnash.spec
+rpm redhat: snapshot spec
+       address@hidden "+%Y%m%d"`; \
+       pkgname="gnash-trunk_$${now}"; \
+       snapshot_tar="$${pkgname}.tar.gz"; \
+       cp $${snapshot_tar} /usr/src/redhat/SOURCES/gnash_$${npw}.tar.gz
+       rpmbuild -ba $(RPMBUILD_FLAGS) gnash.spec
 
 .PHONY : rpm redhat
 

=== modified file 'packaging/snapshot.am'
--- a/packaging/snapshot.am     2008-08-17 18:18:16 +0000
+++ b/packaging/snapshot.am     2008-10-24 23:00:19 +0000
@@ -35,8 +35,8 @@
 # '20080202trunk'
 snapshot: distdir
        address@hidden "+%Y%m%d"`; \
-       pkgname="gnash-$${now}trunk"; \
-       snapshot_dir="$${pkgname}"; \
+       pkgname="gnash-trunk_$${now}"; \
+       snapshot_dir="gnash-$${now}"; \
        snapshot_tar="$${pkgname}.tar.gz"; \
        if test -d $${snapshot_dir}; then \
          rm -fr $${snapshot_dir}; \
@@ -44,7 +44,7 @@
        mv -f gnash-trunk $${snapshot_dir}; \
        if test ! -f $${snapshot_dir}/configure.ac.orig; then \
          mv -f $${snapshot_dir}/configure.ac 
$${snapshot_dir}/configure.ac.orig; \
-         sed -e "s/AC_INIT(gnash, trunk)/AC_INIT(gnash, $${now}trunk)/" \
+         sed -e "s/AC_INIT(gnash, trunk)/AC_INIT(gnash, trunk-$${now})/" \
            $${snapshot_dir}/configure.ac.orig > $${snapshot_dir}/configure.ac; 
\
          cd $${snapshot_dir} ; ./autogen.sh; cd .. ;\
        fi; \
@@ -122,14 +122,6 @@
        strip $${snapshot_tmp}/bin/soldumper; \
        tar zcvCf /tmp $${snapshot_tar} $${pkgname}
 
-snapshot-rpm: snapshot $(srcdir)/packaging/redhat/gnash.spec
-       address@hidden -f /usr/src/redhat/SPECS/gnash.spec
-       now=`date "+%Y%m%d"`; \
-       pkgname="gnash-$${now}trunk"; \
-       snapshot_tar="$${pkgname}.tar.gz"; \
-       sed -e "s:%define version .*:%define version $${now}:" 
$(srcdir)/packaging/redhat/gnash.spec > /usr/src/redhat/SPECS/gnash.spec; \
-       cp $${snapshot_tar} /usr/src/redhat/SOURCES/
-       rpmbuild -ba --clean --rmsource --rmspec 
/usr/src/redhat/SPECS/gnash.spec
 
 snapshot-clean:
        address@hidden -fr snapshot-* $(SNAPSHOT_BUILD) $(SNAPSHOT_TMP) 
gnash*$(VERSION)*.ipk

=== modified file 'plugin/klash/Makefile.am'
--- a/plugin/klash/Makefile.am  2008-10-20 12:27:06 +0000
+++ b/plugin/klash/Makefile.am  2008-10-24 23:00:19 +0000
@@ -99,9 +99,7 @@
        $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) 
$(plugin_LTLIBRARIES) $(DESTDIR)$(plugindir)
 
 uninstall-plugin uninstall-plugins: 
-       $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.so
-       $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.la
-       $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.a
+       $(RM) -f $(DESTDIR)$(plugindir)/libklashpart.*
 
 endif