summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.dist-upgrade30
-rw-r--r--SoftwareProperties/SoftwareProperties.py2
-rw-r--r--TODO1
-rw-r--r--UpdateManager/Common/DistInfo.py (renamed from UpdateManagerCommon/DistInfo.py)0
-rw-r--r--UpdateManager/Common/Makefile (renamed from UpdateManagerCommon/Makefile)0
-rw-r--r--UpdateManager/Common/Makefile.am (renamed from UpdateManagerCommon/Makefile.am)0
-rw-r--r--UpdateManager/Common/SimpleGladeApp.py (renamed from UpdateManagerCommon/SimpleGladeApp.py)0
-rw-r--r--UpdateManager/Common/__init__.py (renamed from UpdateManagerCommon/__init__.py)0
-rw-r--r--debian/control2
-rwxr-xr-xsetup.py2
10 files changed, 34 insertions, 3 deletions
diff --git a/README.dist-upgrade b/README.dist-upgrade
new file mode 100644
index 00000000..9f85b3c0
--- /dev/null
+++ b/README.dist-upgrade
@@ -0,0 +1,30 @@
+Distribution Upgrade tools for Ubuntu
+-------------------------------------
+
+This tool implements the spec at:
+https://wiki.ubuntu.com/AutomaticUpgrade
+
+Broadly speaking a upgrade from one version to the next consists
+of three things:
+
+1) The user must be informed about the new available distro
+ (possibly release notes as well) and run the upgrade tool
+2) The upgrade tool must be able to download updated information
+ how to perform the upgrade (e.g. additional steps like upgrading
+ certain libs first)
+3) The upgrade tools runs and installs/remove packages and does
+ some additional steps like post-release cleanup
+
+
+
+The steps in additon to upgrading the installed packages fall into this
+categories:
+* switch to new sources.list entries
+* adding the default user to new groups (warty, scanner group)
+* remove packages/install others (breezy, R:mozilla-firefox, RI:firefox,
+ install ubuntu-desktop package again, R:portmap, I:language-package*)
+* check conffile settings (breezy: /etc/X11/xorg.conf; warty: /etc/modules)
+* ask/change mirrors (breezy)
+* breezy: install new version of libgtk2.0-0 from hoary-updates, then
+ restart synaptic
+* reboot \ No newline at end of file
diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index f344db6d..86586cc1 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -32,7 +32,7 @@ import gettext
#sys.path.append("@prefix/share/update-manager/python")
-from UpdateManagerCommon import SimpleGladeApp
+from UpdateManager.Common import SimpleGladeApp
import aptsources
import dialog_add
import dialog_edit
diff --git a/TODO b/TODO
index 7c40fa94..227893b5 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,4 @@
+- add download size to treeview
- add /etc/apt/software-properties.d dir where the user can
install matchers and templates
- handle cases like "deb http://bla/ dist sec1 sec2 # comment" \ No newline at end of file
diff --git a/UpdateManagerCommon/DistInfo.py b/UpdateManager/Common/DistInfo.py
index df244a51..df244a51 100644
--- a/UpdateManagerCommon/DistInfo.py
+++ b/UpdateManager/Common/DistInfo.py
diff --git a/UpdateManagerCommon/Makefile b/UpdateManager/Common/Makefile
index 9409e7e8..9409e7e8 100644
--- a/UpdateManagerCommon/Makefile
+++ b/UpdateManager/Common/Makefile
diff --git a/UpdateManagerCommon/Makefile.am b/UpdateManager/Common/Makefile.am
index e32500bd..e32500bd 100644
--- a/UpdateManagerCommon/Makefile.am
+++ b/UpdateManager/Common/Makefile.am
diff --git a/UpdateManagerCommon/SimpleGladeApp.py b/UpdateManager/Common/SimpleGladeApp.py
index 90c598cc..90c598cc 100644
--- a/UpdateManagerCommon/SimpleGladeApp.py
+++ b/UpdateManager/Common/SimpleGladeApp.py
diff --git a/UpdateManagerCommon/__init__.py b/UpdateManager/Common/__init__.py
index 312e52dd..312e52dd 100644
--- a/UpdateManagerCommon/__init__.py
+++ b/UpdateManager/Common/__init__.py
diff --git a/debian/control b/debian/control
index 8689ffbc..1d0818d8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.1.1
Package: update-manager
Architecture: any
-Depends: ${python:Depends}, ${misc:Depends}, python, python-gnome2, python-glade2, python-apt, synaptic (>= 0.57.4ubuntu4), lsb-release
+Depends: ${python:Depends}, ${misc:Depends}, python, python-gnome2, python-glade2, python-apt (>= 0.6.14ubuntu2), synaptic (>= 0.57.4ubuntu4), lsb-release
Description: GNOME application that manages apt updates
This is the GNOME apt update manager. It checks for updates and lets the user
choose which to install.
diff --git a/setup.py b/setup.py
index 2c652654..b1e567e6 100755
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ os.system("cd channels; make")
setup(name='update-manager',
version='0.1',
- packages=['SoftwareProperties','UpdateManager','UpdateManagerCommon'],
+ packages=['SoftwareProperties','UpdateManager'],
scripts=['gnome-software-properties','src/update-manager'],
data_files=[('share/update-manager/glade',
glob.glob("data/*.glade")),