[Gnash-commit] /srv/bzr/gnash/trunk r11879: add Conflicts for the OpenGL packages. Edit the debian/gtk-plugin-gnash.* files to have the proper path for differing versions.

[Rob Savoye]

------------------------------------------------------------
revno: 11879
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Wed 2010-02-03 14:33:26 -0700
message:
  add Conflicts for the OpenGL packages. Edit the debian/gtk-plugin-gnash.* 
files to have the proper path for differing versions.
modified:
  packaging/deb.am
  packaging/debian/control

=== modified file 'packaging/deb.am'
--- a/packaging/deb.am  2010-01-29 20:42:02 +0000
+++ b/packaging/deb.am  2010-02-03 21:33:26 +0000
@@ -33,6 +33,17 @@
        if test -e $${snapshot_dir}/debian/changelog; then \
          mv -f $${snapshot_dir}/debian/changelog 
$${snapshot_dir}/debian/changelog.orig; \
          sed -e "s:trunk:$(SNAPSHOT_VERSION):" 
$${snapshot_dir}/debian/changelog.orig > $${snapshot_dir}/debian/changelog; \
+       fi; \
+       ubuntu=`uname -a | grep -ci ubuntu`; \
+       if test $$ubuntu -eq 1; then \
+         if test -e $${snapshot_dir}/debian/gtk-plugin-gnash.dirs; then \
+           mv -f $${snapshot_dir}/debian/gtk-plugin-gnash.dirs 
$${snapshot_dir}/debian/gtk-plugin-gnash.dirs.orig; \
+         fi; \
+         sed -e "s:python2.5/site:python2.6/dist:" 
$${snapshot_dir}/debian/gtk-plugin-gnash.dirs.orig > 
$${snapshot_dir}/debian/gtk-plugin-gnash.dirs; \
+         if test -e $${snapshot_dir}/debian/gtk-plugin-gnash.install; then \
+           mv -f $${snapshot_dir}/debian/gtk-plugin-gnash.install 
$${snapshot_dir}/debian/gtk-plugin-gnash.install.orig; \
+         fi; \
+         sed -e 's:python2.5/site:python2.6/dist:' 
$${snapshot_dir}/debian/gtk-plugin-gnash.install.orig > 
$${snapshot_dir}/debian/gtk-plugin-gnash.install; \
        fi;
 
 snapshot-deb:

=== modified file 'packaging/debian/control'
--- a/packaging/debian/control  2010-02-03 19:11:11 +0000
+++ b/packaging/debian/control  2010-02-03 21:33:26 +0000
@@ -32,6 +32,7 @@
 Depends: ${shlibs: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, gstreamer0.10-plugins-bad, gstreamer0.10-fluendo-mp3, 
gstreamer0.10-ffmpeg
 Suggests: gstreamer0.10-alsa
 Recommends: mozilla-plugin-gnash (= ${binary:Version})
+Conflicts: libgnash0 (<< 0.8.1~), gnash (<< 0.8.1~), libklash0 (<< 0.8.1~), 
gnash-common-opengl
 Description: free SWF movie player - common files/libraries
  Gnash is a free Flash movie player, which works either standalone, or as
  plugin for Firefox/Mozilla or Konqueror.
@@ -41,6 +42,7 @@
 Package: gnash
 Section: utils
 Architecture: any
+Conflicts: gnash-opengl
 Depends: ${shlibs:Depends}, gnash-common (= ${binary:Version}), , 
${misc:Depends}, libgtk2.0-0, libpango1.0-0, libatk1.0-0
 Description: free SWF movie player
  Gnash is a free Flash movie player, which works either standalone, or as
@@ -58,6 +60,7 @@
 Package: klash
 Section: utils
 Architecture: any
+Conflicts: klash-opengl
 Depends: ${shlibs: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