reverted:
--- swfdec-mozilla-0.6.0/debian/swfdec-mozilla.install
+++ swfdec-mozilla-0.6.0.orig/debian/swfdec-mozilla.install
@@ -1 +0,0 @@
-debian/tmp/usr/lib/mozilla-firefox/plugins/*.so
diff -u swfdec-mozilla-0.6.0/debian/rules swfdec-mozilla-0.6.0/debian/rules
--- swfdec-mozilla-0.6.0/debian/rules
+++ swfdec-mozilla-0.6.0/debian/rules
@@ -2,14 +2,6 @@
 
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-static
-
-DEB_MAKE_ENVVARS=MAKEFLAGS=MOZILLA_DIR=mozilla
-
-common-install-arch::
-	mkdir -p debian/tmp/usr/lib/mozilla-firefox/plugins
-	cd debian/tmp/usr/lib/mozilla-firefox/plugins && \
-		ln -s ../../mozilla/plugins/libswfdecmozilla.so .
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-static --with-plugin-dir=/usr/lib/swfdec-mozilla/
 
diff -u swfdec-mozilla-0.6.0/debian/control swfdec-mozilla-0.6.0/debian/control
--- swfdec-mozilla-0.6.0/debian/control
+++ swfdec-mozilla-0.6.0/debian/control
@@ -1,13 +1,17 @@
 Source: swfdec-mozilla
 Priority: optional
 Section: utils
-Maintainer: Santiago Garcia Mantinan <manty@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Adam Caldwell <adam.caldwell@gmail.com>
 Build-Depends: cdbs, debhelper (>= 5), libswfdec-0.6-dev (>= 0.6.0)
 Standards-Version: 3.7.3
 
 Package: swfdec-mozilla
 Section: utils
 Architecture: any
+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: Swfdec player for Adobe/Macromedia Flash
 Depends: ${shlibs:Depends}
 Provides: swf-player
 Replaces: swf-player
diff -u swfdec-mozilla-0.6.0/debian/changelog swfdec-mozilla-0.6.0/debian/changelog
--- swfdec-mozilla-0.6.0/debian/changelog
+++ swfdec-mozilla-0.6.0/debian/changelog
@@ -1,3 +1,33 @@
+swfdec-mozilla (0.6.0-1ubuntu1~ppa4) hardy; urgency=low
+
+  * Adding ubufox support
+
+ -- Adam Caldwell <adam.caldwell@gmail.com>  Thu, 20 Mar 2008 00:22:53 -0700
+
+swfdec-mozilla (0.6.0-1ubuntu1~ppa3.1) hardy; urgency=low
+
+  * Fixing install (again)
+
+ -- Adam Caldwell <adam.caldwell@gmail.com>  Mon, 17 Mar 2008 11:50:36 -0700
+
+swfdec-mozilla (0.6.0-1ubuntu1~ppa3) hardy; urgency=low
+
+  * Syncing some changes from Stéphane Loeuillet's ppa (installs to all supported browsers, uses alternative system)
+
+ -- Adam Caldwell <adam.caldwell@gmail.com>  Mon, 17 Mar 2008 11:50:36 -0700
+
+swfdec-mozilla (0.6.0-1ubuntu1~ppa2) hardy; urgency=low
+
+  * Fix install directory
+
+ -- Adam Caldwell <adam.caldwell@gmail.com>  Sun, 16 Mar 2008 04:51:52 -0700
+
+swfdec-mozilla (0.6.0-1ubuntu1~ppa1) hardy; urgency=low
+
+  * Initial ppa version
+
+ -- Adam Caldwell <adam.caldwell@gmail.com>  Sun, 16 Mar 2008 04:51:52 -0700
+
 swfdec-mozilla (0.6.0-1) experimental; urgency=low
 
   * New upstream version. Closes: #466802.
only in patch2:
unchanged:
--- swfdec-mozilla-0.6.0.orig/debian/prerm
+++ swfdec-mozilla-0.6.0/debian/prerm
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+		remove|upgrade|deconfigure)
+				for p in iceape iceweasel mozilla firefox xulrunner midbrowser xulrunner-addons; do 
+					update-alternatives --remove "$p-flashplugin" /usr/lib/swfdec-mozilla/libswfdecmozilla.so;
+					[ `update-alternatives --list "$p-flashplugin" | wc -l` = 0 ]  && \
+					update-alternatives --remove-all "$p-flashplugin"
+				done
+				;;
+		failed-upgrade)
+				for p in iceape iceweasel mozilla firefox xulrunner midbrowser; do 
+					update-alternatives --remove "$p-flashplugin" /usr/lib/swfdec-mozilla/libswfdecmozilla.so;
+					[ `update-alternatives --list "$p-flashplugin" | wc -l` = 0 ]  && \
+					update-alternatives --remove-all "$p-flashplugin"
+				done
+				;;
+		*)
+		echo "prerm called with unknown argument \`$1'" >&2
+		exit 1
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
only in patch2:
unchanged:
--- swfdec-mozilla-0.6.0.orig/debian/postinst
+++ swfdec-mozilla-0.6.0/debian/postinst
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+        configure)
+		      for p in iceape iceweasel mozilla firefox xulrunner midbrowser xulrunner-addons; do 
+						update-alternatives --install "/usr/lib/$p/plugins/flashplugin-alternative.so" "$p-flashplugin" /usr/lib/swfdec-mozilla/libswfdecmozilla.so 50;
+					done
+        ;;
+        abort-upgrade|abort-remove|abort-deconfigure)
+                echo "postinst called with argument \`$1'" >&2
+                exit 1
+        ;;
+
+        *)
+                echo "postinst called with unknown argument \`$1'" >&2
+                exit 1
+        ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
only in patch2:
unchanged:
--- swfdec-mozilla-0.6.0.orig/debian/swfdec-mozilla.dirs
+++ swfdec-mozilla-0.6.0/debian/swfdec-mozilla.dirs
@@ -0,0 +1,8 @@
+usr/lib/firefox/plugins
+usr/lib/iceape/plugins
+usr/lib/iceweasel/plugins
+usr/lib/midbrowser/plugins
+usr/lib/mozilla/plugins
+usr/lib/mozilla-firefox/plugins
+usr/lib/xulrunner/plugins
+usr/lib/xulrunner-addons/plugins