[Gnash-commit] /srv/bzr/gnash/trunk r11723: fix various packaging problems with the debs we build.

[Rob Savoye]

------------------------------------------------------------
revno: 11723
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sun 2009-12-20 13:44:07 -0700
message:
  fix various packaging problems with the debs we build.
removed:
  packaging/debian/klash.links
  packaging/debian/libgnash0.dirs
  packaging/debian/libgnash0.install
modified:
  packaging/debian/control
  packaging/debian/gnash-common.install
  packaging/debian/gnash-dev.install
  packaging/debian/gnash-tools.install
  packaging/debian/klash.install
  packaging/debian/mozilla-plugin-gnash.dirs
  packaging/debian/mozilla-plugin-gnash.postinst
  packaging/debian/mozilla-plugin-gnash.prerm

=== modified file 'packaging/debian/control'
--- a/packaging/debian/control  2009-12-18 23:29:13 +0000
+++ b/packaging/debian/control  2009-12-20 20:44:07 +0000
@@ -1,7 +1,7 @@
 Source: gnash
 Priority: optional
 Maintainer: Rob Savoye <address@hidden>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), autoconf, 
automake, libtool, libltdl3-dev, libxmu-dev, dejagnu, autotools-dev, 
libjpeg-dev, libpng12-dev | libpng-dev, libagg-dev, libpango1.0-dev | 
pango-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | 
libcurl3-openssl-dev, libboost1.40-dev | libboost1.39-dev | libboost1.38-dev | 
libboost1.37-dev | libboost1.36-dev | libboost1.35-dev | libboost1.34.1-dev | 
libboost-dev, libboost-thread1.40-dev | libboost-thread1.39-dev | 
libboost-thread1.38-dev | libboost-thread1.37-dev | libboost-thread1.36-dev | 
libboost-thread1.35-dev | libboost-thread1.34.1-dev | libboost-thread-dev, 
libboost-date-time1.40-dev | libboost-date-time1.39-dev | 
libboost-date-time1.38-dev | libboost-date-time1.37-dev | 
libboost-date-time1.36-dev | libboost-date-time1.35-dev | 
libboost-date-time1.34.1-dev | libboost-date-time-dev
+Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), autoconf, 
automake, libtool, libltdl3-dev, libxmu-dev, dejagnu, autotools-dev, 
libjpeg-dev, libpng12-dev | libpng-dev, libagg-dev, libpango1.0-dev | 
pango-dev, libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | 
libcurl3-openssl-dev, libboost1.40-dev | libboost1.39-dev | libboost1.38.0-dev 
| libboost1.37-dev | libboost1.36-dev | libboost1.35-dev | libboost1.34.1-dev | 
libboost-dev, libboost-thread1.40-dev | libboost-thread1.39-dev | 
libboost-thread1.38.0-dev | libboost-thread1.37-dev | libboost-thread1.36-dev | 
libboost-thread1.35-dev | libboost-thread1.34.1-dev | libboost-thread-dev, 
libboost-date-time1.40-dev | libboost-date-time1.39-dev | 
libboost-date-time1.38.0-dev | libboost-date-time1.37-dev | 
libboost-date-time1.36-dev | libboost-date-time1.35-dev | 
libboost-date-time1.34.1-dev | libboost-date-time-dev, libgtk2.0-dev, 
libpango1.0-dev, libatk1.0-dev, python2.6-dev | python2.5-dev | python2.4-dev, 
kdelibs5-dev
 Standards-Version: 3.7.2
 Section: utils
 
@@ -9,13 +9,13 @@
 Architecture: any
 Section: libdevel
 Priority: extra
-Depends: gnash (= ${binary:Version})
+Depends: gnash-common (= ${binary:Version})
 Description: Debug symbols for Gnash.
 
 Package: gnash-common
 Section: libs
 Architecture: any
-Depends: ${misc:Depends}, libgstreamer-plugins-base0.10-0, libgstreamer0.10-0, 
libxml2, libgif4, libfreetype6, zlib1g, libstdc++6, libcairo2, libexpat1, 
libfontconfig1, libx11-6, libbz2-1.0, libboost-thread1.40 | libboost-thread1.39 
| libboost-thread1.38 | libboost-thread1.37 | libboost-thread1.36 | 
libboost-thread1.35 | libboost-thread1.34.1 | libboost-thread, 
libboost-date-time1.40.0 | libboost-date-time1.39 | libboost-date-time1.38 | 
libboost-date-time1.37 | libboost-date-time1.36 | libboost-date-time1.35 |  
libboost-date-time1.34 | libboost-date-time
+Depends: ${misc:Depends}, libgstreamer-plugins-base0.10-0, libgstreamer0.10-0, 
libxml2, libgif4, libfreetype6, zlib1g, libstdc++6, libcairo2, libexpat1, 
libfontconfig1, libx11-6, libbz2-1.0, libboost-thread1.40.0 | 
libboost-thread1.39 | libboost-thread1.38.0 | libboost-thread1.37 | 
libboost-thread1.36 | libboost-thread1.35.0 | libboost-thread1.34.1 | 
libboost-thread, libboost-date-time1.40.0 | libboost-date-time1.39 | 
libboost-date-time1.38.0 | libboost-date-time1.37 | libboost-date-time1.36 | 
libboost-date-time1.35.0 |  libboost-date-time1.34.1 | libboost-date-time
 #Suggests: gstreamer0.10-fluendo-mp3  gstreamer0.10-alsa gstreamer0.10-ffmpeg
 Conflicts: libgnash0 (<< 0.8.5~), gnash (<< 0.8.5~), libklash0 (<< 0.8.5~)
 Replaces: libgnash0 (<< 0.8.5~), gnash (<< 0.8.5~), libklash0 (<< 0.8.5~)
@@ -48,7 +48,7 @@
 Package: klash
 Section: utils
 Architecture: any
-Depends: gnash-common (= ${binary:Version}), ${misc:Depends}, kdelibs5,  
libboost1.40-dev | libboost1.39-dev | libboost1.38-dev | libboost1.37-dev | 
libboost1.36-dev | libboost1.35-dev | libboost1.34.1-dev | libboost-dev, 
libboost-thread1.40-dev | libboost-thread1.39-dev | libboost-thread1.38-dev | 
libboost-thread1.37-dev | libboost-thread1.36-dev | libboost-thread1.35-dev | 
libboost-thread1.34.1-dev | libboost-thread-dev , libboost-date-time1.40 |  
libboost-date-time1.39 |  libboost-date-time1.38 | libboost-date-time1.37 | 
libboost-date-time1.36 | libboost-date-time1.35 | libboost-date-time1.34.1 | 
libboost-date-time
+Depends: gnash-common (= ${binary:Version}), ${misc:Depends}, kdelibs5
 Description: free SWF movie player - standalone player for KDE
  Gnash is a free Flash movie player, which works either standalone, or as
  plugin for Firefox/Mozilla or Konqueror. Currently it is in a alpha state.
@@ -71,7 +71,7 @@
 Package: gnash-tools
 Section: utils
 Architecture: any
-Depends: gnash-common (= ${binary:Version}), ${misc:Depends}, 
libboost-thread1.40.0 | libboost-thread1.39.0 | libboost-thread1.38.0 | 
libboost-thread1.37.0 | libboost-thread1.36.0 | libboost-thread1.35.0 | 
libboost-thread1.34.1 | libboost-thread, libboost-date-time1.40.0 | 
libboost-date-time1.39.0 | libboost-date-time1.38.0 | libboost-date-time1.37.0 
| libboost-date-time1.36.0 | libboost-date-time1.35.0 | 
libboost-date-time1.34.1 | libboost-date-time
+Depends: gnash-common (= ${binary:Version}), ${misc:Depends}, allDepends: 
gnash-common
 Description: free SWF movie player - Command-line Tools
  Gnash is a free Flash movie player, which works either standalone, or as
  plugin for Firefox/Mozilla or Konqueror. Currently it is in a alpha state.
@@ -117,7 +117,7 @@
 Package: mozilla-plugin-gnash
 Section: utils
 Architecture: any
-Depends: gnash (= ${binary:Version}), ${misc:Depends}, libgtk2.0-0, 
libpango1.0-0, libatk1.0-0
+Depends: gnash-common (= ${binary:Version}), , gnash (= ${binary:Version}), 
${misc:Depends}, libgtk2.0-0, libpango1.0-0, libatk1.0-0
 Xb-Npp-Applications: 
ec8030f7-c20a-464f-9b0e-13a3a9e97384,92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a,aa5ca914-c309-495d-91cf-3141bbb04115
 Xb-Npp-MimeType: application/x-shockwave-flash
 Xb-Npp-Name: Gnash SWF Player
@@ -132,7 +132,7 @@
 Package: konqueror-plugin-gnash
 Section: utils
 Architecture: any
-Depends: klash (= ${binary:Version}), ${misc:Depends}, kdelibs5
+Depends: gnash-common (= ${binary:Version}), klash (= ${binary:Version}), 
${misc:Depends}, kdelibs5
 Description: free SWF movie player - Plugin for Konqueror
  Gnash is a free Flash movie player, which works either standalone, or as
  plugin for Firefox/Mozilla or Konqueror.
@@ -144,7 +144,7 @@
 Package: gtk-plugin-gnash
 Section: libs
 Architecture: any
-Depends: gnash (= ${binary:Version}), ${misc:Depends}, python2.6-dev | 
python2.5-dev | python2.4-dev
+Depends: gnash-common (= ${binary:Version}), ${misc:Depends}, python2.6-dev | 
python2.5-dev | python2.4-dev, allDepends: gnash-common, gnash
 Xb-Npp-Applications: 
ec8030f7-c20a-464f-9b0e-13a3a9e97384,92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a,aa5ca914-c309-495d-91cf-3141bbb04115
 Xb-Npp-MimeType: application/x-shockwave-flash
 Xb-Npp-Name: Gnash SWF Player

=== modified file 'packaging/debian/gnash-common.install'
--- a/packaging/debian/gnash-common.install     2008-10-24 15:18:26 +0000
+++ b/packaging/debian/gnash-common.install     2009-12-20 20:44:07 +0000
@@ -1,9 +1,4 @@
-usr/lib/gnash/libgnashamf-*.so
-usr/lib/gnash/libgnashbase-*.so
-usr/lib/gnash/libgnashcore-*.so
-usr/lib/gnash/libgnashmedia-*.so
-usr/lib/gnash/libgnashnet-*.so
-
+usr/lib/gnash/libgnash*.so*
 usr/bin/gnash
 usr/share/man/man1/gnash.1
 usr/share/gnash/

=== modified file 'packaging/debian/gnash-dev.install'
--- a/packaging/debian/gnash-dev.install        2008-03-03 04:34:32 +0000
+++ b/packaging/debian/gnash-dev.install        2009-12-20 20:44:07 +0000
@@ -1,6 +1,5 @@
 usr/include
 usr/lib/gnash/lib*.a
-usr/lib/gnash/lib*[a-z].so
 usr/lib/gnash/*.la
 usr/lib/pkgconfig/*
 usr/share/pkgconfig/*

=== modified file 'packaging/debian/gnash-tools.install'
--- a/packaging/debian/gnash-tools.install      2008-03-03 04:34:32 +0000
+++ b/packaging/debian/gnash-tools.install      2009-12-20 20:44:07 +0000
@@ -1,3 +1,6 @@
 usr/bin/gprocessor
 usr/bin/soldumper
 usr/bin/dumpshm
+usr/bin/flvdumper
+usr/bin/findwebcams
+usr/bin/findmicrophones

=== modified file 'packaging/debian/klash.install'
--- a/packaging/debian/klash.install    2009-02-15 00:33:12 +0000
+++ b/packaging/debian/klash.install    2009-12-20 20:44:07 +0000
@@ -1,4 +1,3 @@
 usr/bin/kde4-gnash
-usr/bin/gnash
 usr/share/pixmaps/klash.xpm
 usr/share/applications/klash.desktop

=== removed file 'packaging/debian/klash.links'
--- a/packaging/debian/klash.links      2009-02-15 00:33:12 +0000
+++ b/packaging/debian/klash.links      1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/bin/kde4-gnash usr/bin/gnash

=== removed file 'packaging/debian/libgnash0.dirs'
--- a/packaging/debian/libgnash0.dirs   2006-04-08 03:09:44 +0000
+++ b/packaging/debian/libgnash0.dirs   1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib

=== removed file 'packaging/debian/libgnash0.install'
--- a/packaging/debian/libgnash0.install        2006-04-08 03:09:44 +0000
+++ b/packaging/debian/libgnash0.install        1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/lib*.so.*

=== modified file 'packaging/debian/mozilla-plugin-gnash.dirs'
--- a/packaging/debian/mozilla-plugin-gnash.dirs        2009-12-11 03:29:00 
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.dirs        2009-12-20 20:44:07 
+0000
@@ -1,7 +1,5 @@
-usr/lib/iceape/plugins
 usr/lib/iceweasel/plugins
-usr/lib*/mozilla/plugins
+usr/lib/mozilla/plugins
 usr/lib/firefox/plugins
 usr/lib/xulrunner/plugins
 usr/lib/midbrowser/plugins
-

=== modified file 'packaging/debian/mozilla-plugin-gnash.postinst'
--- a/packaging/debian/mozilla-plugin-gnash.postinst    2009-02-15 00:33:12 
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.postinst    2009-12-20 20:44:07 
+0000
@@ -4,18 +4,18 @@
 
 case "$1" in
         configure)
-                     for p in iceape iceweasel mozilla firefox xulrunner 
midbrowser; do 
-                                               update-alternatives --install 
"/usr/lib/$p/plugins/flashplugin-alternative.so" "$p-flashplugin" 
/usr/lib/mozilla/plugins/libgnashplugin.so 50;
-                                       done
+         for p in iceweasel mozilla firefox xulrunner midbrowser; do 
+           update-alternatives --install 
"/usr/lib/$p/plugins/flashplugin-alternative.so" "$p-flashplugin" 
/usr/lib/mozilla/plugins/libgnashplugin.so 50;
+          done
         ;;
         abort-upgrade|abort-remove|abort-deconfigure)
-                echo "postinst called with argument \`$1'" >&2
-                exit 1
+            echo "postinst called with argument \`$1'" >&2
+            exit 1
         ;;
 
         *)
-                echo "postinst called with unknown argument \`$1'" >&2
-                exit 1
+            echo "postinst called with unknown argument \`$1'" >&2
+            exit 1
         ;;
 esac
 

=== modified file 'packaging/debian/mozilla-plugin-gnash.prerm'
--- a/packaging/debian/mozilla-plugin-gnash.prerm       2009-02-15 00:33:12 
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.prerm       2009-12-20 20:44:07 
+0000
@@ -4,17 +4,15 @@
 
 case "$1" in
         remove|upgrade|deconfigure)
-                for p in iceape iceweasel mozilla firefox xulrunner 
midbrowser; do 
+                for p in iceweasel mozilla firefox xulrunner midbrowser; do 
                        update-alternatives --remove "$p-flashplugin" 
/usr/lib/mozilla/plugins/libgnashplugin.so;
-                        [ `update-alternatives --list "$p-flashplugin" | wc 
-l` = 0 ]  && \
-                                update-alternatives --remove-all 
"$p-flashplugin"
                 done
                 ;;
         failed-upgrade)
                if dpkg --compare-versions "$2" ">>"  
0.8.1~trunk.070802-0ubuntu3 &&
                   dpkg --compare-versions "$2" "<<" 0.8.1~trunk.070802-0ubuntu5
                then 
-                  for p in iceape iceweasel mozilla firefox xulrunner 
midbrowser; do 
+                  for p in arora iceweasel mozilla firefox xulrunner 
midbrowser; do 
                         update-alternatives --remove "$p-flashplugin" 
/usr/lib/mozilla/plugins/libgnashplugin.so;
                         [ `update-alternatives --list "$p-flashplugin" | wc 
-l` = 0 ]  && \
                                 update-alternatives --remove-all 
"$p-flashplugin"