[Gnash-commit] /srv/bzr/gnash/trunk r10079: improve (but not completely fix) debian packaging

[Russell Nelson]

------------------------------------------------------------
revno: 10079
committer: Russell Nelson <address@hidden>
branch nick: trunk
timestamp: Fri 2008-10-24 11:18:26 -0400
message:
  improve (but not completely fix) debian packaging
removed:
  packaging/debian/gnash-cygnal.manpages
  packaging/debian/gnash-tools.manpages
  packaging/debian/klash.manpages
  packaging/ipkg/GnashG.xpm
modified:
  Makefile.am
  packaging/debian/gnash-common.install
  packaging/debian/mozilla-plugin-gnash.install
  packaging/debian/rules

=== modified file 'Makefile.am'
--- a/Makefile.am       2008-10-20 12:27:06 +0000
+++ b/Makefile.am       2008-10-24 15:18:26 +0000
@@ -80,13 +80,16 @@
 EXTRA_DIST =  autogen.sh \
        config.rpath \
        macros/incllist macros/libslist \
-       ChangeLog-0.8.0 ChangeLog-0.8.1 ChangeLog-0.8.2 \
+       ChangeLog-0.8.0 ChangeLog-0.8.1 ChangeLog-0.8.2 ChangeLog-0.8.3 \
+       ChangeLog-0.8.4 \
        packaging/deb.am \
        packaging/snapshot.am \
        packaging/alp.am \
-       packaging/ipkg.am
+       packaging/ipkg.am \
        packaging/bsd.am \
-       packaging/rpm.am
+       packaging/rpm.am \
+       packaging/gnash.xpm \
+       packaging/klash.xpm
 
 # dist-hook:
 #      @test -d "$(distdir)/packaging" || $(mkinstalldirs) 
"$(distdir)/packaging"

=== modified file 'packaging/debian/gnash-common.install'
--- a/packaging/debian/gnash-common.install     2008-03-03 04:34:32 +0000
+++ b/packaging/debian/gnash-common.install     2008-10-24 15:18:26 +0000
@@ -1,7 +1,8 @@
 usr/lib/gnash/libgnashamf-*.so
 usr/lib/gnash/libgnashbase-*.so
+usr/lib/gnash/libgnashcore-*.so
 usr/lib/gnash/libgnashmedia-*.so
-usr/lib/gnash/libgnashserver-*.so
+usr/lib/gnash/libgnashnet-*.so
 
 usr/bin/gnash
 usr/share/man/man1/gnash.1

=== removed file 'packaging/debian/gnash-cygnal.manpages'
--- a/packaging/debian/gnash-cygnal.manpages    2008-03-03 04:34:32 +0000
+++ b/packaging/debian/gnash-cygnal.manpages    1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/h2m/cygnal.1

=== removed file 'packaging/debian/gnash-tools.manpages'
--- a/packaging/debian/gnash-tools.manpages     2008-03-03 04:34:32 +0000
+++ b/packaging/debian/gnash-tools.manpages     1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-debian/h2m/gparser.1
-debian/h2m/gprocessor.1

=== removed file 'packaging/debian/klash.manpages'
--- a/packaging/debian/klash.manpages   2008-03-03 04:34:32 +0000
+++ b/packaging/debian/klash.manpages   1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-debian/h2m/klash.1

=== modified file 'packaging/debian/mozilla-plugin-gnash.install'
--- a/packaging/debian/mozilla-plugin-gnash.install     2008-03-03 04:34:32 
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.install     2008-10-24 15:18:26 
+0000
@@ -1,2 +1,1 @@
 usr/lib/gnash/libgnashplugin.so
-usr/share/lintian/overrides/gnash-plugin

=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules    2008-07-23 10:35:04 +0000
+++ b/packaging/debian/rules    2008-10-24 15:18:26 +0000
@@ -57,6 +57,7 @@
                --infodir=\$${prefix}/share/info \
                --enable-cygnal --enable-media=gst --enable-renderer=agg \
                --with-npapi-plugindir=\$${prefix}/lib/gnash \
+               --with-kde-pluginprefix=\$${prefix} \
                --enable-shared --disable-static --disable-testsuite \
                --disable-rpath CXXFLAGS=-O0
        @printf "\n ------------------------------------------- End of 
CONFIGURE ---- \n\n"
@@ -141,24 +142,21 @@
 
        #cd debian/h2m; $(MAKE)
 
-       install -d $(CURDIR)/debian/tmp/usr/share/lintian/overrides/
-       cp debian/overrides/* $(CURDIR)/debian/tmp/usr/share/lintian/overrides/
-
        install -d $(CURDIR)/debian/tmp/usr/include/gnash/libbase/
        cp libbase/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libbase/
-       install -d $(CURDIR)/debian/tmp/usr/include/gnash/libgeometry/
-       cp libgeometry/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libgeometry/
        install -d $(CURDIR)/debian/tmp/usr/include/gnash/libamf/
        cp libamf/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libamf/
-       install -d $(CURDIR)/debian/tmp/usr/include/gnash/server/
-       cp server/*.h $(CURDIR)/debian/tmp/usr/include/gnash/server/
+       install -d $(CURDIR)/debian/tmp/usr/include/gnash/libcore/
+       cp libcore/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libcore/
+       install -d $(CURDIR)/debian/tmp/usr/include/gnash/libmedia/
+       cp libmedia/*.h $(CURDIR)/debian/tmp/usr/include/gnash/libmedia/
        install -d $(CURDIR)/debian/tmp/usr/include/gnash/backend/
        cp backend/*.h $(CURDIR)/debian/tmp/usr/include/gnash/backend/
        install -d $(CURDIR)/debian/tmp/usr/include/gnash/gui/
        cp gui/*.h $(CURDIR)/debian/tmp/usr/include/gnash/gui/
 
        install -d $(CURDIR)/debian/tmp/usr/share/pixmaps/
-       cp debian/*.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/
+       cp packaging/*.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/
        install -d $(CURDIR)/debian/tmp/usr/share/applications/
        cp debian/*.desktop $(CURDIR)/debian/tmp/usr/share/applications/
 

=== removed file 'packaging/ipkg/GnashG.xpm'
--- a/packaging/ipkg/GnashG.xpm 2007-12-03 00:22:04 +0000
+++ b/packaging/ipkg/GnashG.xpm 1970-01-01 00:00:00 +0000
@@ -1,200 +0,0 @@
-/* XPM */
-static char * GnashG_xpm[] = {
-"32 27 170 2",
-"      c None",
-".     c #FFFFFF",
-"+     c #FDFDFD",
-"@     c #DCDCDC",
-"#     c #BDBDBD",
-"$     c #ADADAD",
-"%     c #9A9A9A",
-"&     c #7F7F7F",
-"*     c #626262",
-"=     c #545454",
-"-     c #777777",
-";     c #BABABA",
-">     c #FBFBFB",
-",     c #E9E9E9",
-"'     c #979797",
-")     c #818181",
-"!     c #848484",
-"~     c #878787",
-"{     c #898989",
-"]     c #8B8B8B",
-"^     c #8D8D8D",
-"/     c #8A8A8A",
-"(     c #5F5F5F",
-"_     c #1F1F1F",
-":     c #2B2B2B",
-"<     c #A2A2A2",
-"[     c #FEFEFE",
-"}     c #D3D3D3",
-"|     c #E8E8E8",
-"1     c #7A7A7A",
-"2     c #7D7D7D",
-"3     c #6F6F6F",
-"4     c #555555",
-"5     c #8E8E8E",
-"6     c #AEAEAE",
-"7     c #939393",
-"8     c #858585",
-"9     c #3D3D3D",
-"0     c #0D0D0D",
-"a     c #5A5A5A",
-"b     c #F4F4F4",
-"c     c #E1E1E1",
-"d     c #888888",
-"e     c #727272",
-"f     c #383838",
-"g     c #121212",
-"h     c #A5A5A5",
-"i     c #DBDBDB",
-"j     c #868686",
-"k     c #414141",
-"l     c #525252",
-"m     c #BEBEBE",
-"n     c #6A6A6A",
-"o     c #6D6D6D",
-"p     c #353535",
-"q     c #FAFAFA",
-"r     c #A9A9A9",
-"s     c #828282",
-"t     c #808080",
-"u     c #232323",
-"v     c #9F9F9F",
-"w     c #787878",
-"x     c #666666",
-"y     c #282828",
-"z     c #F8F8F8",
-"A     c #909090",
-"B     c #595959",
-"C     c #373737",
-"D     c #919191",
-"E     c #D6D6D6",
-"F     c #DEDEDE",
-"G     c #2A2A2A",
-"H     c #C5C5C5",
-"I     c #797979",
-"J     c #747474",
-"K     c #101010",
-"L     c #0F0F0F",
-"M     c #E6E6E6",
-"N     c #ECECEC",
-"O     c #FCFCFC",
-"P     c #B6B6B6",
-"Q     c #5B5B5B",
-"R     c #111111",
-"S     c #C4C4C4",
-"T     c #E7E7E7",
-"U     c #202020",
-"V     c #C2C2C2",
-"W     c #DFDFDF",
-"X     c #434343",
-"Y     c #9E9E9E",
-"Z     c #575757",
-"`     c #4B4B4B",
-" .    c #0E0E0E",
-"..    c #EFEFEF",
-"+.    c #E3E3E3",
-"@.    c #F9F9F9",
-"#.    c #717171",
-"$.    c #636363",
-"%.    c #222222",
-"&.    c #343434",
-"*.    c #E4E4E4",
-"=.    c #A6A6A6",
-"-.    c #3E3E3E",
-";.    c #181818",
-">.    c #D1D1D1",
-",.    c #333333",
-"'.    c #131313",
-").    c #696969",
-"!.    c #9B9B9B",
-"~.    c #6E6E6E",
-"{.    c #494949",
-"].    c #303030",
-"^.    c #B4B4B4",
-"/.    c #C6C6C6",
-"(.    c #EAEAEA",
-"_.    c #505050",
-":.    c #3A3A3A",
-"<.    c #767676",
-"[.    c #565656",
-"}.    c #656565",
-"|.    c #F5F5F5",
-"1.    c #F6F6F6",
-"2.    c #646464",
-"3.    c #4D4D4D",
-"4.    c #3C3C3C",
-"5.    c #EDEDED",
-"6.    c #5C5C5C",
-"7.    c #5D5D5D",
-"8.    c #242424",
-"9.    c #ABABAB",
-"0.    c #D7D7D7",
-"a.    c #4A4A4A",
-"b.    c #454545",
-"c.    c #AAAAAA",
-"d.    c #EEEEEE",
-"e.    c #969696",
-"f.    c #1D1D1D",
-"g.    c #CACACA",
-"h.    c #585858",
-"i.    c #D2D2D2",
-"j.    c #8F8F8F",
-"k.    c #464646",
-"l.    c #3B3B3B",
-"m.    c #151515",
-"n.    c #252525",
-"o.    c #C8C8C8",
-"p.    c #737373",
-"q.    c #F7F7F7",
-"r.    c #E5E5E5",
-"s.    c #191919",
-"t.    c #1B1B1B",
-"u.    c #BCBCBC",
-"v.    c #515151",
-"w.    c #BFBFBF",
-"x.    c #CDCDCD",
-"y.    c #484848",
-"z.    c #212121",
-"A.    c #1E1E1E",
-"B.    c #4F4F4F",
-"C.    c #474747",
-"D.    c #CBCBCB",
-"E.    c #424242",
-"F.    c #363636",
-"G.    c #444444",
-"H.    c #272727",
-"I.    c #B9B9B9",
-"J.    c #CFCFCF",
-"K.    c #A3A3A3",
-"L.    c #C9C9C9",
-"M.    c #D8D8D8",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . + @ # $ % & * = - ; > . . . . . . . . . . . . . . ",
-". . . . . . , ' ) ! ~ { ] ^ / ( _ : < [ . . . . . . . } + . . . ",
-". . . . . | ) 1 2 3 4 5 6 7 { / 8 9 0 a b . . . . . + % c . . . ",
-". . . . > d e e f g h . . + i % j j k 0 l + . . . . . . . . . . ",
-". . . . m n o p 0 ~ . . . . . q r s t u 0 v . . } + . . . . . . ",
-". . . [ w x = 0 y z . . . . . . q A 2 B 0 C . . D E . . . . . . ",
-". . . F ( * G 0 ) . . . . . . . . H I J K L M . N . O F . . . . ",
-". . . P Q Q R 0 S . . . . . . . . T J J U 0 V . . . W X q . . . ",
-". . . Y Z ` 0  .... . . . . + +.> @.#.$.%.&.*.. . . V 4 =.. . . ",
-". . . D = -.0 ;.> . . . . >.,.'.).!.~.{.].^.+ ^./.O . (.c . . . ",
-". . . D _.:.0 ;.q . . [ <.[.X X &.R &.}.|.1.[ 2.% [ . . . . . . ",
-". . . < 3.4.0 0 T . . 5.6.7.Q 4 [.X 8.u ;.9.. 0.. . . . . . . . ",
-". . . S a.b. .0 c.. . d.e.2.a Q 6.a = :.0 o . . . . . . . . . . ",
-". . . b 3.{.f.L X O . . . @.g.D ( h.B C 0 D . . . . . . . i.' . ",
-". . . . j.k.l.m.m.A . . . . . . i 4 4 n.0 o.. > p.q.. . . O r.. ",
-". . . . 5.l b.,.s.t.5 O . . . . u.v.l m.m.q.. . w.. . . . . . . ",
-". . . . . x.y.X C z.A.B.# q . . 7 3.C.0 b.. . . . . . . . . . . ",
-". . . . . . D.` E.k p G n.,.7.J 4 a.F.0 1 . . . . . . . . . . . ",
-". . . . . . . M <.k k E.X G.b.k.k.C.H.'.I.. . . . . . . . . . . ",
-". . . . . . . . . J.s {.k k E.X y.p.K.(.. . . . . . . . . . . . ",
-". . . . . . . . . . . > W L./.M.q.. . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "};