diff -Nru update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/demoted.cfg update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/demoted.cfg
--- update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/demoted.cfg 2012-03-05 08:03:23.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/demoted.cfg 2012-03-13 14:49:34.000000000 +0000
@@ -8,7 +8,7 @@
banshee-extension-soundmenu
cantor
cantor-dbg
-checkbox-gtk
+cobbler-enlist
couchdb-bin
dcraw
desktopcouch
@@ -22,12 +22,7 @@
gamin
gbrainy
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
+gcc-4.5-multilib
gir1.2-couchdb-1.0
gir1.2-desktopcouch-1.0
gnome-desktop-data
@@ -69,6 +64,10 @@
koffice-l10n-wa
koffice-l10n-zhcn
koffice-l10n-zhtw
+lib32go0
+lib32go0-dbg
+lib64go0
+lib64go0-dbg
libaccess-bridge-java
libaccess-bridge-java-jni
libamd2.2.0
@@ -100,17 +99,16 @@
libdirectfb-extra-dbg
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgdata-cil-dev
libgio-cil
libgio2.0-cil-dev
libgkeyfile-cil-dev
libgkeyfile1.0-cil
libgladeui-1-11
+libgladeui-1-dev
libgmm-dev
+libgo0
+libgo0-dbg
libgtk-sharp-beans-cil
libgtk-sharp-beans2.0-cil-dev
libgtkhtml-editor-common
@@ -139,7 +137,6 @@
libmozjs185-1.0
libmozjs185-dev
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmysql-java
libmysqlclient16
libmysqlclient16-dev
@@ -172,9 +169,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libumfpack5.4.0
libvala-0.12-0
libvala-0.12-0-dbg
@@ -203,16 +197,20 @@
myspell-tools
oxygen-icon-theme-complete
pngquant
+python-aptdaemon.gtkwidgets
python-bittorrent
python-central
python-desktopcouch
python-desktopcouch-application
python-desktopcouch-records
python-desktopcouch-recordtypes
+python-farsight
python-fontforge
python-gamin
python-indicate
python-support
+python-telepathy
+python-xklavier
python2.6-dbg
python2.6-dev
python2.6-doc
diff -Nru update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/demoted.cfg.lucid update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/demoted.cfg.lucid
--- update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/demoted.cfg.lucid 2012-03-05 08:04:27.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/demoted.cfg.lucid 2012-03-13 14:50:49.000000000 +0000
@@ -14,7 +14,6 @@
brltty-x11
byacc
cantor
-checkbox-gtk
cheese
cheese-common
compiz-fusion-bcop
@@ -51,12 +50,6 @@
gbrainy
gcc-4.4-multilib
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
gconf-defaults-service
gconf-editor
gdebi
@@ -80,7 +73,6 @@
groovy
groovy-doc
gs-common
-gtk2-engines-pixbuf
gtk2-engines-qtcurve
hal
hal-doc
@@ -131,9 +123,6 @@
libccolamd2.7.1
libcheese-gtk-dev
libcholmod1.7.1
-libclutter-gtk-0.10-0
-libclutter-gtk-0.10-dbg
-libclutter-gtk-0.10-dev
libcolamd2.7.1
libcommons-attributes-java
libcommons-attributes-java-doc
@@ -193,10 +182,6 @@
libfreezethaw-perl
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgconfmm-2.6-1c2
libgconfmm-2.6-dev
libgconfmm-2.6-doc
@@ -210,6 +195,7 @@
libgeronimo-j2ee-connector-1.5-spec-java
libgeronimo-jacc-1.1-spec-java
libgeronimo-jpa-3.0-spec-java
+libgladeui-1-dev
libgmm-dev
libgmp3c2
libgnome-keyring1.0-cil
@@ -243,7 +229,6 @@
libgnomeuimm-2.6-1c2a
libgnomeuimm-2.6-dev
libgnomeuimm-2.6-doc
-libgnomevfs2-extra
libgoogle-collections-java
libgraphite-dev
libgraphite3
@@ -296,7 +281,6 @@
libmono-addins-gui0.2-cil
libmono-addins0.2-cil
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmvel-java
libmysql-java
libmysqlclient16
@@ -359,9 +343,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libtut-dev
libucl-dev
libucl1
@@ -422,6 +403,7 @@
python-desktopcouch
python-desktopcouch-records
python-eggtrayicon
+python-farsight
python-fontforge
python-gamin
python-gksu2
@@ -433,6 +415,7 @@
python-old-doctools
python-scriptutil
python-support
+python-telepathy
python-van.pydeb
python2.6-dbg
python2.6-dev
diff -Nru update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py
--- update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeCache.py 2012-03-13 14:20:38.000000000 +0000
@@ -662,7 +662,7 @@
" * Upgrading to a pre-release version of Ubuntu\n"
" * Running the current pre-release version of Ubuntu\n"
" * Unofficial software packages not provided by Ubuntu\n"
- "\n" % e)
+ "\n") % e
# we never have partialUpgrades (including removes) on a stable system
# with only ubuntu sources so we do not recommend reporting a bug
if partialUpgrade:
@@ -749,7 +749,7 @@
raise SystemError, _("The package '%s' is marked for removal but it is in the removal blacklist.") % pkg.name
if pkg.marked_delete and (pkg._pkg.Essential == True and
not pkg.name in removeEssentialOk):
- logging.debug("The package '%s' is marked for removal but it's a ESSENTIAL package", pkg.name)
+ logging.debug("The package '%s' is marked for removal but it's an ESSENTIAL package", pkg.name)
raise SystemError, _("The essential package '%s' is marked for removal.") % pkg.name
# check bad-versions blacklist
badVersions = self.config.getlist("Distro","BadVersions")
diff -Nru update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg
--- update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgrade.cfg 2012-03-05 08:21:59.000000000 +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-core, 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/
diff -Nru update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeQuirks.py update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeQuirks.py
--- update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeQuirks.py 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeQuirks.py 2012-03-13 14:20:33.000000000 +0000
@@ -494,10 +494,12 @@
if set(I8XX_PCI_IDS).intersection(lspci):
res = self._view.askYesNoQuestion(
_("Your graphics hardware may not be fully supported in "
- "Ubuntu 11.04."),
- _("The support in Ubuntu 11.04 for your intel graphics "
- "hardware is limited "
+ "Ubuntu 12.04 LTS."),
+ _("The support in Ubuntu 12.04 LTS for your Intel "
+ "graphics hardware is limited "
"and you may encounter problems after the upgrade. "
+ "For more information see "
+ "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx "
"Do you want to continue with the upgrade?")
)
if res == False:
@@ -814,11 +816,11 @@
logging.debug("killing gnome-screensaver")
subprocess.call(["killall", "-q", "gnome-screensaver"])
def _pokeScreensaver(self):
- if os.path.exists("/usr/bin/xdg-screensaver"):
+ if os.path.exists("/usr/bin/xdg-screensaver") and os.environ.get('DISPLAY') :
logging.debug("setup poke timer for the scrensaver")
try:
self._poke = subprocess.Popen(
- "while true; do /usr/bin/xdg-screensaver reset; sleep 30; done",
+ "while true; do /usr/bin/xdg-screensaver reset >/dev/null 2>&1; sleep 30; done",
shell=True)
atexit.register(self._stopPokeScreensaver)
except:
diff -Nru update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py
--- update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py 2012-03-05 08:05:07.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeVersion.py 2012-03-13 14:51:33.000000000 +0000
@@ -1 +1 @@
-VERSION='0.156.7'
+VERSION='0.156.8'
diff -Nru update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk3.py update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk3.py
--- update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk3.py 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk3.py 2012-03-05 08:12:28.000000000 +0000
@@ -410,7 +410,7 @@
icons = Gtk.IconTheme.get_default()
try:
- self.window_main.set_default_icon(icons.load_icon("update-manager", 32, 0))
+ self.window_main.set_default_icon(icons.load_icon("system-software-update", 32, 0))
except GObject.GError, e:
logging.debug("error setting default icon, ignoring (%s)" % e)
pass
diff -Nru update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk.py update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk.py
--- update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk.py 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/DistUpgradeViewGtk.py 2012-03-05 08:12:28.000000000 +0000
@@ -393,7 +393,7 @@
icons = gtk.icon_theme_get_default()
try:
- gtk.window_set_default_icon(icons.load_icon("update-manager", 32, 0))
+ gtk.window_set_default_icon(icons.load_icon("system-software-update", 32, 0))
except gobject.GError, e:
logging.debug("error setting default icon, ignoring (%s)" % e)
pass
diff -Nru update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/mirrors.cfg update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/mirrors.cfg
--- update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/mirrors.cfg 2012-03-05 08:04:36.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/mirrors.cfg 2012-03-13 14:50:58.000000000 +0000
@@ -618,7 +618,6 @@
http://ftp.acc.umu.se/ubuntu/
http://ftp.snt.utwente.nl/pub/os/linux/ubuntu/
http://mirror.internetone.it/ubuntu-archive/
-http://mirror.pnl.gov/ubuntu/
http://ubuntu.idrepo.or.id/ubuntu/
http://ubuntu.mirror.tudos.de/ubuntu/
http://mirror.nl.leaseweb.net/ubuntu/
@@ -674,6 +673,7 @@
http://mirror.corbina.net/ubuntu/
http://mirror.cse.iitk.ac.in/ubuntu/
http://mirror.dattobackup.com/ubuntu/
+http://mirror.edatel.net.co/ubuntu/
http://mirror.ihug.co.nz/ubuntu/
http://mirror.its.sfu.ca/mirror/ubuntu/
http://mirror.kavalinux.com/ubuntu/
@@ -709,7 +709,6 @@
http://mirrors.mit.edu/ubuntu/
http://mirrors.psu.ac.th/pub/ubuntu/
http://mirrors.sohu.com/ubuntu/
-http://mirrors.tecnoera.com/ubuntu/
http://mirrors.telianet.dk/ubuntu/
http://mirrors.uaip.org/ubuntu/
http://mirrors.ustc.edu.cn/ubuntu/
@@ -722,7 +721,6 @@
http://suse.uni-leipzig.de/pub/releases.ubuntu.com/ubuntu/
http://tux.rainside.sk/ubuntu/
http://ubuntu-archive.locaweb.com.br/ubuntu/
-http://ubuntu-mirror.telesys.org.ua/ubuntu/
http://ubuntu.arcticnetwork.ca/
http://ubuntu.cs.nctu.edu.tw/ubuntu/
http://ubuntu.cybercomhosting.com/ubuntu/
@@ -746,7 +744,6 @@
http://ubuntu.wikimedia.org/ubuntu/
http://ucmirror.canterbury.ac.nz/ubuntu/
http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/
-http://www.club.cc.cmu.edu/pub/ubuntu/
http://ubuntu-archive.adsolux.com/ubuntu/
http://archive.ubuntu.nautile.nc/ubuntu/
http://biruni.upm.my/mirror/ubuntu/
@@ -775,11 +772,11 @@
http://mirror.its.dal.ca/ubuntu/
http://mirror.learn.ac.lk/ubuntu/
http://mirror.neolabs.kz/ubuntu/
-ftp://mirror.space.kz/ubuntu/
http://mirror.squ.edu.om/ubuntuarchive/
http://mirrors.bloomu.edu/ubuntu/
http://mirrors.ispros.com.bd/ubuntu/
http://mirrors.serverhost.ro/ubuntu/archive/
+http://mirrors.ucr.ac.cr/ubuntu/
http://pandawa.ipb.ac.id/ubuntu/
http://singo.ub.ac.id/ubuntu/
http://ubuntu.eecs.wsu.edu/
diff -Nru update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/removal_blacklist.cfg update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/removal_blacklist.cfg
--- update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/removal_blacklist.cfg 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/removal_blacklist.cfg 2012-03-13 14:20:33.000000000 +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
@@ -16,3 +17,5 @@
# unity
unity$
unity-2d$
+# gnome-session (LP: #946539)
+gnome-session$
diff -Nru update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/utils.py update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/utils.py
--- update-manager-0.156.7/AutoUpgradeTester/DistUpgrade/utils.py 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/DistUpgrade/utils.py 2012-03-05 08:21:03.000000000 +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"
diff -Nru update-manager-0.156.7/AutoUpgradeTester/profile/lts-main-all/demoted.cfg update-manager-0.156.8/AutoUpgradeTester/profile/lts-main-all/demoted.cfg
--- update-manager-0.156.7/AutoUpgradeTester/profile/lts-main-all/demoted.cfg 2012-03-05 08:03:23.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/profile/lts-main-all/demoted.cfg 2012-03-13 14:49:34.000000000 +0000
@@ -8,7 +8,7 @@
banshee-extension-soundmenu
cantor
cantor-dbg
-checkbox-gtk
+cobbler-enlist
couchdb-bin
dcraw
desktopcouch
@@ -22,12 +22,7 @@
gamin
gbrainy
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
+gcc-4.5-multilib
gir1.2-couchdb-1.0
gir1.2-desktopcouch-1.0
gnome-desktop-data
@@ -69,6 +64,10 @@
koffice-l10n-wa
koffice-l10n-zhcn
koffice-l10n-zhtw
+lib32go0
+lib32go0-dbg
+lib64go0
+lib64go0-dbg
libaccess-bridge-java
libaccess-bridge-java-jni
libamd2.2.0
@@ -100,17 +99,16 @@
libdirectfb-extra-dbg
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgdata-cil-dev
libgio-cil
libgio2.0-cil-dev
libgkeyfile-cil-dev
libgkeyfile1.0-cil
libgladeui-1-11
+libgladeui-1-dev
libgmm-dev
+libgo0
+libgo0-dbg
libgtk-sharp-beans-cil
libgtk-sharp-beans2.0-cil-dev
libgtkhtml-editor-common
@@ -139,7 +137,6 @@
libmozjs185-1.0
libmozjs185-dev
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmysql-java
libmysqlclient16
libmysqlclient16-dev
@@ -172,9 +169,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libumfpack5.4.0
libvala-0.12-0
libvala-0.12-0-dbg
@@ -203,16 +197,20 @@
myspell-tools
oxygen-icon-theme-complete
pngquant
+python-aptdaemon.gtkwidgets
python-bittorrent
python-central
python-desktopcouch
python-desktopcouch-application
python-desktopcouch-records
python-desktopcouch-recordtypes
+python-farsight
python-fontforge
python-gamin
python-indicate
python-support
+python-telepathy
+python-xklavier
python2.6-dbg
python2.6-dev
python2.6-doc
diff -Nru update-manager-0.156.7/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg update-manager-0.156.8/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg
--- update-manager-0.156.7/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg 2012-03-05 08:03:23.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/profile/lts-universe-amd64/demoted.cfg 2012-03-13 14:49:34.000000000 +0000
@@ -8,7 +8,7 @@
banshee-extension-soundmenu
cantor
cantor-dbg
-checkbox-gtk
+cobbler-enlist
couchdb-bin
dcraw
desktopcouch
@@ -22,12 +22,7 @@
gamin
gbrainy
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
+gcc-4.5-multilib
gir1.2-couchdb-1.0
gir1.2-desktopcouch-1.0
gnome-desktop-data
@@ -69,6 +64,10 @@
koffice-l10n-wa
koffice-l10n-zhcn
koffice-l10n-zhtw
+lib32go0
+lib32go0-dbg
+lib64go0
+lib64go0-dbg
libaccess-bridge-java
libaccess-bridge-java-jni
libamd2.2.0
@@ -100,17 +99,16 @@
libdirectfb-extra-dbg
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgdata-cil-dev
libgio-cil
libgio2.0-cil-dev
libgkeyfile-cil-dev
libgkeyfile1.0-cil
libgladeui-1-11
+libgladeui-1-dev
libgmm-dev
+libgo0
+libgo0-dbg
libgtk-sharp-beans-cil
libgtk-sharp-beans2.0-cil-dev
libgtkhtml-editor-common
@@ -139,7 +137,6 @@
libmozjs185-1.0
libmozjs185-dev
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmysql-java
libmysqlclient16
libmysqlclient16-dev
@@ -172,9 +169,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libumfpack5.4.0
libvala-0.12-0
libvala-0.12-0-dbg
@@ -203,16 +197,20 @@
myspell-tools
oxygen-icon-theme-complete
pngquant
+python-aptdaemon.gtkwidgets
python-bittorrent
python-central
python-desktopcouch
python-desktopcouch-application
python-desktopcouch-records
python-desktopcouch-recordtypes
+python-farsight
python-fontforge
python-gamin
python-indicate
python-support
+python-telepathy
+python-xklavier
python2.6-dbg
python2.6-dev
python2.6-doc
diff -Nru update-manager-0.156.7/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg update-manager-0.156.8/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg
--- update-manager-0.156.7/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg 2012-03-05 08:03:23.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/profile/lts-universe-i386/demoted.cfg 2012-03-13 14:49:34.000000000 +0000
@@ -8,7 +8,7 @@
banshee-extension-soundmenu
cantor
cantor-dbg
-checkbox-gtk
+cobbler-enlist
couchdb-bin
dcraw
desktopcouch
@@ -22,12 +22,7 @@
gamin
gbrainy
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
+gcc-4.5-multilib
gir1.2-couchdb-1.0
gir1.2-desktopcouch-1.0
gnome-desktop-data
@@ -69,6 +64,10 @@
koffice-l10n-wa
koffice-l10n-zhcn
koffice-l10n-zhtw
+lib32go0
+lib32go0-dbg
+lib64go0
+lib64go0-dbg
libaccess-bridge-java
libaccess-bridge-java-jni
libamd2.2.0
@@ -100,17 +99,16 @@
libdirectfb-extra-dbg
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgdata-cil-dev
libgio-cil
libgio2.0-cil-dev
libgkeyfile-cil-dev
libgkeyfile1.0-cil
libgladeui-1-11
+libgladeui-1-dev
libgmm-dev
+libgo0
+libgo0-dbg
libgtk-sharp-beans-cil
libgtk-sharp-beans2.0-cil-dev
libgtkhtml-editor-common
@@ -139,7 +137,6 @@
libmozjs185-1.0
libmozjs185-dev
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmysql-java
libmysqlclient16
libmysqlclient16-dev
@@ -172,9 +169,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libumfpack5.4.0
libvala-0.12-0
libvala-0.12-0-dbg
@@ -203,16 +197,20 @@
myspell-tools
oxygen-icon-theme-complete
pngquant
+python-aptdaemon.gtkwidgets
python-bittorrent
python-central
python-desktopcouch
python-desktopcouch-application
python-desktopcouch-records
python-desktopcouch-recordtypes
+python-farsight
python-fontforge
python-gamin
python-indicate
python-support
+python-telepathy
+python-xklavier
python2.6-dbg
python2.6-dev
python2.6-doc
diff -Nru update-manager-0.156.7/AutoUpgradeTester/profile/lubuntu/DistUpgrade.cfg update-manager-0.156.8/AutoUpgradeTester/profile/lubuntu/DistUpgrade.cfg
--- update-manager-0.156.7/AutoUpgradeTester/profile/lubuntu/DistUpgrade.cfg 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/profile/lubuntu/DistUpgrade.cfg 2012-03-05 08:21:03.000000000 +0000
@@ -0,0 +1,4 @@
+[NonInteractive]
+ProfileName = lubuntu
+BasePkg = lubuntu-desktop
+Components=main,restricted,universe
diff -Nru update-manager-0.156.7/AutoUpgradeTester/profile/main-all/demoted.cfg update-manager-0.156.8/AutoUpgradeTester/profile/main-all/demoted.cfg
--- update-manager-0.156.7/AutoUpgradeTester/profile/main-all/demoted.cfg 2012-03-05 08:03:23.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/profile/main-all/demoted.cfg 2012-03-13 14:49:34.000000000 +0000
@@ -8,7 +8,7 @@
banshee-extension-soundmenu
cantor
cantor-dbg
-checkbox-gtk
+cobbler-enlist
couchdb-bin
dcraw
desktopcouch
@@ -22,12 +22,7 @@
gamin
gbrainy
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
+gcc-4.5-multilib
gir1.2-couchdb-1.0
gir1.2-desktopcouch-1.0
gnome-desktop-data
@@ -69,6 +64,10 @@
koffice-l10n-wa
koffice-l10n-zhcn
koffice-l10n-zhtw
+lib32go0
+lib32go0-dbg
+lib64go0
+lib64go0-dbg
libaccess-bridge-java
libaccess-bridge-java-jni
libamd2.2.0
@@ -100,17 +99,16 @@
libdirectfb-extra-dbg
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgdata-cil-dev
libgio-cil
libgio2.0-cil-dev
libgkeyfile-cil-dev
libgkeyfile1.0-cil
libgladeui-1-11
+libgladeui-1-dev
libgmm-dev
+libgo0
+libgo0-dbg
libgtk-sharp-beans-cil
libgtk-sharp-beans2.0-cil-dev
libgtkhtml-editor-common
@@ -139,7 +137,6 @@
libmozjs185-1.0
libmozjs185-dev
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmysql-java
libmysqlclient16
libmysqlclient16-dev
@@ -172,9 +169,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libumfpack5.4.0
libvala-0.12-0
libvala-0.12-0-dbg
@@ -203,16 +197,20 @@
myspell-tools
oxygen-icon-theme-complete
pngquant
+python-aptdaemon.gtkwidgets
python-bittorrent
python-central
python-desktopcouch
python-desktopcouch-application
python-desktopcouch-records
python-desktopcouch-recordtypes
+python-farsight
python-fontforge
python-gamin
python-indicate
python-support
+python-telepathy
+python-xklavier
python2.6-dbg
python2.6-dev
python2.6-doc
diff -Nru update-manager-0.156.7/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg update-manager-0.156.8/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg
--- update-manager-0.156.7/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg 2012-03-05 08:03:23.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/profile/main-all-amd64/demoted.cfg 2012-03-13 14:49:34.000000000 +0000
@@ -8,7 +8,7 @@
banshee-extension-soundmenu
cantor
cantor-dbg
-checkbox-gtk
+cobbler-enlist
couchdb-bin
dcraw
desktopcouch
@@ -22,12 +22,7 @@
gamin
gbrainy
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
+gcc-4.5-multilib
gir1.2-couchdb-1.0
gir1.2-desktopcouch-1.0
gnome-desktop-data
@@ -69,6 +64,10 @@
koffice-l10n-wa
koffice-l10n-zhcn
koffice-l10n-zhtw
+lib32go0
+lib32go0-dbg
+lib64go0
+lib64go0-dbg
libaccess-bridge-java
libaccess-bridge-java-jni
libamd2.2.0
@@ -100,17 +99,16 @@
libdirectfb-extra-dbg
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgdata-cil-dev
libgio-cil
libgio2.0-cil-dev
libgkeyfile-cil-dev
libgkeyfile1.0-cil
libgladeui-1-11
+libgladeui-1-dev
libgmm-dev
+libgo0
+libgo0-dbg
libgtk-sharp-beans-cil
libgtk-sharp-beans2.0-cil-dev
libgtkhtml-editor-common
@@ -139,7 +137,6 @@
libmozjs185-1.0
libmozjs185-dev
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmysql-java
libmysqlclient16
libmysqlclient16-dev
@@ -172,9 +169,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libumfpack5.4.0
libvala-0.12-0
libvala-0.12-0-dbg
@@ -203,16 +197,20 @@
myspell-tools
oxygen-icon-theme-complete
pngquant
+python-aptdaemon.gtkwidgets
python-bittorrent
python-central
python-desktopcouch
python-desktopcouch-application
python-desktopcouch-records
python-desktopcouch-recordtypes
+python-farsight
python-fontforge
python-gamin
python-indicate
python-support
+python-telepathy
+python-xklavier
python2.6-dbg
python2.6-dev
python2.6-doc
diff -Nru update-manager-0.156.7/AutoUpgradeTester/profile/server/demoted.cfg update-manager-0.156.8/AutoUpgradeTester/profile/server/demoted.cfg
--- update-manager-0.156.7/AutoUpgradeTester/profile/server/demoted.cfg 2012-03-05 08:03:23.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/profile/server/demoted.cfg 2012-03-13 14:49:34.000000000 +0000
@@ -8,7 +8,7 @@
banshee-extension-soundmenu
cantor
cantor-dbg
-checkbox-gtk
+cobbler-enlist
couchdb-bin
dcraw
desktopcouch
@@ -22,12 +22,7 @@
gamin
gbrainy
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
+gcc-4.5-multilib
gir1.2-couchdb-1.0
gir1.2-desktopcouch-1.0
gnome-desktop-data
@@ -69,6 +64,10 @@
koffice-l10n-wa
koffice-l10n-zhcn
koffice-l10n-zhtw
+lib32go0
+lib32go0-dbg
+lib64go0
+lib64go0-dbg
libaccess-bridge-java
libaccess-bridge-java-jni
libamd2.2.0
@@ -100,17 +99,16 @@
libdirectfb-extra-dbg
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgdata-cil-dev
libgio-cil
libgio2.0-cil-dev
libgkeyfile-cil-dev
libgkeyfile1.0-cil
libgladeui-1-11
+libgladeui-1-dev
libgmm-dev
+libgo0
+libgo0-dbg
libgtk-sharp-beans-cil
libgtk-sharp-beans2.0-cil-dev
libgtkhtml-editor-common
@@ -139,7 +137,6 @@
libmozjs185-1.0
libmozjs185-dev
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmysql-java
libmysqlclient16
libmysqlclient16-dev
@@ -172,9 +169,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libumfpack5.4.0
libvala-0.12-0
libvala-0.12-0-dbg
@@ -203,16 +197,20 @@
myspell-tools
oxygen-icon-theme-complete
pngquant
+python-aptdaemon.gtkwidgets
python-bittorrent
python-central
python-desktopcouch
python-desktopcouch-application
python-desktopcouch-records
python-desktopcouch-recordtypes
+python-farsight
python-fontforge
python-gamin
python-indicate
python-support
+python-telepathy
+python-xklavier
python2.6-dbg
python2.6-dev
python2.6-doc
diff -Nru update-manager-0.156.7/AutoUpgradeTester/profile/ubuntu/demoted.cfg update-manager-0.156.8/AutoUpgradeTester/profile/ubuntu/demoted.cfg
--- update-manager-0.156.7/AutoUpgradeTester/profile/ubuntu/demoted.cfg 2012-03-05 08:03:23.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/profile/ubuntu/demoted.cfg 2012-03-13 14:49:34.000000000 +0000
@@ -8,7 +8,7 @@
banshee-extension-soundmenu
cantor
cantor-dbg
-checkbox-gtk
+cobbler-enlist
couchdb-bin
dcraw
desktopcouch
@@ -22,12 +22,7 @@
gamin
gbrainy
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
+gcc-4.5-multilib
gir1.2-couchdb-1.0
gir1.2-desktopcouch-1.0
gnome-desktop-data
@@ -69,6 +64,10 @@
koffice-l10n-wa
koffice-l10n-zhcn
koffice-l10n-zhtw
+lib32go0
+lib32go0-dbg
+lib64go0
+lib64go0-dbg
libaccess-bridge-java
libaccess-bridge-java-jni
libamd2.2.0
@@ -100,17 +99,16 @@
libdirectfb-extra-dbg
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgdata-cil-dev
libgio-cil
libgio2.0-cil-dev
libgkeyfile-cil-dev
libgkeyfile1.0-cil
libgladeui-1-11
+libgladeui-1-dev
libgmm-dev
+libgo0
+libgo0-dbg
libgtk-sharp-beans-cil
libgtk-sharp-beans2.0-cil-dev
libgtkhtml-editor-common
@@ -139,7 +137,6 @@
libmozjs185-1.0
libmozjs185-dev
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmysql-java
libmysqlclient16
libmysqlclient16-dev
@@ -172,9 +169,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libumfpack5.4.0
libvala-0.12-0
libvala-0.12-0-dbg
@@ -203,16 +197,20 @@
myspell-tools
oxygen-icon-theme-complete
pngquant
+python-aptdaemon.gtkwidgets
python-bittorrent
python-central
python-desktopcouch
python-desktopcouch-application
python-desktopcouch-records
python-desktopcouch-recordtypes
+python-farsight
python-fontforge
python-gamin
python-indicate
python-support
+python-telepathy
+python-xklavier
python2.6-dbg
python2.6-dev
python2.6-doc
diff -Nru update-manager-0.156.7/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg update-manager-0.156.8/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg
--- update-manager-0.156.7/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg 2012-03-05 08:03:23.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/profile/ubuntu-amd64/demoted.cfg 2012-03-13 14:49:34.000000000 +0000
@@ -8,7 +8,7 @@
banshee-extension-soundmenu
cantor
cantor-dbg
-checkbox-gtk
+cobbler-enlist
couchdb-bin
dcraw
desktopcouch
@@ -22,12 +22,7 @@
gamin
gbrainy
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
+gcc-4.5-multilib
gir1.2-couchdb-1.0
gir1.2-desktopcouch-1.0
gnome-desktop-data
@@ -69,6 +64,10 @@
koffice-l10n-wa
koffice-l10n-zhcn
koffice-l10n-zhtw
+lib32go0
+lib32go0-dbg
+lib64go0
+lib64go0-dbg
libaccess-bridge-java
libaccess-bridge-java-jni
libamd2.2.0
@@ -100,17 +99,16 @@
libdirectfb-extra-dbg
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgdata-cil-dev
libgio-cil
libgio2.0-cil-dev
libgkeyfile-cil-dev
libgkeyfile1.0-cil
libgladeui-1-11
+libgladeui-1-dev
libgmm-dev
+libgo0
+libgo0-dbg
libgtk-sharp-beans-cil
libgtk-sharp-beans2.0-cil-dev
libgtkhtml-editor-common
@@ -139,7 +137,6 @@
libmozjs185-1.0
libmozjs185-dev
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmysql-java
libmysqlclient16
libmysqlclient16-dev
@@ -172,9 +169,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libumfpack5.4.0
libvala-0.12-0
libvala-0.12-0-dbg
@@ -203,16 +197,20 @@
myspell-tools
oxygen-icon-theme-complete
pngquant
+python-aptdaemon.gtkwidgets
python-bittorrent
python-central
python-desktopcouch
python-desktopcouch-application
python-desktopcouch-records
python-desktopcouch-recordtypes
+python-farsight
python-fontforge
python-gamin
python-indicate
python-support
+python-telepathy
+python-xklavier
python2.6-dbg
python2.6-dev
python2.6-doc
diff -Nru update-manager-0.156.7/AutoUpgradeTester/profile/universe-amd64/demoted.cfg update-manager-0.156.8/AutoUpgradeTester/profile/universe-amd64/demoted.cfg
--- update-manager-0.156.7/AutoUpgradeTester/profile/universe-amd64/demoted.cfg 2012-03-05 08:03:23.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/profile/universe-amd64/demoted.cfg 2012-03-13 14:49:34.000000000 +0000
@@ -8,7 +8,7 @@
banshee-extension-soundmenu
cantor
cantor-dbg
-checkbox-gtk
+cobbler-enlist
couchdb-bin
dcraw
desktopcouch
@@ -22,12 +22,7 @@
gamin
gbrainy
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
+gcc-4.5-multilib
gir1.2-couchdb-1.0
gir1.2-desktopcouch-1.0
gnome-desktop-data
@@ -69,6 +64,10 @@
koffice-l10n-wa
koffice-l10n-zhcn
koffice-l10n-zhtw
+lib32go0
+lib32go0-dbg
+lib64go0
+lib64go0-dbg
libaccess-bridge-java
libaccess-bridge-java-jni
libamd2.2.0
@@ -100,17 +99,16 @@
libdirectfb-extra-dbg
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgdata-cil-dev
libgio-cil
libgio2.0-cil-dev
libgkeyfile-cil-dev
libgkeyfile1.0-cil
libgladeui-1-11
+libgladeui-1-dev
libgmm-dev
+libgo0
+libgo0-dbg
libgtk-sharp-beans-cil
libgtk-sharp-beans2.0-cil-dev
libgtkhtml-editor-common
@@ -139,7 +137,6 @@
libmozjs185-1.0
libmozjs185-dev
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmysql-java
libmysqlclient16
libmysqlclient16-dev
@@ -172,9 +169,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libumfpack5.4.0
libvala-0.12-0
libvala-0.12-0-dbg
@@ -203,16 +197,20 @@
myspell-tools
oxygen-icon-theme-complete
pngquant
+python-aptdaemon.gtkwidgets
python-bittorrent
python-central
python-desktopcouch
python-desktopcouch-application
python-desktopcouch-records
python-desktopcouch-recordtypes
+python-farsight
python-fontforge
python-gamin
python-indicate
python-support
+python-telepathy
+python-xklavier
python2.6-dbg
python2.6-dev
python2.6-doc
diff -Nru update-manager-0.156.7/AutoUpgradeTester/profile/universe-i386/demoted.cfg update-manager-0.156.8/AutoUpgradeTester/profile/universe-i386/demoted.cfg
--- update-manager-0.156.7/AutoUpgradeTester/profile/universe-i386/demoted.cfg 2012-03-05 08:03:23.000000000 +0000
+++ update-manager-0.156.8/AutoUpgradeTester/profile/universe-i386/demoted.cfg 2012-03-13 14:49:34.000000000 +0000
@@ -8,7 +8,7 @@
banshee-extension-soundmenu
cantor
cantor-dbg
-checkbox-gtk
+cobbler-enlist
couchdb-bin
dcraw
desktopcouch
@@ -22,12 +22,7 @@
gamin
gbrainy
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
+gcc-4.5-multilib
gir1.2-couchdb-1.0
gir1.2-desktopcouch-1.0
gnome-desktop-data
@@ -69,6 +64,10 @@
koffice-l10n-wa
koffice-l10n-zhcn
koffice-l10n-zhtw
+lib32go0
+lib32go0-dbg
+lib64go0
+lib64go0-dbg
libaccess-bridge-java
libaccess-bridge-java-jni
libamd2.2.0
@@ -100,17 +99,16 @@
libdirectfb-extra-dbg
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgdata-cil-dev
libgio-cil
libgio2.0-cil-dev
libgkeyfile-cil-dev
libgkeyfile1.0-cil
libgladeui-1-11
+libgladeui-1-dev
libgmm-dev
+libgo0
+libgo0-dbg
libgtk-sharp-beans-cil
libgtk-sharp-beans2.0-cil-dev
libgtkhtml-editor-common
@@ -139,7 +137,6 @@
libmozjs185-1.0
libmozjs185-dev
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmysql-java
libmysqlclient16
libmysqlclient16-dev
@@ -172,9 +169,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libumfpack5.4.0
libvala-0.12-0
libvala-0.12-0-dbg
@@ -203,16 +197,20 @@
myspell-tools
oxygen-icon-theme-complete
pngquant
+python-aptdaemon.gtkwidgets
python-bittorrent
python-central
python-desktopcouch
python-desktopcouch-application
python-desktopcouch-records
python-desktopcouch-recordtypes
+python-farsight
python-fontforge
python-gamin
python-indicate
python-support
+python-telepathy
+python-xklavier
python2.6-dbg
python2.6-dev
python2.6-doc
Binary files /tmp/JLCxt5z7kd/update-manager-0.156.7/data/icons/16x16/apps/system-software-update.png and /tmp/pIxDk0mlVF/update-manager-0.156.8/data/icons/16x16/apps/system-software-update.png differ
Binary files /tmp/JLCxt5z7kd/update-manager-0.156.7/data/icons/16x16/apps/update-manager.png and /tmp/pIxDk0mlVF/update-manager-0.156.8/data/icons/16x16/apps/update-manager.png differ
Binary files /tmp/JLCxt5z7kd/update-manager-0.156.7/data/icons/22x22/apps/system-software-update.png and /tmp/pIxDk0mlVF/update-manager-0.156.8/data/icons/22x22/apps/system-software-update.png differ
Binary files /tmp/JLCxt5z7kd/update-manager-0.156.7/data/icons/22x22/apps/update-manager.png and /tmp/pIxDk0mlVF/update-manager-0.156.8/data/icons/22x22/apps/update-manager.png differ
Binary files /tmp/JLCxt5z7kd/update-manager-0.156.7/data/icons/24x24/apps/system-software-update.png and /tmp/pIxDk0mlVF/update-manager-0.156.8/data/icons/24x24/apps/system-software-update.png differ
Binary files /tmp/JLCxt5z7kd/update-manager-0.156.7/data/icons/24x24/apps/update-manager.png and /tmp/pIxDk0mlVF/update-manager-0.156.8/data/icons/24x24/apps/update-manager.png differ
diff -Nru update-manager-0.156.7/data/icons/scalable/apps/system-software-update.svg update-manager-0.156.8/data/icons/scalable/apps/system-software-update.svg
--- update-manager-0.156.7/data/icons/scalable/apps/system-software-update.svg 1970-01-01 00:00:00.000000000 +0000
+++ update-manager-0.156.8/data/icons/scalable/apps/system-software-update.svg 2012-03-05 08:12:28.000000000 +0000
@@ -0,0 +1,1519 @@
+
+
+
diff -Nru update-manager-0.156.7/data/icons/scalable/apps/update-manager.svg update-manager-0.156.8/data/icons/scalable/apps/update-manager.svg
--- update-manager-0.156.7/data/icons/scalable/apps/update-manager.svg 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/data/icons/scalable/apps/update-manager.svg 1970-01-01 00:00:00.000000000 +0000
@@ -1,1519 +0,0 @@
-
-
-
diff -Nru update-manager-0.156.7/data/update-manager.desktop.in update-manager-0.156.8/data/update-manager.desktop.in
--- update-manager-0.156.7/data/update-manager.desktop.in 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/data/update-manager.desktop.in 2012-03-05 08:12:28.000000000 +0000
@@ -3,7 +3,7 @@
_GenericName=Software Updates
_Comment=Show and install available updates
Exec=/usr/bin/update-manager
-Icon=update-manager
+Icon=system-software-update
Terminal=false
Type=Application
Categories=System;Settings;
diff -Nru update-manager-0.156.7/debian/changelog update-manager-0.156.8/debian/changelog
--- update-manager-0.156.7/debian/changelog 2012-03-05 08:02:14.000000000 +0000
+++ update-manager-0.156.8/debian/changelog 2012-03-13 14:30:04.000000000 +0000
@@ -1,3 +1,38 @@
+update-manager (1:0.156.8) precise; urgency=low
+
+ [ Robert Roth ]
+ * Update icon name to use FD.o standard (LP: #921310)
+
+ [ 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-components which have been
+ removed from Lubuntu installation (LP: #945215)
+
+ [ Barry Warsaw ]
+ * Improve the warning issued when i8xx graphics hardware is
+ detected. (LP: #941172)
+
+ [ Brian Murray ]
+ * DistUpgrade/removal_blacklist.cfg:
+ - blacklist gnome-session so that users can always login after a failed
+ partial upgrade (LP: #946539)
+
+ [ James Hunt ]
+ * Only attempt to stop screensaver if DISPLAY set, and throw away
+ xdg-screensaver output. (LP: #883618)
+
+ [ Colin Watson ]
+ * Use 'from dbus.mainloop.glib import DBusGMainLoop;
+ DBusGMainLoop(set_as_default=True)' to set up the main loop, rather than
+ importing the deprecated dbus.glib.
+
+ [ Gabor Kelemen ]
+ * Fix misplaced parentheses. LP: #952959
+
+ -- Michael Vogt Tue, 13 Mar 2012 15:29:59 +0100
+
update-manager (1:0.156.7) precise; urgency=low
[ Michael Vogt ]
@@ -15,7 +50,7 @@
* DistUpgrade/removal_blacklist.cfg:
- Only blacklist unity-2d, not all packages whose names start with
unity-2d. (LP: #940196)
-
+
-- Michael Vogt Mon, 05 Mar 2012 09:02:14 +0100
update-manager (1:0.156.6) precise; urgency=low
diff -Nru update-manager-0.156.7/DistUpgrade/demoted.cfg update-manager-0.156.8/DistUpgrade/demoted.cfg
--- update-manager-0.156.7/DistUpgrade/demoted.cfg 2012-03-05 08:03:23.000000000 +0000
+++ update-manager-0.156.8/DistUpgrade/demoted.cfg 2012-03-13 14:49:34.000000000 +0000
@@ -8,7 +8,7 @@
banshee-extension-soundmenu
cantor
cantor-dbg
-checkbox-gtk
+cobbler-enlist
couchdb-bin
dcraw
desktopcouch
@@ -22,12 +22,7 @@
gamin
gbrainy
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
+gcc-4.5-multilib
gir1.2-couchdb-1.0
gir1.2-desktopcouch-1.0
gnome-desktop-data
@@ -69,6 +64,10 @@
koffice-l10n-wa
koffice-l10n-zhcn
koffice-l10n-zhtw
+lib32go0
+lib32go0-dbg
+lib64go0
+lib64go0-dbg
libaccess-bridge-java
libaccess-bridge-java-jni
libamd2.2.0
@@ -100,17 +99,16 @@
libdirectfb-extra-dbg
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgdata-cil-dev
libgio-cil
libgio2.0-cil-dev
libgkeyfile-cil-dev
libgkeyfile1.0-cil
libgladeui-1-11
+libgladeui-1-dev
libgmm-dev
+libgo0
+libgo0-dbg
libgtk-sharp-beans-cil
libgtk-sharp-beans2.0-cil-dev
libgtkhtml-editor-common
@@ -139,7 +137,6 @@
libmozjs185-1.0
libmozjs185-dev
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmysql-java
libmysqlclient16
libmysqlclient16-dev
@@ -172,9 +169,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libumfpack5.4.0
libvala-0.12-0
libvala-0.12-0-dbg
@@ -203,16 +197,20 @@
myspell-tools
oxygen-icon-theme-complete
pngquant
+python-aptdaemon.gtkwidgets
python-bittorrent
python-central
python-desktopcouch
python-desktopcouch-application
python-desktopcouch-records
python-desktopcouch-recordtypes
+python-farsight
python-fontforge
python-gamin
python-indicate
python-support
+python-telepathy
+python-xklavier
python2.6-dbg
python2.6-dev
python2.6-doc
diff -Nru update-manager-0.156.7/DistUpgrade/demoted.cfg.lucid update-manager-0.156.8/DistUpgrade/demoted.cfg.lucid
--- update-manager-0.156.7/DistUpgrade/demoted.cfg.lucid 2012-03-05 08:04:27.000000000 +0000
+++ update-manager-0.156.8/DistUpgrade/demoted.cfg.lucid 2012-03-13 14:50:49.000000000 +0000
@@ -14,7 +14,6 @@
brltty-x11
byacc
cantor
-checkbox-gtk
cheese
cheese-common
compiz-fusion-bcop
@@ -51,12 +50,6 @@
gbrainy
gcc-4.4-multilib
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
gconf-defaults-service
gconf-editor
gdebi
@@ -80,7 +73,6 @@
groovy
groovy-doc
gs-common
-gtk2-engines-pixbuf
gtk2-engines-qtcurve
hal
hal-doc
@@ -131,9 +123,6 @@
libccolamd2.7.1
libcheese-gtk-dev
libcholmod1.7.1
-libclutter-gtk-0.10-0
-libclutter-gtk-0.10-dbg
-libclutter-gtk-0.10-dev
libcolamd2.7.1
libcommons-attributes-java
libcommons-attributes-java-doc
@@ -193,10 +182,6 @@
libfreezethaw-perl
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgconfmm-2.6-1c2
libgconfmm-2.6-dev
libgconfmm-2.6-doc
@@ -210,6 +195,7 @@
libgeronimo-j2ee-connector-1.5-spec-java
libgeronimo-jacc-1.1-spec-java
libgeronimo-jpa-3.0-spec-java
+libgladeui-1-dev
libgmm-dev
libgmp3c2
libgnome-keyring1.0-cil
@@ -243,7 +229,6 @@
libgnomeuimm-2.6-1c2a
libgnomeuimm-2.6-dev
libgnomeuimm-2.6-doc
-libgnomevfs2-extra
libgoogle-collections-java
libgraphite-dev
libgraphite3
@@ -296,7 +281,6 @@
libmono-addins-gui0.2-cil
libmono-addins0.2-cil
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmvel-java
libmysql-java
libmysqlclient16
@@ -359,9 +343,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libtut-dev
libucl-dev
libucl1
@@ -422,6 +403,7 @@
python-desktopcouch
python-desktopcouch-records
python-eggtrayicon
+python-farsight
python-fontforge
python-gamin
python-gksu2
@@ -433,6 +415,7 @@
python-old-doctools
python-scriptutil
python-support
+python-telepathy
python-van.pydeb
python2.6-dbg
python2.6-dev
diff -Nru update-manager-0.156.7/DistUpgrade/DistUpgradeCache.py update-manager-0.156.8/DistUpgrade/DistUpgradeCache.py
--- update-manager-0.156.7/DistUpgrade/DistUpgradeCache.py 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/DistUpgrade/DistUpgradeCache.py 2012-03-13 14:20:38.000000000 +0000
@@ -662,7 +662,7 @@
" * Upgrading to a pre-release version of Ubuntu\n"
" * Running the current pre-release version of Ubuntu\n"
" * Unofficial software packages not provided by Ubuntu\n"
- "\n" % e)
+ "\n") % e
# we never have partialUpgrades (including removes) on a stable system
# with only ubuntu sources so we do not recommend reporting a bug
if partialUpgrade:
@@ -749,7 +749,7 @@
raise SystemError, _("The package '%s' is marked for removal but it is in the removal blacklist.") % pkg.name
if pkg.marked_delete and (pkg._pkg.Essential == True and
not pkg.name in removeEssentialOk):
- logging.debug("The package '%s' is marked for removal but it's a ESSENTIAL package", pkg.name)
+ logging.debug("The package '%s' is marked for removal but it's an ESSENTIAL package", pkg.name)
raise SystemError, _("The essential package '%s' is marked for removal.") % pkg.name
# check bad-versions blacklist
badVersions = self.config.getlist("Distro","BadVersions")
diff -Nru update-manager-0.156.7/DistUpgrade/DistUpgrade.cfg update-manager-0.156.8/DistUpgrade/DistUpgrade.cfg
--- update-manager-0.156.7/DistUpgrade/DistUpgrade.cfg 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/DistUpgrade/DistUpgrade.cfg 2012-03-05 08:21:59.000000000 +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-core, 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/
diff -Nru update-manager-0.156.7/DistUpgrade/DistUpgradeQuirks.py update-manager-0.156.8/DistUpgrade/DistUpgradeQuirks.py
--- update-manager-0.156.7/DistUpgrade/DistUpgradeQuirks.py 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/DistUpgrade/DistUpgradeQuirks.py 2012-03-13 14:20:33.000000000 +0000
@@ -494,10 +494,12 @@
if set(I8XX_PCI_IDS).intersection(lspci):
res = self._view.askYesNoQuestion(
_("Your graphics hardware may not be fully supported in "
- "Ubuntu 11.04."),
- _("The support in Ubuntu 11.04 for your intel graphics "
- "hardware is limited "
+ "Ubuntu 12.04 LTS."),
+ _("The support in Ubuntu 12.04 LTS for your Intel "
+ "graphics hardware is limited "
"and you may encounter problems after the upgrade. "
+ "For more information see "
+ "https://wiki.ubuntu.com/X/Bugs/UpdateManagerWarningForI8xx "
"Do you want to continue with the upgrade?")
)
if res == False:
@@ -814,11 +816,11 @@
logging.debug("killing gnome-screensaver")
subprocess.call(["killall", "-q", "gnome-screensaver"])
def _pokeScreensaver(self):
- if os.path.exists("/usr/bin/xdg-screensaver"):
+ if os.path.exists("/usr/bin/xdg-screensaver") and os.environ.get('DISPLAY') :
logging.debug("setup poke timer for the scrensaver")
try:
self._poke = subprocess.Popen(
- "while true; do /usr/bin/xdg-screensaver reset; sleep 30; done",
+ "while true; do /usr/bin/xdg-screensaver reset >/dev/null 2>&1; sleep 30; done",
shell=True)
atexit.register(self._stopPokeScreensaver)
except:
diff -Nru update-manager-0.156.7/DistUpgrade/DistUpgradeVersion.py update-manager-0.156.8/DistUpgrade/DistUpgradeVersion.py
--- update-manager-0.156.7/DistUpgrade/DistUpgradeVersion.py 2012-03-05 08:05:07.000000000 +0000
+++ update-manager-0.156.8/DistUpgrade/DistUpgradeVersion.py 2012-03-13 14:51:33.000000000 +0000
@@ -1 +1 @@
-VERSION='0.156.7'
+VERSION='0.156.8'
diff -Nru update-manager-0.156.7/DistUpgrade/DistUpgradeViewGtk3.py update-manager-0.156.8/DistUpgrade/DistUpgradeViewGtk3.py
--- update-manager-0.156.7/DistUpgrade/DistUpgradeViewGtk3.py 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/DistUpgrade/DistUpgradeViewGtk3.py 2012-03-05 08:12:28.000000000 +0000
@@ -410,7 +410,7 @@
icons = Gtk.IconTheme.get_default()
try:
- self.window_main.set_default_icon(icons.load_icon("update-manager", 32, 0))
+ self.window_main.set_default_icon(icons.load_icon("system-software-update", 32, 0))
except GObject.GError, e:
logging.debug("error setting default icon, ignoring (%s)" % e)
pass
diff -Nru update-manager-0.156.7/DistUpgrade/DistUpgradeViewGtk.py update-manager-0.156.8/DistUpgrade/DistUpgradeViewGtk.py
--- update-manager-0.156.7/DistUpgrade/DistUpgradeViewGtk.py 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/DistUpgrade/DistUpgradeViewGtk.py 2012-03-05 08:12:28.000000000 +0000
@@ -393,7 +393,7 @@
icons = gtk.icon_theme_get_default()
try:
- gtk.window_set_default_icon(icons.load_icon("update-manager", 32, 0))
+ gtk.window_set_default_icon(icons.load_icon("system-software-update", 32, 0))
except gobject.GError, e:
logging.debug("error setting default icon, ignoring (%s)" % e)
pass
diff -Nru update-manager-0.156.7/DistUpgrade/mirrors.cfg update-manager-0.156.8/DistUpgrade/mirrors.cfg
--- update-manager-0.156.7/DistUpgrade/mirrors.cfg 2012-03-05 08:04:36.000000000 +0000
+++ update-manager-0.156.8/DistUpgrade/mirrors.cfg 2012-03-13 14:50:58.000000000 +0000
@@ -618,7 +618,6 @@
http://ftp.acc.umu.se/ubuntu/
http://ftp.snt.utwente.nl/pub/os/linux/ubuntu/
http://mirror.internetone.it/ubuntu-archive/
-http://mirror.pnl.gov/ubuntu/
http://ubuntu.idrepo.or.id/ubuntu/
http://ubuntu.mirror.tudos.de/ubuntu/
http://mirror.nl.leaseweb.net/ubuntu/
@@ -674,6 +673,7 @@
http://mirror.corbina.net/ubuntu/
http://mirror.cse.iitk.ac.in/ubuntu/
http://mirror.dattobackup.com/ubuntu/
+http://mirror.edatel.net.co/ubuntu/
http://mirror.ihug.co.nz/ubuntu/
http://mirror.its.sfu.ca/mirror/ubuntu/
http://mirror.kavalinux.com/ubuntu/
@@ -709,7 +709,6 @@
http://mirrors.mit.edu/ubuntu/
http://mirrors.psu.ac.th/pub/ubuntu/
http://mirrors.sohu.com/ubuntu/
-http://mirrors.tecnoera.com/ubuntu/
http://mirrors.telianet.dk/ubuntu/
http://mirrors.uaip.org/ubuntu/
http://mirrors.ustc.edu.cn/ubuntu/
@@ -722,7 +721,6 @@
http://suse.uni-leipzig.de/pub/releases.ubuntu.com/ubuntu/
http://tux.rainside.sk/ubuntu/
http://ubuntu-archive.locaweb.com.br/ubuntu/
-http://ubuntu-mirror.telesys.org.ua/ubuntu/
http://ubuntu.arcticnetwork.ca/
http://ubuntu.cs.nctu.edu.tw/ubuntu/
http://ubuntu.cybercomhosting.com/ubuntu/
@@ -746,7 +744,6 @@
http://ubuntu.wikimedia.org/ubuntu/
http://ucmirror.canterbury.ac.nz/ubuntu/
http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/
-http://www.club.cc.cmu.edu/pub/ubuntu/
http://ubuntu-archive.adsolux.com/ubuntu/
http://archive.ubuntu.nautile.nc/ubuntu/
http://biruni.upm.my/mirror/ubuntu/
@@ -775,11 +772,11 @@
http://mirror.its.dal.ca/ubuntu/
http://mirror.learn.ac.lk/ubuntu/
http://mirror.neolabs.kz/ubuntu/
-ftp://mirror.space.kz/ubuntu/
http://mirror.squ.edu.om/ubuntuarchive/
http://mirrors.bloomu.edu/ubuntu/
http://mirrors.ispros.com.bd/ubuntu/
http://mirrors.serverhost.ro/ubuntu/archive/
+http://mirrors.ucr.ac.cr/ubuntu/
http://pandawa.ipb.ac.id/ubuntu/
http://singo.ub.ac.id/ubuntu/
http://ubuntu.eecs.wsu.edu/
diff -Nru update-manager-0.156.7/DistUpgrade/removal_blacklist.cfg update-manager-0.156.8/DistUpgrade/removal_blacklist.cfg
--- update-manager-0.156.7/DistUpgrade/removal_blacklist.cfg 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/DistUpgrade/removal_blacklist.cfg 2012-03-13 14:20:33.000000000 +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
@@ -16,3 +17,5 @@
# unity
unity$
unity-2d$
+# gnome-session (LP: #946539)
+gnome-session$
diff -Nru update-manager-0.156.7/DistUpgrade/utils.py update-manager-0.156.8/DistUpgrade/utils.py
--- update-manager-0.156.7/DistUpgrade/utils.py 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/DistUpgrade/utils.py 2012-03-05 08:21:03.000000000 +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"
diff -Nru update-manager-0.156.7/update-manager update-manager-0.156.8/update-manager
--- update-manager-0.156.7/update-manager 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/update-manager 2012-03-13 14:20:33.000000000 +0000
@@ -109,8 +109,8 @@
# to get rid of the ugly hideStep() stuff
view = DistUpgradeViewGtk3(data_dir)
view.label_title.set_markup("%s" % _("Running partial upgrade"))
- controler = DistUpgradeController(view, datadir=data_dir)
- controler.doPartialUpgrade()
+ controller = DistUpgradeController(view, datadir=data_dir)
+ controller.doPartialUpgrade()
else:
app = UpdateManager(data_dir, options)
app.main(options)
diff -Nru update-manager-0.156.7/UpdateManager/backend/InstallBackendAptdaemon.py update-manager-0.156.8/UpdateManager/backend/InstallBackendAptdaemon.py
--- update-manager-0.156.7/UpdateManager/backend/InstallBackendAptdaemon.py 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/UpdateManager/backend/InstallBackendAptdaemon.py 2012-03-05 08:12:28.000000000 +0000
@@ -70,7 +70,7 @@
@inline_callbacks
def _run_in_dialog(self, trans, action):
dia = AptProgressDialog(trans, parent=self.window_main)
- dia.set_icon_name("update-manager")
+ dia.set_icon_name("system-software-update")
dia.connect("finished", self._on_finished, action)
yield dia.run()
diff -Nru update-manager-0.156.7/UpdateManager/Core/utils.py update-manager-0.156.8/UpdateManager/Core/utils.py
--- update-manager-0.156.7/UpdateManager/Core/utils.py 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/UpdateManager/Core/utils.py 2012-03-05 08:21:03.000000000 +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"
diff -Nru update-manager-0.156.7/UpdateManager/UpdateManager.py update-manager-0.156.8/UpdateManager/UpdateManager.py
--- update-manager-0.156.7/UpdateManager/UpdateManager.py 2012-03-05 08:00:46.000000000 +0000
+++ update-manager-0.156.8/UpdateManager/UpdateManager.py 2012-03-13 14:23:20.000000000 +0000
@@ -53,7 +53,8 @@
import dbus
import dbus.service
-import dbus.glib
+from dbus.mainloop.glib import DBusGMainLoop
+DBusGMainLoop(set_as_default=True)
import GtkProgress
import backend
@@ -171,7 +172,7 @@
def __init__(self, datadir, options):
self.setupDbus()
- Gtk.Window.set_default_icon_name("update-manager")
+ Gtk.Window.set_default_icon_name("system-software-update")
self.datadir = datadir
SimpleGtkbuilderApp.__init__(self, datadir+"gtkbuilder/UpdateManager.ui",
"update-manager")
@@ -186,7 +187,7 @@
self.sleep_cookie = None
self.sleep_dev = None
- self.image_logo.set_from_icon_name("update-manager", Gtk.IconSize.DIALOG)
+ self.image_logo.set_from_icon_name("system-software-update", Gtk.IconSize.DIALOG)
self.window_main.set_sensitive(False)
self.window_main.grab_focus()
self.button_close.grab_focus()
diff -Nru update-manager-0.156.7/utils/demoted.cfg update-manager-0.156.8/utils/demoted.cfg
--- update-manager-0.156.7/utils/demoted.cfg 2012-03-05 08:03:23.000000000 +0000
+++ update-manager-0.156.8/utils/demoted.cfg 2012-03-13 14:49:34.000000000 +0000
@@ -8,7 +8,7 @@
banshee-extension-soundmenu
cantor
cantor-dbg
-checkbox-gtk
+cobbler-enlist
couchdb-bin
dcraw
desktopcouch
@@ -22,12 +22,7 @@
gamin
gbrainy
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
+gcc-4.5-multilib
gir1.2-couchdb-1.0
gir1.2-desktopcouch-1.0
gnome-desktop-data
@@ -69,6 +64,10 @@
koffice-l10n-wa
koffice-l10n-zhcn
koffice-l10n-zhtw
+lib32go0
+lib32go0-dbg
+lib64go0
+lib64go0-dbg
libaccess-bridge-java
libaccess-bridge-java-jni
libamd2.2.0
@@ -100,17 +99,16 @@
libdirectfb-extra-dbg
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgdata-cil-dev
libgio-cil
libgio2.0-cil-dev
libgkeyfile-cil-dev
libgkeyfile1.0-cil
libgladeui-1-11
+libgladeui-1-dev
libgmm-dev
+libgo0
+libgo0-dbg
libgtk-sharp-beans-cil
libgtk-sharp-beans2.0-cil-dev
libgtkhtml-editor-common
@@ -139,7 +137,6 @@
libmozjs185-1.0
libmozjs185-dev
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmysql-java
libmysqlclient16
libmysqlclient16-dev
@@ -172,9 +169,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libumfpack5.4.0
libvala-0.12-0
libvala-0.12-0-dbg
@@ -203,16 +197,20 @@
myspell-tools
oxygen-icon-theme-complete
pngquant
+python-aptdaemon.gtkwidgets
python-bittorrent
python-central
python-desktopcouch
python-desktopcouch-application
python-desktopcouch-records
python-desktopcouch-recordtypes
+python-farsight
python-fontforge
python-gamin
python-indicate
python-support
+python-telepathy
+python-xklavier
python2.6-dbg
python2.6-dev
python2.6-doc
diff -Nru update-manager-0.156.7/utils/demoted.cfg.lucid update-manager-0.156.8/utils/demoted.cfg.lucid
--- update-manager-0.156.7/utils/demoted.cfg.lucid 2012-03-05 08:04:27.000000000 +0000
+++ update-manager-0.156.8/utils/demoted.cfg.lucid 2012-03-13 14:50:49.000000000 +0000
@@ -14,7 +14,6 @@
brltty-x11
byacc
cantor
-checkbox-gtk
cheese
cheese-common
compiz-fusion-bcop
@@ -51,12 +50,6 @@
gbrainy
gcc-4.4-multilib
gcc-4.4-source
-gcj-4.4-base
-gcj-4.4-jdk
-gcj-4.4-jre
-gcj-4.4-jre-headless
-gcj-4.4-jre-lib
-gcj-4.4-source
gconf-defaults-service
gconf-editor
gdebi
@@ -80,7 +73,6 @@
groovy
groovy-doc
gs-common
-gtk2-engines-pixbuf
gtk2-engines-qtcurve
hal
hal-doc
@@ -131,9 +123,6 @@
libccolamd2.7.1
libcheese-gtk-dev
libcholmod1.7.1
-libclutter-gtk-0.10-0
-libclutter-gtk-0.10-dbg
-libclutter-gtk-0.10-dev
libcolamd2.7.1
libcommons-attributes-java
libcommons-attributes-java-doc
@@ -193,10 +182,6 @@
libfreezethaw-perl
libgamin-dev
libgamin0
-libgcj10
-libgcj10-awt
-libgcj10-dbg
-libgcj10-dev
libgconfmm-2.6-1c2
libgconfmm-2.6-dev
libgconfmm-2.6-doc
@@ -210,6 +195,7 @@
libgeronimo-j2ee-connector-1.5-spec-java
libgeronimo-jacc-1.1-spec-java
libgeronimo-jpa-3.0-spec-java
+libgladeui-1-dev
libgmm-dev
libgmp3c2
libgnome-keyring1.0-cil
@@ -243,7 +229,6 @@
libgnomeuimm-2.6-1c2a
libgnomeuimm-2.6-dev
libgnomeuimm-2.6-doc
-libgnomevfs2-extra
libgoogle-collections-java
libgraphite-dev
libgraphite3
@@ -296,7 +281,6 @@
libmono-addins-gui0.2-cil
libmono-addins0.2-cil
libmusicbrainz4-dev
-libmusicbrainz4c2a
libmvel-java
libmysql-java
libmysqlclient16
@@ -359,9 +343,6 @@
libts-0.0-0-dbg
libts-bin
libts-dev
-libtunepimp-dev
-libtunepimp5
-libtunepimp5-dbg
libtut-dev
libucl-dev
libucl1
@@ -422,6 +403,7 @@
python-desktopcouch
python-desktopcouch-records
python-eggtrayicon
+python-farsight
python-fontforge
python-gamin
python-gksu2
@@ -433,6 +415,7 @@
python-old-doctools
python-scriptutil
python-support
+python-telepathy
python-van.pydeb
python2.6-dbg
python2.6-dev