Merge lp:~gilir/update-manager/add-lubuntu-upgrade-support into lp:update-manager

[Julien Lavergne]

* Add Lubuntu support for the DistUgrader, by adding reference to the lubuntu-desktop meta-package
* Try to not upgrade gnome-bluetooth and gnome-power-manager, previously on Lubuntu, but we don't want them in the upgrade process to avoid pulling many gnome depends (See bug 945215). I use PostUpgradeRemove for this purpose, I hope it's the right one.

=== added directory 'AutoUpgradeTester/profile/lubuntu'
=== added file 'AutoUpgradeTester/profile/lubuntu/DistUpgrade.cfg'
--- AutoUpgradeTester/profile/lubuntu/DistUpgrade.cfg	1970-01-01 00:00:00 +0000
+++ AutoUpgradeTester/profile/lubuntu/DistUpgrade.cfg	2012-03-03 11:55:22 +0000
@@ -0,0 +1,4 @@
+[NonInteractive]
+ProfileName = lubuntu
+BasePkg = lubuntu-desktop
+Components=main,restricted,universe

=== modified file 'DistUpgrade/DistUpgrade.cfg'
--- DistUpgrade/DistUpgrade.cfg	2011-10-19 14:19:43 +0000
+++ DistUpgrade/DistUpgrade.cfg	2012-03-03 11:55:22 +0000
@@ -10,7 +10,7 @@
 # Distro contains global information about the upgrade
 [Distro]
 # the meta-pkgs we support
-MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-desktop, ubuntustudio-desktop, ichthux-desktop, mythbuntu-desktop, ubuntu-netbook, kubuntu-netbook
+MetaPkgs=ubuntu-desktop, kubuntu-desktop, xubuntu-desktop, ubuntustudio-desktop, ichthux-desktop, mythbuntu-desktop, ubuntu-netbook, kubuntu-netbook, lubuntu-desktop
 BaseMetaPkgs=ubuntu-minimal, ubuntu-standard
 Demotions=demoted.cfg
 RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
@@ -71,6 +71,11 @@
 [mythbuntu-desktop]
 KeyDependencies=mythbuntu-artwork, mythbuntu-default-settings
 
+[lubuntu-desktop]
+KeyDependencies=lubuntu-desktop, lubuntu-default-settings
+#Remove previous gnome component from lubuntu to avoid pulling gnome depends on upgrade (LP: #945215)
+PostUpgradeRemove=gnome-bluetooth, gnome-power-manager
+
 [Files]
 BackupExt=distUpgrade
 LogDir=/var/log/dist-upgrade/

=== modified file 'DistUpgrade/removal_blacklist.cfg'
--- DistUpgrade/removal_blacklist.cfg	2012-03-02 21:10:52 +0000
+++ DistUpgrade/removal_blacklist.cfg	2012-03-03 11:55:22 +0000
@@ -4,6 +4,7 @@
 ubuntu-desktop
 kubuntu-desktop
 xubuntu-desktop
+lubuntu-desktop
 # update-manager itself should not remove itself
 update-manager
 update-manager-core

=== modified file 'UpdateManager/Core/utils.py'
--- UpdateManager/Core/utils.py	2012-01-28 06:27:28 +0000
+++ UpdateManager/Core/utils.py	2012-03-03 11:55:22 +0000
@@ -368,6 +368,8 @@
         return "kubuntu"
     elif "xfce" in denv or "xubuntu" in denv:
         return "xubuntu"
+    elif "LXDE" in denv or "Lubuntu" in denv:
+        return "lubuntu"
     # default to ubuntu if nothing more specific is found
     return "ubuntu"
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-02 21:10:52 +0000
+++ debian/changelog	2012-03-03 11:55:22 +0000
@@ -16,7 +16,14 @@
     - Only blacklist unity-2d, not all packages whose names start with
       unity-2d.  (LP: #940196)
   
- -- Brian Murray <[e-mail]>  Fri, 02 Mar 2012 13:09:08 -0800
+  [ Julien Lavergne ]
+  * DistUpgrade/DistUpgrade.cfg, DistUpgrade/removal_blacklist.cfg,
+    UpdateManager/Core/utils.py,
+    AutoUpgradeTester/profile/lubuntu/DistUpgrade.cfg:
+   - Add Lubuntu support, and don't upgrade gnome-compoents which have been
+     removed from Lubuntu installation (LP: #945215)
+
+ -- Julien Lavergne <[e-mail]>  Sat, 03 Mar 2012 12:45:09 +0100
 
 update-manager (1:0.156.6) precise; urgency=low