diff -Nru edubuntu-artwork-12.08.2/conf/gsettings/95_edubuntu-artwork.gschema.override edubuntu-artwork-12.09.1/conf/gsettings/95_edubuntu-artwork.gschema.override
--- edubuntu-artwork-12.08.2/conf/gsettings/95_edubuntu-artwork.gschema.override	2012-08-14 14:32:20.000000000 +0000
+++ edubuntu-artwork-12.09.1/conf/gsettings/95_edubuntu-artwork.gschema.override	2012-09-20 16:39:59.000000000 +0000
@@ -4,3 +4,6 @@
 [com.canonical.unity-greeter]
 background = '/usr/share/backgrounds/edubuntu_default.png'
 logo = '/usr/share/unity-greeter/edubuntu-logo.png'
+
+[com.canonical.Unity.Launcher]
+favorites = ['ubiquity-gtkui.desktop', 'ltsp-live.desktop', 'nautilus-home.desktop', 'firefox.desktop', 'libreoffice-writer.desktop', 'libreoffice-calc.desktop', 'libreoffice-impress.desktop', 'ubuntu-software-center.desktop', 'gnome-control-center.desktop']
diff -Nru edubuntu-artwork-12.08.2/debian/changelog edubuntu-artwork-12.09.1/debian/changelog
--- edubuntu-artwork-12.08.2/debian/changelog	2012-08-29 18:33:29.000000000 +0000
+++ edubuntu-artwork-12.09.1/debian/changelog	2012-09-20 16:49:03.000000000 +0000
@@ -1,3 +1,10 @@
+edubuntu-artwork (12.09.1) quantal; urgency=low
+
+  * Override default unity launchers to avoid being affected by LP: #1046840
+  * Fix override of BFB icon in Unity (was overriding an older path)
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Thu, 20 Sep 2012 12:48:15 -0400
+
 edubuntu-artwork (12.08.2) quantal; urgency=low
 
   * Update lightdm image to reflect current version
diff -Nru edubuntu-artwork-12.08.2/debian/edubuntu-artwork.links edubuntu-artwork-12.09.1/debian/edubuntu-artwork.links
--- edubuntu-artwork-12.08.2/debian/edubuntu-artwork.links	2012-08-14 14:32:20.000000000 +0000
+++ edubuntu-artwork-12.09.1/debian/edubuntu-artwork.links	2012-09-20 16:47:36.000000000 +0000
@@ -1 +1 @@
-usr/share/pixmaps/edubuntu-logo.png usr/share/unity/5/launcher_bfb.png
+usr/share/pixmaps/edubuntu-logo.png usr/share/unity/6/launcher_bfb.png
diff -Nru edubuntu-artwork-12.08.2/debian/edubuntu-artwork.postinst edubuntu-artwork-12.09.1/debian/edubuntu-artwork.postinst
--- edubuntu-artwork-12.08.2/debian/edubuntu-artwork.postinst	2012-08-14 14:32:20.000000000 +0000
+++ edubuntu-artwork-12.09.1/debian/edubuntu-artwork.postinst	2012-09-20 16:45:31.000000000 +0000
@@ -21,9 +21,6 @@
             fi
         fi
 
-        # Force update the compiled glib schemas
-        glib-compile-schemas /usr/share/glib-2.0/schemas || true
-
         # And same for gconf (still needed as ubuntu-artwork ships one...)
         update-gconf-defaults
     ;;
diff -Nru edubuntu-artwork-12.08.2/debian/edubuntu-artwork.postrm edubuntu-artwork-12.09.1/debian/edubuntu-artwork.postrm
--- edubuntu-artwork-12.08.2/debian/edubuntu-artwork.postrm	2012-08-14 14:32:20.000000000 +0000
+++ edubuntu-artwork-12.09.1/debian/edubuntu-artwork.postrm	2012-09-20 16:48:04.000000000 +0000
@@ -19,7 +19,7 @@
         /usr/sbin/dpkg-divert --quiet --rename --package edubuntu-artwork --remove /usr/share/icons/GartoonRedux/48x48/places/distributor-logo.png
 
         # Restore unity distributor logo
-        /usr/sbin/dpkg-divert --quiet --rename --package edubuntu-artwork --remove /usr/share/unity/5/launcher_bfb.png
+        /usr/sbin/dpkg-divert --quiet --rename --package edubuntu-artwork --remove /usr/share/unity/6/launcher_bfb.png
 
         # Update icon cache
         gtk-update-icon-cache
diff -Nru edubuntu-artwork-12.08.2/debian/edubuntu-artwork.preinst edubuntu-artwork-12.09.1/debian/edubuntu-artwork.preinst
--- edubuntu-artwork-12.08.2/debian/edubuntu-artwork.preinst	2012-08-14 14:32:20.000000000 +0000
+++ edubuntu-artwork-12.09.1/debian/edubuntu-artwork.preinst	2012-09-20 16:47:52.000000000 +0000
@@ -27,7 +27,7 @@
         cleanup_and_divert /usr/share/icons/GartoonRedux/48x48/places/distributor-logo.png
 
         # Unity distributor logo
-        cleanup_and_divert /usr/share/unity/5/launcher_bfb.png
+        cleanup_and_divert /usr/share/unity/6/launcher_bfb.png
     ;;
 esac