=== modified file 'debian/changelog'
--- debian/changelog	2010-10-01 12:09:13 +0000
+++ debian/changelog	2010-10-11 19:42:51 +0000
@@ -1,3 +1,16 @@
+unity (0.2.46-0ubuntu5) maverick-proposed; urgency=low
+
+  * Revert to maverick branch
+    (lucid une ppa branch wrongly merged in this one):
+    + debian/control:
+      - Readd netbook-launcher transitional package, this is needed for people
+        not having ubuntu-netbook installed on dist-upgrade to be
+        transitionned to unity.  (LP: #657838)
+      - recommends ubuntu-netbook-default-settings and not
+        ubuntu-netbook-unity-defaut-settings
+
+ -- Didier Roche <didrocks@ubuntu.com>  Mon, 11 Oct 2010 21:40:23 +0200
+
 unity (0.2.46-0ubuntu4) maverick; urgency=low
 
   * Cherry-picked from upstream:

=== modified file 'debian/control'
--- debian/control	2010-09-24 17:16:05 +0000
+++ debian/control	2010-10-11 19:38:21 +0000
@@ -35,7 +35,10 @@
          ${misc:Depends},
          mutter (>= 2.31.5),
          unity-asset-pool (>= 0.8.18)
-Provides: indicator-renderer
+Provides: indicator-renderer,
+          netbook-launcher
+Conflicts: netbook-launcher (<< 1:2.1.18-0ubuntu2)
+Replaces: netbook-launcher (<< 1:2.1.18-0ubuntu2)
 Recommends: unity-place-applications,
             unity-place-files,
             indicator-appmenu,
@@ -45,7 +48,7 @@
             indicator-messages,
             indicator-me,
             indicator-session,
-            ubuntu-netbook-unity-default-settings,
+            ubuntu-netbook-default-settings,
 Description: Unity Interface for Ubuntu Netbook Edition
  Unity is a graphical interface designed for Ubuntu Netbook Edition
 
@@ -92,3 +95,10 @@
  .
  This package contains files that are needed to build applications.
 
+Package: netbook-launcher
+Section: oldlibs
+Architecture: all
+Depends: unity, ${misc:Depends}
+Description: transitional package
+ unity supersedes netbook-launcher. This package ensures a clean upgrade path,
+ and can be safely removed after the upgrade.