r12295 - in /packages/experimental/update-manager/debian: changelog patches/02_disable_dist_upgrade.diff patches/02_replace_dist_upgrade.diff
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Wed Aug 8 13:47:30 UTC 2007
Author: kov
Date: Wed Aug 8 13:47:30 2007
New Revision: 12295
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12295
Log:
instead of disabling the Ubuntu's dist-upgrade, replace it with our
own
Added:
packages/experimental/update-manager/debian/patches/02_replace_dist_upgrade.diff
Removed:
packages/experimental/update-manager/debian/patches/02_disable_dist_upgrade.diff
Modified:
packages/experimental/update-manager/debian/changelog
Modified: packages/experimental/update-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-manager/debian/changelog?rev=12295&op=diff
==============================================================================
--- packages/experimental/update-manager/debian/changelog (original)
+++ packages/experimental/update-manager/debian/changelog Wed Aug 8 13:47:30 2007
@@ -1,9 +1,15 @@
update-manager (0.64-3) UNRELEASED; urgency=low
+ [ Loic Minier ]
* Use ubuntu-get-source instead of gnome-get-source; build-dep on
gnome-pkg-tools >= 0.12.3.
- -- Loic Minier <lool at dooz.org> Tue, 31 Jul 2007 16:47:19 +0200
+ [ Gustavo Noronha Silva ]
+ * 02_disable_dist_upgrade.diff -> 02_replace_dist_upgrade.diff:
+ - instead of disabling, we'll do what is useful for Debian: a normal
+ dist-upgrade
+
+ -- Gustavo Noronha Silva <kov at debian.org> Wed, 08 Aug 2007 10:32:41 -0300
update-manager (0.64-2) experimental; urgency=low
Added: packages/experimental/update-manager/debian/patches/02_replace_dist_upgrade.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/update-manager/debian/patches/02_replace_dist_upgrade.diff?rev=12295&op=file
==============================================================================
--- packages/experimental/update-manager/debian/patches/02_replace_dist_upgrade.diff (added)
+++ packages/experimental/update-manager/debian/patches/02_replace_dist_upgrade.diff Wed Aug 8 13:47:30 2007
@@ -1,0 +1,175 @@
+diff -urN update-manager-0.64.old/data/glade/UpdateManager.glade~ update-manager-0.64/data/glade/UpdateManager.glade
+--- update-manager-0.64.old/data/glade/UpdateManager.glade~ 2007-03-26 06:18:34.000000000 -0300
++++ update-manager-0.64/data/glade/UpdateManager.glade 2007-07-15 16:01:41.000000000 -0300
+@@ -1403,7 +1403,7 @@
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+- <property name="label" translatable="yes">_Partial Upgrade</property>
++ <property name="label" translatable="yes">Smart _Upgrade</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+@@ -1443,7 +1443,7 @@
+ <child>
+ <widget class="GtkImage" id="image15">
+ <property name="visible">True</property>
+- <property name="stock">gtk-dialog-warning</property>
++ <property name="stock">gtk-dialog-info</property>
+ <property name="icon_size">6</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+@@ -1492,12 +1492,10 @@
+ <child>
+ <widget class="GtkLabel" id="label31">
+ <property name="visible">True</property>
+- <property name="label" translatable="yes">Run a partial upgrade, to install as many updates as possible.
++ <property name="label" translatable="yes">This can be caused by unofficial package sources or because a new version of a package has a new dependency or conflicts with an installed package.
+
+-This can be caused by:
+- â—¦ A previous upgrade which didn't complete
+- â—¦ Unofficial software packages not provided by Ubuntu
+- â—¦ Normal changes of a pre-release version of Ubuntu</property>
++You can run a smart upgrade to install the new dependencies and remove conflicts where needed. Be sure to check the proposed removals for software you would like to keep installed.
++</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+diff -urN update-manager-0.64.old/update-manager update-manager-0.64/update-manager
+--- update-manager-0.64.old/update-manager 2007-06-18 10:23:15.000000000 -0300
++++ update-manager-0.64/update-manager 2007-07-15 15:54:59.000000000 -0300
+@@ -46,46 +46,32 @@
+
+ # Begin parsing of options
+ parser = OptionParser()
+- parser.add_option ("-c", "--check-dist-upgrades", action="store_true",
+- dest="check_dist_upgrades", default=False,
+- help=_("Check if a new distribution release is available"))
+- parser.add_option ("-d", "--devel-release", action="store_true",
+- dest="devel_release", default=False,
+- help=_("Check if upgrading to the latest devel release "
+- "is possible"))
+- parser.add_option ("-p","--proposed", action="store_true",
+- dest="use_proposed", default=False,
+- help=_("Try to run a dist-upgrade"))
++# on Debian we still don't support meta-release, so comment all options that
++# use it (all, as of now!)
++# parser.add_option ("-c", "--check-dist-upgrades", action="store_true",
++# dest="check_dist_upgrades", default=False,
++# help=_("Check if a new distribution release is available"))
++# parser.add_option ("-d", "--devel-release", action="store_true",
++# dest="devel_release", default=False,
++# help=_("Check if upgrading to the latest devel release "
++# "is possible"))
++# parser.add_option ("-p","--proposed", action="store_true",
++# dest="use_proposed", default=False,
++# help=_("Try to run a dist-upgrade"))
+ parser.add_option ("--dist-upgrade","--dist-ugprade", action="store_true",
+ dest="dist_upgrade", default=False,
+ help=_("Try to run a dist-upgrade"))
+
+ (options, args) = parser.parse_args()
+
++ # (Debian) let's add placeholder configuration information so that the
++ # patch doesn't get too intrusive
++ options.check_dist_upgrades = False
++ options.devel_release = False
++ options.use_proposed = False
++
+ data_dir="/usr/share/update-manager/"
+ #data_dir="/tmp/xxx/share/update-manager/"
+
+- if options.dist_upgrade == True:
+- from DistUpgrade.DistUpgradeView import STEP_PREPARE, STEP_MODIFY_SOURCES, STEP_FETCH, STEP_INSTALL, STEP_CLEANUP, STEP_REBOOT
+- from DistUpgrade.DistUpgradeViewGtk import DistUpgradeViewGtk
+- from DistUpgrade.DistUpgradeControler import DistUpgradeControler
+- # FIXME: we *really* want to different view here
+- view = DistUpgradeViewGtk(data_dir)
+- view.label_title.set_markup("<b><big>%s</big></b>" % _("Running partial upgrade"))
+- view.setStep(STEP_PREPARE)
+- view.hideStep(STEP_MODIFY_SOURCES)
+- view.hideStep(STEP_REBOOT)
+- controler = DistUpgradeControler(view, datadir=data_dir)
+- controler.prepare()
+- controler.doPreUpgrade()
+- if controler.askDistUpgrade():
+- view.setStep(STEP_FETCH_INSTALL)
+- if not controler.doDistUpgrade():
+- sys.exit(1)
+- view.setStep(STEP_CLEANUP)
+- controler.doPostUpgrade()
+- view.information(_("Upgrade complete"),
+- _("The upgrade was completed."))
+- else:
+- app = UpdateManager(data_dir)
+- app.main(options)
++ app = UpdateManager(data_dir)
++ app.main(options)
+diff -urN update-manager-0.64.old/UpdateManager/UpdateManager.py update-manager-0.64/UpdateManager/UpdateManager.py
+--- update-manager-0.64.old/UpdateManager/UpdateManager.py 2007-06-13 07:51:17.000000000 -0300
++++ update-manager-0.64/UpdateManager/UpdateManager.py 2007-07-15 15:57:08.000000000 -0300
+@@ -113,14 +113,11 @@
+ @property
+ def installCount(self):
+ return self._depcache.InstCount
+- def saveDistUpgrade(self):
++ def saveDistUpgrade(self, options):
+ """ this functions mimics a upgrade but will never remove anything """
+- self._depcache.Upgrade(True)
++ self._depcache.Upgrade(options.dist_upgrade)
+ wouldDelete = self._depcache.DelCount
+- if self._depcache.DelCount > 0:
+- self.clear()
+- assert self._depcache.BrokenCount == 0 and self._depcache.DelCount == 0
+- self._depcache.Upgrade()
++ assert self._depcache.BrokenCount == 0
+ return wouldDelete
+
+ def get_changelog(self, name, lock):
+@@ -231,8 +228,9 @@
+ self.importance = importance
+ self.description = desc
+
+- def __init__(self):
++ def __init__(self, options):
+ # a map of packages under their origin
++ self.options = options
+ pipe = os.popen("lsb_release -c -s")
+ dist = pipe.read().strip()
+ del pipe
+@@ -256,7 +254,7 @@
+ self.held_back = []
+
+ # do the upgrade
+- self.distUpgradeWouldDelete = cache.saveDistUpgrade()
++ self.distUpgradeWouldDelete = cache.saveDistUpgrade(self.options)
+
+ # sort by origin
+ for pkg in cache:
+@@ -588,7 +586,7 @@
+ Select all updates
+ """
+ self.setBusy(True)
+- self.cache.saveDistUpgrade()
++ self.cache.saveDistUpgrade(self.options)
+ self.treeview_update.queue_draw()
+ self.refresh_updates_count()
+ self.setBusy(False)
+@@ -841,7 +839,7 @@
+ dialog.destroy()
+ sys.exit(1)
+ self.store.clear()
+- self.list = UpdateList()
++ self.list = UpdateList(self.options)
+ # fill them again
+ try:
+ self.list.update(self.cache)
+@@ -989,7 +987,7 @@
+ def check_all_updates_installable(self):
+ """ Check if all available updates can be installed and suggest
+ to run a distribution upgrade if not """
+- if self.list.distUpgradeWouldDelete > 0:
++ if self.list.held_back and not self.options.dist_upgrade:
+ self.dialog_dist_upgrade.set_transient_for(self.window_main)
+ res = self.dialog_dist_upgrade.run()
+ self.dialog_dist_upgrade.hide()
More information about the pkg-gnome-commits
mailing list