* Fork a pyton-aptsources source tree from update-manager

7 files changed, 46 insertions, 910 deletions

diff --git a/debian/changelog b/debian/changelog
index 3d13d542..dc89f8be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,790 +1,5 @@
-update-manager (0.45.1) edgy-updates; urgency=low
-
-  * handle unexpected data from data more gracefuly (lp: #68553)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 27 Oct 2006 10:23:39 +0200
-
-update-manager (0.45) edgy; urgency=low
-
-  * debian/control:
-    - added dependency on python-gconf
-    - removed recommends on python-gnome2
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 11 Oct 2006 18:32:17 +0200
-
-update-manager (0.44.17) edgy; urgency=low
-
-  * memory leak fixed (lp: #43096)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  9 Oct 2006 15:24:40 +0200
-
-update-manager (0.44.16) edgy; urgency=low
-
-  * fix proxy usage when runing in non-root mode (lp: #40626)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  6 Oct 2006 15:17:37 +0200
-
-update-manager (0.44.15) edgy; urgency=low
-
-  * added missing python-vte dependency (lp: #63609)
-  * added missing gksu dependency (lp: #63572)
-  * don't remove xchat automatically anymore on upgrade (leftover
-    from breezy->dapper) (lp: #63881)
-  * do not come up with bogus dist-upgrade suggestions
-  * fix bad english grammar (lp: #63761, #63474)
-  * fix in the edgyUpdates quirks handler (lp: #63723)
-  * catch error from _tryMarkObsoleteForRemoval() (lp: #63617)
-  * fix plural forms for ro, pl (lp: #46421)
-  * properly escape comments before displaying them (lp: #63475)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  4 Oct 2006 21:10:40 +0200
-
-update-manager (0.44.14) edgy; urgency=low
-
-  * fix some incorrect i18n markings (lp: #62681)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  2 Oct 2006 14:41:52 +0200
-
-update-manager (0.44.13) edgy; urgency=low
-
-  * fix missing i18n declarations (lp: #62519)
-  * data/glade/SoftwareProperties.glade:
-    - fix missing "translatable" property (lp: #62681)
-  * DistUpgrade:
-    - deal better with the python transition and the hpijs 
-      upgrade (lp: #62948)
-  * UpdateManager/UpdateManager.py:
-    - put the cancel button inside the text-area to avoid flickering
-    - make sure that src_ver is always initialized (thanks to
-      Simira for reporting)
-    - filter python-apt future warning (especially for seb128)
-  * DistUprade/DistUpgradeControler.py:
-    - check for self.sources, self.aptcdrom before using it (lp: #61852)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Sat, 23 Sep 2006 00:53:06 +0200
-
-update-manager (0.44.12) edgy; urgency=low
-
-  * DistUpgrade/DistUpgradeViewGtk.py:
-    - use '%d' instead of '%s' where appropriate (lp: #60239)
-  * fixed lots of typos (lp: #60633)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Sep 2006 16:37:52 +0200
-
-update-manager (0.44.11) edgy; urgency=low
-
-  * UpdateManager/UpdateManager.py:
-    - fix error in get_changelog (lp: #59940).
-      Thanks to Denis Washington
-    - bugfix in the ListStore
-    - use the update-manager desktop file when runing synaptic
-      as the backend to get a consistent UI
-    - UI improvements (thanks to Sebastian Heinlein!)
-    - remove branding
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 12 Sep 2006 20:37:55 +0200
-
-update-manager (0.44.10) edgy; urgency=low
-
-  * aptsources.py:
-    - fix add_component() to avoid duplicated components
-    - added MirrorsFile key to DistInfo code to have a better idea
-      about the available mirrors
-  * debian/control:
-    - updated dbus dependencies (lp: #59862)
-  
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 11 Sep 2006 09:38:21 +0200
-
-update-manager (0.44.9) edgy; urgency=low
-
-  * SoftwareProperties/SoftwareProperties.py:
-    - bugfix in the popcon enable code (lp: #59540)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Sat,  9 Sep 2006 02:13:40 +0200
-
-update-manager (0.44.8) edgy; urgency=low
-
-  * fix missing /var/log/dist-upgrade
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  8 Sep 2006 20:33:04 +0200
-
-update-manager (0.44.7) edgy; urgency=low
-
-  * UpdateManager/UpdateManager.py:
-    - be more accurate about dependencies when the user selects only
-      a supset of the packages
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  6 Sep 2006 12:29:05 +0200
-
-update-manager (0.44.6) edgy; urgency=low
-
-  * SoftwareProperties/SoftwareProperties.py:
-    - fix inconsistency in the new software-sources dialog
-  * integrate DistUpgrade code into UpdateManager to make sure
-    that after e.g. a CDROM upgrade the rest of the system can still
-    be fully upgraded over the net
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  5 Sep 2006 13:30:22 +0200
-
-update-manager (0.44.5) edgy; urgency=low
-
-  * install the DistUpgrade package too
-  * data/channels/Ubuntu.info.in:
-    - warty is no longer officially supported 
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 30 Aug 2006 11:32:24 +0200
-
-update-manager (0.44.4) edgy; urgency=low
-
-  * SoftwareProperties/SoftwareProperties.py:
-    - don't bomb when searching for the mirror (lp: #57015)
-  * UpdateManager/UpdateManager.py:
-    - added "%s-proposed" to the list of known origins
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 24 Aug 2006 13:00:23 +0200
-
-update-manager (0.44.3) edgy; urgency=low
-
-  * help/C/update-manager-C.omf:
-    - fix url (thanks to daniel holbach, lp: #45548)
-  * show the units better
-  * don't jump around on row activation 
-    (thanks to Sebastian Heinlein)
-  * send "inhibit sleep" to power-manager while applying 
-    updates  (lp #40697)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Aug 2006 18:06:53 +0200
-
-update-manager (0.44.2) edgy; urgency=low
-
-  * added select all/unselect all (thanks to Sebastian Heinlein)
-  * wording fixes
-  * fix update counting bug 
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  3 Aug 2006 17:52:09 +0200
-
-update-manager (0.44.1) edgy; urgency=low
-
-  * make UpdateManager check for new distribution releases by
-    default again
-  * fix dist-upgrade fetching when run as non-root. 
-  * sort the package list by the origin (UpdateManagerEdgy spec)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  2 Aug 2006 13:00:42 +0200
-
-update-manager (0.44) edgy; urgency=low
-
-  * new SoftwareProperties GUI (thanks to Sebastian Heinlein)
-  * support easy Popcon pariticipation
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 28 Jul 2006 01:06:16 +0200
-
-update-manager (0.43) edgy; urgency=low
-
-  * fixes in the changelog reading code
-  * speedup in the cache clear code
-  * runs as user by default now
-  * uses dbus to implement singleton behaviour
-  * updated the software-properties code to know about edgy
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  4 Jul 2006 11:16:31 +0200
-
-update-manager (0.42.2ubuntu22) dapper; urgency=low
-
-  * UpdateManager/UpdateManager.py:
-    - fix a 'brown paperback' bug when the Meta-Release file
-      checked (#46537)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 25 May 2006 12:30:42 +0200
-
-update-manager (0.42.2ubuntu21) dapper; urgency=low
-
-  * UpdateManager/UpdateManager.py:
-    - when a distribution release becomes available, display the 
-      version, not the codename (as per 
-      https://wiki.ubuntu.com/CodeNamesToVersionNumbers)
-    - fix a string that was not marked transltable
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 24 May 2006 15:07:19 +0200
-
-update-manager (0.42.2ubuntu20) dapper; urgency=low
-
-  * SoftwareProperties/aptsources.py, channels/Ubuntu.info.in:
-    - remove the codenames from the releases (as per 
-      https://wiki.ubuntu.com/CodeNamesToVersionNumbers)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 23 May 2006 16:04:39 +0200
-
-update-manager (0.42.2ubuntu19) dapper; urgency=low
-
-  * help/C/figures:
-    - applied "pngcrush" on the figures in the manual,
-      this saves 4 MB uncompressed (ubuntu: #45901)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 22 May 2006 09:37:19 +0200
-
-update-manager (0.42.2ubuntu18) dapper; urgency=low
-
-  * data/SoftwareProperties.glade:
-    - fix missing 'translatable="yes"' property (ubuntu: #44409)
-    - increase width to 620 (ubuntu: #40540)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 19 May 2006 01:45:22 +0200
-
-update-manager (0.42.2ubuntu17) dapper; urgency=low
-
-  * debian/control:
-    - depend on later python-apt (#45325)
-  * SoftwareProperties/SoftwareProperties.py:
-    - fix key updating after import (ubuntu #44927)
-  * UpdateManager/UpdateManager.py:
-    - remove debug output
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 19 May 2006 00:04:02 +0200
-
-update-manager (0.42.2ubuntu16) dapper; urgency=low
-
-  * use version and section of the source package (if this information is
-    available) when building the changelog URL (ubuntu #40058)
-  * SoftwareProperties/SoftwareProperties.py:
-    - if no config is found create a new one (ubuntu: #37560)
-  * UpdateManager/UpdateManager.py:
-    - fix problem in changelog reading code when matching against
-      installed versions with epochs (ubuntu: #40058)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 11 May 2006 17:33:40 +0200
-
-update-manager (0.42.2ubuntu15) dapper; urgency=low
-
-  * disable the install button if there no updates (ubuntu: #42284)
-    (Thanks to Sebastian Heinlein)
-  * show main window *after* restoring the size (ubuntu: #42277)
-    (Thanks to Sebastian Heinlein)
-  * fix broken spelling, typos, wording (ubuntu: #42431, #28777, 
-    #40425, #40727)
-  * help/C: merged from the docteam svn (ubuntu: 36092)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  2 May 2006 12:13:59 +0200
-
-update-manager (0.42.2ubuntu14) dapper; urgency=low
-
-  * wording/glade file fixes (thanks to Sebastian Heinlein)
-  * many updates to the dist-upgrader code
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 28 Apr 2006 23:04:08 +0200
-
-update-manager (0.42.2ubuntu13) dapper; urgency=low
-
-  * po/POTFILES.in: add missing desktop file (ubuntu: #39410)
-  * UpdateManager/UpdateManager.py: 
-    - fix in the get_changelog logic (ubuntu: #40058)
-    - correct a error in the changelog parser (ubuntu: #40060)
-    - fix download size reporting (ubuntu: #39579)
-  * debian/rules: added dh_iconcache
-  * setup.py: install the icons into the hicolor icon schema
-    (thanks to Sebastian Heinlein)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 20 Apr 2006 18:23:54 +0200
-
-update-manager (0.42.2ubuntu12) dapper; urgency=low
-
-  * channels/*.in: typo fix
-  * po/POTFILES.in: add missing files (ubuntu: #38738)
-  * fix the help string in update-manager (ubuntu: #23274)
-  * fix the bad grammar in "Cannot install all available updates"
-    (ubuntu: #32864)
-  * don't inform about new distro release on dapper by default (can be
-    changed via a gconf setting/commandline switch)
-  * fix UI issue of the edit dialog for given templates (thanks to
-    Chipzz for the patch)
-   
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 12 Apr 2006 20:23:21 +0200
-
-update-manager (0.42.2ubuntu11) dapper; urgency=low
-
-  * debian/control: 
-    - depend on unattended-upgrades
-    - move python-gnome2 to recommends (we only use gconf from it)
-  * UpdateManager/fakegconf.py: update for xubuntu (thanks to Jani Monoses)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  5 Apr 2006 14:46:10 +0200
-
-update-manager (0.42.2ubuntu10) dapper; urgency=low
-
-  * update-manger: fix a missing import (#36138)
-  * typo fix (#36123)
-  * correct dapper version number (#36136)
-  * keybindings fixed (#36116)
-  * calc the update before downloading the changelog (#36140)
-  * add a fake gconf interface for xubuntu (nop for normal ubuntu)
-    (Thanks to Jani Monoses for the patch)
-  
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  4 Apr 2006 18:17:16 +0200
-
-update-manager (0.42.2ubuntu9) dapper; urgency=low
-
-  * Better English (tm)  (fixes #35985)
-  * Use the the number of available and not selected updates to determinate
-    if the system is up-to-date (fixes #35300)
-  * fix ui problem with software preferences (fixes #35987)
-  * fix width problem in SoftwareProperties
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 22 Mar 2006 21:57:28 +0100
-
-update-manager (0.42.2ubuntu8) dapper; urgency=low
-
-  * fix a FTBFS
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 15 Mar 2006 17:54:08 +0000
-
-update-manager (0.42.2ubuntu7) dapper; urgency=low
-
-  * various spelling fixes and ui-glitches 
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 14 Mar 2006 16:58:01 +0000
-
-update-manager (0.42.2ubuntu6) dapper; urgency=low
-
-  * po/pt_BR.po: updated translation 
-    (thanks to Carlos Eduardo Pedroza Santiviago)
-  * po/pt.po: updated Portugise translation (thanks to Rui Azevedo)
-  * debian/control: arch: all now
-  * debian/rules: undo the detection in favour of the simpler update of
-                  the desktop files
-  * data/gnome-software-properties.desktop.in, update-manager.desktop.in:
-    - added X-Ubuntu-Gettext-Domain
-  * help/*: updated to latest svn
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 20 Feb 2006 15:58:09 +0100
-
-update-manager (0.42.2ubuntu5) dapper; urgency=low
-
-  * debian/rules: Add gettext domain to .server and .desktop files to get
-    language pack support for them. (Similarly to cdbs' gnome.mk)
-
- -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 23 Feb 2006 18:42:04 +0100
-  
-update-manager (0.42.2ubuntu4) dapper; urgency=low
-
-  * removed some of the gnome dependencies (gconf still in)
-  * the ReleaseNotes dialog has clickable links now (thanks to Sebastian 
-    Heinlein)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 20 Feb 2006 13:24:55 +0100
-
-update-manager (0.42.2ubuntu3) dapper; urgency=low
-
-  * fixed description of the ubuntu repository (#30813)
-  * use the new synaptic --parent-window-id switch when runing the backend
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  8 Feb 2006 20:53:46 +0100
-
-update-manager (0.42.2ubuntu2) dapper; urgency=low
-
-  * SoftwareProperties/SoftwareProperties.py:
-    - re-added the internet update options (#27932)
-  * data/gnome-software-properties.desktop:
-    - use gksu instead of gksudo (#30057)
-  * wording fixes (#30296)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  7 Feb 2006 13:13:09 +0100
-
-update-manager (0.42.2ubuntu1) dapper; urgency=low
-
-  * UpdateManager/MetaRelease.py: 
-    - never offer a upgrade to a unsupported (i.e. developer) dist
-  * data/gnome-software-properties.desktop.in: use X-KDE-SubstituteUID=true
-  * small UI layout changes (should fix the cancel/close button problem)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 31 Jan 2006 09:48:13 +0000
-
-update-manager (0.42.1ubuntu1) dapper; urgency=low
-
-  * UpdateManagert:
-    improved the HIG complicane more, removed some of the uglines
-    from the last version (Malone #22090)
-  * SoftwareProperties:
-    improved the HIG complicane (Malone #28530)
-  (thanks to Sebastian Heinlein)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 17 Jan 2006 17:27:15 +0100
-
-update-manager (0.42ubuntu1) dapper; urgency=low
-
-  * improved the HIG comlicane, thanks to Sebastian Heinlein:
-    - Rename the button "close" to "cancel"
-    - Move status bar to a separate dialog
-    - Wording
-    - Add a wider border around the changelog and
-      description
-     - Align and capitalize the button "Cancel downloading"
-    (ubuntu: #28453)
-  * bugfixes in the cache locking
-  
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 16 Jan 2006 12:56:29 +0100
-
-update-manager (0.40.2) dapper; urgency=low
-
-  * SoftwareProperties/SoftwareProperties.py:
-    - fix a problem with transient/parent window in custom apt line
-      dialog (ubuntu #21585)
-    - fix a problem in the conf file writer that can lead to absurdly
-      large files
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  5 Jan 2006 12:37:33 +0100
-
-update-manager (0.40.1) dapper; urgency=low
-
-  * SoftwareProperties/SoftwareProperties.py:
-    - make it embedded friendlier
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 16 Dec 2005 14:02:27 +0100
-
-update-manager (0.40) dapper; urgency=low
-
-  * new upstream release:
-    - switched from autotools to distutils
-    - massive code cleanups 
-    - use SimpleGladeApp now
-    - SoftwareProperties has a new GUI
-    - UpdateManager has support for upgrading from one dist to another
-      now (given that the required "recipe" for the upgrade is available)
-      See https://wiki.ubuntu.com/AutomaticUpgrade for details
-    - use python-apt for "reload" and "add cdrom" now
-    - improved the handling of sources.list a lot (including support for
-      /etc/apt/sources.list.d)
-  * support for the AutomaticUpgrades spec added via the meta-release 
-    information
-  * data/update-manager.desktop.in: 
-    - use X-KDE-SubstituteUID added and use gksu now
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Nov 2005 17:22:12 +0100
-
-update-manager (0.37.1+svn20050404.15) breezy; urgency=low
-
-  * added intltool to build-depends (for rosetta)
-
- -- Michael Vogt <mvo@debian.org>  Thu,  6 Oct 2005 17:30:38 +0200
-
-update-manager (0.37.1+svn20050404.14) breezy; urgency=low
-
-  * debian/rules:
-    - run intltool-update -p for rosetta
-  * src/update-manager.in:
-    - release the lock before runing gnome-software-properties (ubuntu #17022)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  4 Oct 2005 22:28:43 +0200
-
-update-manager (0.37.1+svn20050404.13) breezy; urgency=low
-
-  * src/update-manager.in:
-    - use the right column for type-ahead searching (ubuntu #16853)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  4 Oct 2005 11:01:58 +0200
-
-update-manager (0.37.1+svn20050404.12) breezy; urgency=low
-
-  * added locking support
-  * use explicit path to python2.4 (thanks anthony!) (Ubuntu #16087)
-  * CTRL-{w,q} close the update-manager window (Ubuntu #15729)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 Sep 2005 17:40:05 +0200
-
-update-manager (0.37.1+svn20050404.11) breezy; urgency=low
-
-  * fix a typo in the reload tooltip (thanks to P Jones) (ubuntu #14699)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 12 Sep 2005 14:49:13 +0200
-
-update-manager (0.37.1+svn20050404.10) breezy; urgency=low
-
-  * fix for a typo in the source of the last upload (*cough*) 
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 31 Aug 2005 15:39:53 +0200
-
-update-manager (0.37.1+svn20050404.9) breezy; urgency=low
-
-  * do a "save" dist-upgrade (add only, no removes)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 31 Aug 2005 12:09:20 +0200
-
-update-manager (0.37.1+svn20050404.8) breezy; urgency=low
-
-  * if repository window is running from inside synaptic, don't show "Add
-    cdrom" button (it's available in the synaptic menu already)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 30 Aug 2005 14:12:50 +0200
-
-update-manager (0.37.1+svn20050404.7) breezy; urgency=low
-
-  * if running from inside another application (e.g. synaptic), make sure 
-    the dialogs get a correct parent (ubuntu #14001)
-  * if nothing changed, do not run "reload" if runing from inside synaptic
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 29 Aug 2005 12:09:12 +0200
-
-update-manager (0.37.1+svn20050404.6) breezy; urgency=low
-
-  * remove (parts of) ubuntu branding from the application
-  * make it run only with python2.4 (ubuntu #10876)
-  * make sure to always properly escape the strings displayed
-    in the treeview
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 23 Aug 2005 16:49:54 +0200
-
-update-manager (0.37.1+svn20050404.5) breezy; urgency=low
-
-  * updates where not shown sometimes, fixed that (ubuntu #13410)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 16 Aug 2005 10:49:46 +0200
-
-update-manager (0.37.1+svn20050404.4) breezy; urgency=low
-
-  * re-read the sources.list after a "add-custom" (ubuntu #9855)
-  * settings window has a title (ubuntu #10756)
-  * default actions for the buttons (ubuntu #10741)
-  * various typos fixed (ubuntu #9866)
-  * make sure that no dialogs are opened without a parent (ubuntu #10284)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 15 Aug 2005 15:15:06 +0200
-
-update-manager (0.37.1+svn20050404.3) breezy; urgency=low
-
-  * use breezy as default for newly created sources (ubuntu #13009)
-  * be more carefull with preserving the mirror
-  * a better explaination for the "Reload" button (ubuntu #11432)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 10 Aug 2005 12:07:55 +0200
-
-update-manager (0.37.1+svn20050404.2) breezy; urgency=low
-
-  * fix a small problem in the parsing code (ubuntu #8754)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  6 May 2005 11:24:17 +0200
-
-update-manager (0.37.1+svn20050404.1) hoary; urgency=low
-
-  * pickup the correct proxy settings from apt (#8668)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  6 Apr 2005 16:39:44 +0200
-
-update-manager (0.37.1+svn20050404) hoary; urgency=low
-
-  * translation updates:
-    - xh, fr
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  4 Apr 2005 22:21:17 +0200
-
-update-manager (0.37.1+svn20050403) hoary; urgency=low
-
-  * translation updates:
-    - pt_BR, tw
-  * documentation updates (thanks to Sean Wheller and
-    Jeff Schering)
-  * small fixes:
-    - make sure to not duplicate sources.list entires (even for
-      mirrors)
-    - added the hoary-updates to the templates and matchers (#8600)
-    - some missing i18n strings marked as such (thanks to Zygmunt Krynicki)
-    - don't fail on missing net connections
-    - always update the status label
- 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Sun,  3 Apr 2005 20:54:42 +0200
-
-update-manager (0.37.1+svn20050323) hoary; urgency=low
-
-  * translation updates
-  * gui can set the new apt cache properties now
-  * warn about broken packages (#7688)
-  * only ask to reload the package list if something changed (#7871)
-  * various focus fixes (#7900)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 23 Mar 2005 01:18:38 +0100
-
-update-manager (0.37.1+svn20050314) hoary; urgency=low
-
-  * new svn snapshot, lot's of bugfixes and i18n updates.
-    - fix for a ui problem (#6837)
-    - read pined packages correctly (#7058)
-    - update list correctly after reload (#7182)
-    - tell user when dist-upgrade is needed (#7271)
-    - cdrom sources can be added now too (#7315)
-    - meta-release file bugfix (#7330)
-    - translation updates (da, fr, es, ro, pl)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Mar 2005 08:49:52 +0100
-
-update-manager (0.37.1+svn20050304) hoary; urgency=low
-
-  * new snapshot, use python-apt depcache now
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  4 Mar 2005 22:55:46 +0100
-
-update-manager (0.37.1+svn20050301) hoary; urgency=low
-
-  * new snapshot, better de.po, better i18n support
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  1 Mar 2005 12:06:39 +0100
-
-update-manager (0.37.1+svn20050228.1) hoary; urgency=low
-
-  * fixed a FTBFS (because of the "cleanfiles" in Makefile.am)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 28 Feb 2005 19:12:28 +0100
-
-update-manager (0.37.1+svn20050228) hoary; urgency=low
-
-  * get the correct candidate version for updatable packages
-    (ubuntu #6825)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 28 Feb 2005 11:00:38 +0100
-
-update-manager (0.37.1+svn20050221) hoary; urgency=low
-
-  * new svn snapshot, fixes:
-    - #6756: window size too big 
-    - #6767, #6780: gnome-software-properties window broken
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 21 Feb 2005 11:30:52 +0100
-
-update-manager (0.37.1+svn20050219) hoary; urgency=low
-
-  * new svn snapshot, fixes:
-    - #6565, #6565 (typo)
-    - #6634 (remeber last details state)
-    - #6635 (progress dialog merged in main window)
-    - #6578 (hide details if no updates are available)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Sat, 19 Feb 2005 00:32:50 +0100
-
-update-manager (0.37.1) hoary; urgency=low
-
-  * typo (#6542)
-  * package list is sorted now
-  * applied "hide details if system is update-to-date" patch 
-    (#6578, thanks to Jorge Bernal)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Feb 2005 10:49:17 +0100
-
-update-manager (0.37) hoary; urgency=low
-
-  * test for lock file and show error if the lock is already taken
-  * use utf8 for the description
-  * changelogs are fetched from http://changelogs.ubuntu.com/ now 
-    (closes: #6315)
-  * handle 404 from http and set the error accordingly
-  * set main_window to not sensitive when downloading changelogs
-  * if no updates are available, hide the checkbox column (closes: #6443)
-  
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Feb 2005 15:08:06 +0100
-
-update-manager (0.36.6) hoary; urgency=low
-
-  * various bugfixes and embedding of synaptics progress windows
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  8 Feb 2005 22:12:53 +0100
-
-update-manager (0.36.5) hoary; urgency=low
-
-  * disabled sources can now be displayed too (optional preference)
-  * comments can be added
-  * various bugfixes
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  3 Feb 2005 16:21:32 +0100
-
-update-manager (0.36.4) hoary; urgency=low
-
-  * regression of the last upload fixed
-  * gnome-software-properties can be embedded into other windows now
-    (usefull for e.g. synaptic)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 31 Jan 2005 22:59:35 +0100
-
-update-manager (0.36.3) hoary; urgency=low
-
-  * updates to the main window design
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 31 Jan 2005 16:59:41 +0100
-
-update-manager (0.36.2) hoary; urgency=low
-
-  * new main window layout in update-manager 
-    (Michiel design, looks _so_ nice)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 28 Jan 2005 12:20:57 +0100
-
-update-manager (0.36.1) hoary; urgency=low
-
-  * columns are resizable now (closes: #5541)
-  * lot's of typo/gui-glitches fixes (closes: #5200,  #5816, #5801, #5802)
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 24 Jan 2005 16:14:45 +0100
-
-update-manager (0.36) hoary; urgency=low
-
-  * new upstream release, added support to control APT::Periodic::*
-    variables in gnome-software-properties
-
- -- Michael Vogt <mvo@debian.org>  Wed, 19 Jan 2005 16:59:19 +0100
-
-update-manager (0.35) hoary; urgency=low
-
-  * new upstream release
-    - typo fix (closes: #5200)
-
- -- Michael Vogt <mvo@debian.org>  Wed,  5 Jan 2005 12:23:55 +0100
-
-update-manager (0.34) hoary; urgency=low
-
-  * new upstream release
-
- -- Michael Vogt <mvo@debian.org>  Fri, 24 Dec 2004 12:50:13 +0100
-
-update-manager (0.33) hoary; urgency=low
-
-  * new upstream release, featuring the gnome-software-properties
-
- -- Michael Vogt <mvo@debian.org>  Tue, 30 Nov 2004 12:41:06 +0100
-
-update-manager (0.32) hoary; urgency=low
-
-  * new upstream release
-
- -- Michael Vogt <mvo@debian.org>  Tue, 23 Nov 2004 15:28:09 +0100
-
-update-manager (0.31-1ubuntu1) hoary; urgency=low
-
-  * Update Build-Deps and fix FTBFS.
-
- -- Fabio M. Di Nitto <fabbione@fabbione.net>  Mon, 22 Nov 2004 13:04:09 +0100
-
-update-manager (0.31-1) hoary; urgency=low
-
-  * new upstream release, added icon, desktop file and bugfix
-
- -- Michael Vogt <mvo@debian.org>  Sat, 13 Nov 2004 11:30:37 +0100
-
-update-manager (0.3-1) hoary; urgency=low
-
-  * New upstream release, inital ubuntu release
-
- -- Michael Vogt <mvo@debian.org>  Wed,  3 Nov 2004 14:48:14 +0100
-
-update-manager (0.2-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Michiel Sikkes <michiel@eyesopened.nl>  Sat, 30 Oct 2004 02:22:12 +0200
-
-update-manager (0.1-2) unstable; urgency=low
-
-  * Um Yeah.
-
- -- Michiel Sikkes <m.sikkes@luon.net>  Tue, 26 Oct 2004 13:16:13 +0200
-
-update-manager (0.1-1) unstable; urgency=low
+python-aptsources (0.0.1) unstable; urgency=low
 
   * Initial Release.
 
- -- Michiel Sikkes <michiel@eyesopened.nl>  Mon, 25 Oct 2004 21:49:07 +0200
-
+ -- Sebastian Heinlein <glatzor@ubuntu.com>  Sun,  3 Sep 2006 18:07:15 +0200
diff --git a/debian/compat b/debian/compat
index b8626c4c..7ed6ff82 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 0702fa9e..6d1200d2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,16 @@
-Source: update-manager
-Section: gnome
+Source: python-aptsources
+Section: unknown
 Priority: optional
-Maintainer: Michael Vogt <michael.vogt@ubuntu.com>
-Build-Depends-Indep: debhelper (>= 4.0.0), libxml-parser-perl, scrollkeeper, intltool, python-dev
-Standards-Version: 3.6.2
+XS-Python-Version: all
+Maintainer: Sebastian Heinlein <glatzor@ubuntu.com>
+Build-Depends: cdbs, debhelper (>= 5.0.37.2), python-central (>= 0.5) 
+Standards-Version: 3.7.2
 
-Package: update-manager
+Package: python-aptsources
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python, python-glade2, python-apt (>= 0.6.16.2), synaptic (>= 0.57.8), lsb-release,  python-gnupginterface, unattended-upgrades, gksu, iso-codes, python-dbus, python-vte, gksu, python-gconf
-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.
+XB-Python-Version: ${python:Versions}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Description: abstraction of the sources.list for use in python applications
+ This package provides python modules that help to administrate the
+ sources.list by providing an abstraction of it.
+ .
diff --git a/debian/copyright b/debian/copyright
index 4850ff60..5efeb46a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,26 @@
-This package was debianized by Michiel Sikkes <michiel@eyesopened.nl> on
-Mon, 25 Oct 2004 21:49:07 +0200.
+This is python-aptsources, written and maintained by Sebastian Heinlein <glatzor@ubuntu.com>
+on Sun,  3 Sep 2006 18:07:15 +0200.
 
-It was downloaded from http://luon.net/~michiels/ubuntu/
+The original source can always be found at:
+	ftp://ftp.debian.org/dists/unstable/main/source/
 
-Upstream Author: Michiel Sikkes <michiel@eyesopened.nl>
+Copyright Holder:  Sebastian Heinlein
 
-Copyright:
+License:
 
-GPL, see  /usr/share/common-licenses/GPL
\ No newline at end of file
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this package; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/dirs b/debian/dirs
index 635898db..ca882bbb 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,3 +1,2 @@
-var/lib/update-manager
-var/log/dist-upgrade
-usr/bin
\ No newline at end of file
+usr/bin
+usr/sbin
diff --git a/debian/docs b/debian/docs
index 18c81ea3..e69de29b 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,4 +0,0 @@
-README
-TODO
-AUTHORS
-NEWS
diff --git a/debian/rules b/debian/rules
index 3b3da7d1..016167d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,103 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+  
+DEB_AUTO_CLEANUP_RCS            := yes
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+DEB_PYTHON_SYSTEM=pycentral
 
-PKG=update-manager
-DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
-DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
+# Add here any variable or target overrides you need
 
-
-build: build-stamp
-
-build-stamp:  
-	dh_testdir
-
-	# Add here commands to compile the package.
-	./setup.py build 
-	#/usr/bin/docbook-to-man debian/update-manager.sgml > update-manager.1
-
-	# intltool for rosetta
-	(cd po; /usr/bin/intltool-update -p --verbose || true)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-	rm -rf po/mo
-	find . -name "*.pyc" -exec rm -f {} \;
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/update-manager.
-	./setup.py install --prefix=$(CURDIR)/debian/$(PKG)/usr
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_scrollkeeper
-	dh_installmime
-	dh_desktop
-	dh_iconcache
-	dh_gconf
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-arch-build:
-	rm -rf debian/arch-build
-	mkdir -p debian/arch-build/$(PKG)-$(DEBVER)
-	tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(DEBVER);tar xf -)
-	(cd debian/arch-build/$(PKG)-$(DEBVER) && $(DEB_BUILD_PROG))
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install arch-build
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk