[Gnash-commit] /srv/bzr/gnash/trunk r11922: more formatting tweaks to be closer to Debian's, plus more comments

[Rob Savoye]

------------------------------------------------------------
revno: 11922
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Mon 2010-02-08 12:01:05 -0700
message:
  more formatting tweaks to be closer to Debian's, plus more comments
modified:
  packaging/debian/changelog
  packaging/debian/control
  packaging/debian/mozilla-plugin-gnash.dirs
  packaging/debian/mozilla-plugin-gnash.postinst
  packaging/debian/mozilla-plugin-gnash.prerm
  packaging/debian/rules
  packaging/rpm.am

=== modified file 'packaging/debian/changelog'
--- a/packaging/debian/changelog        2010-02-02 23:55:38 +0000
+++ b/packaging/debian/changelog        2010-02-08 19:01:05 +0000
@@ -1,6 +1,23 @@
 gnash (trunk) unstable; urgency=low
 
   * local package, many tweaks to be more standards compliant.
+    - Drop depend on gstreamer0.10-alsa, it is not needed as long as
+      gstreamer0.10-plugins-bad depend on it.
+    - Reorder control entries to match the ordering used in the sid package.
+    - Reorder mozilla-plugin-gnash.dirs to match the order used in the
+      sid package.
+    - Make sure mozilla-plugin-gnash.postinst do not exit with an error
+      for aborted installs.
+    - Change alternative priority used in mozilla-plugin-gnash.postinst
+      to match the sid package.
+    - Add comments from the sid package to postinst and postrm.
+    - Make sure to remove README.amf and README.cygnal during clean, they
+      are not in the source tarball.
+    - Make sure to copy config.sub and .guess to build on all the debian
+      archs.
+    - Make some print statements in the rules file match the ones in sid,
+      to make the diff between the two easier to read.
+    - Add missing phony targets.
 
  -- Rob Savoye (Rollinsville, CO) <address@hidden>  Tue, 2 Feb 2010 04:20:00 
+0100
 

=== modified file 'packaging/debian/control'
--- a/packaging/debian/control  2010-02-07 22:02:19 +0000
+++ b/packaging/debian/control  2010-02-08 19:01:05 +0000
@@ -11,7 +11,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  gstreamer-plugins-base | libgstreamer-plugins-base0.10-0, 
gstreamer0.10-plugins-bad, gstreamer0.10-fluendo-mp3, gstreamer0.10-ffmpeg
-Suggests: mozilla-plugin-gnash (= ${binary:Version}), gstreamer0.10-alsa
+Suggests: 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
@@ -23,7 +23,8 @@
 Section: utils
 Architecture: any
 Conflicts: gnash-opengl
-Depends: ${shlibs:Depends}, ${misc:Depends}, gnash-common (= ${binary:Version})
+Depends: gnash-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
 Description: free SWF movie player
  Gnash is a free Flash movie player, which works either standalone, or as
  plugin for Firefox/Mozilla or Konqueror. Currently it is in a beta state.
@@ -41,7 +42,8 @@
 Section: utils
 Architecture: any
 Conflicts: klash-opengl
-Depends: ${shlibs:Depends},  ${misc:Depends}, gnash-common (= 
${binary:Version})
+Depends: gnash-common (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
 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 beta state.
@@ -120,7 +122,8 @@
 Package: konqueror-plugin-gnash
 Section: utils
 Architecture: any
-Depends:  ${shlibs:Depends}, ${misc:Depends}, klash (= ${binary:Version})
+Depends: klash (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
 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.

=== modified file 'packaging/debian/mozilla-plugin-gnash.dirs'
--- a/packaging/debian/mozilla-plugin-gnash.dirs        2010-02-05 17:50:01 
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.dirs        2010-02-08 19:01:05 
+0000
@@ -1,2 +1,2 @@
+etc
 usr/lib/mozilla/plugins
-etc

=== modified file 'packaging/debian/mozilla-plugin-gnash.postinst'
--- a/packaging/debian/mozilla-plugin-gnash.postinst    2010-02-04 16:39:09 
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.postinst    2010-02-08 19:01:05 
+0000
@@ -1,18 +1,31 @@
 #!/bin/sh
 
 set -e
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
 
 case "$1" in
     configure)
        for p in mozilla firefox iceweasel xulrunner midbrowser; do 
            if test -d "/usr/lib/$p/plugins"; then
-               update-alternatives --install 
"/usr/lib/$p/plugins/flashplugin-alternative.so" "$p-flashplugin" 
/usr/lib/mozilla/plugins/libgnashplugin.so 50;
+               update-alternatives --install \
+                   "/usr/lib/$p/plugins/flashplugin-alternative.so" \
+                   "$p-flashplugin" \
+                   /usr/lib/mozilla/plugins/libgnashplugin.so \
+                   10;
            fi
        done
         ;;
     abort-upgrade|abort-remove|abort-deconfigure)
-        echo "postinst called with argument \`$1'" >&2
-        exit 1
         ;;
     
     *)
@@ -21,6 +34,9 @@
         ;;
 esac
 
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
 #DEBHELPER#
 
 exit 0

=== modified file 'packaging/debian/mozilla-plugin-gnash.prerm'
--- a/packaging/debian/mozilla-plugin-gnash.prerm       2010-02-04 16:39:09 
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.prerm       2010-02-08 19:01:05 
+0000
@@ -2,11 +2,23 @@
 
 set -e
 
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
 case "$1" in
     remove|upgrade|deconfigure)
         for p in mozilla firefox iceweasel xulrunner midbrowser; do 
            if test -d "/usr/lib/$p/plugins"; then
-                update-alternatives --remove "$p-flashplugin" 
/usr/lib/mozilla/plugins/libgnashplugin.so;
+                update-alternatives --remove "$p-flashplugin" \
+                   /usr/lib/mozilla/plugins/libgnashplugin.so;
            fi
         done
         ;;
@@ -30,6 +42,9 @@
         ;;
 esac
 
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
 #DEBHELPER#
 
 exit 0

=== modified file 'packaging/debian/rules'
--- a/packaging/debian/rules    2010-02-08 17:47:22 +0000
+++ b/packaging/debian/rules    2010-02-08 19:01:05 +0000
@@ -73,6 +73,13 @@
 config-stamp: patch-stamp
        dh_testdir
 
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+       cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+       cp -f /usr/share/misc/config.guess config.guess
+endif
+
 #      Only run autogen.sh if there isn't a configure script. When
 #      building packages from within a configured build directory. In
 #      a freshly checked out source tree from bzr, there is no
@@ -127,6 +134,8 @@
        dh_testroot
        rm -f build-stamp 
 #      rm -f doc/C/*.1*
+       rm -f README.amf README.cygnal
+
        rm -fr $(BUILD_DIRECTORY)
 
        @printf "\n == CLEANING PATCHES ==\n\n"
@@ -221,4 +230,4 @@
 
 
 binary: binary-indep binary-arch
-.PHONY: config build clean binary-indep binary-arch binary install 
get-bzr-source patch
\ No newline at end of file
+.PHONY: config build clean binary-indep binary-arch binary install 
get-bzr-source patch

=== modified file 'packaging/rpm.am'
--- a/packaging/rpm.am  2010-02-08 17:47:22 +0000
+++ b/packaging/rpm.am  2010-02-08 19:01:05 +0000
@@ -39,7 +39,7 @@
 # instead, so now you don't have to be root to build rpm packages.
 
 # Do the entire process to build an RPM package
-rpm: spec snapshot-src setup-rpm rpm-gnash
+rpm: distdir spec setup-rpm rpm-gnash
 
 # build everything in one pass using rpmbuild
 rpm-gnash: