=== modified file 'apt/package.py' --- apt/package.py 2011-08-09 16:04:04 +0000 +++ apt/package.py 2011-11-13 19:00:32 +0000 @@ -973,8 +973,8 @@ another package, and if no packages depend on it anymore, the package is no longer required. """ - return self.is_installed and \ - self._pcache._depcache.is_garbage(self._pkg) + return ((self.is_installed or self.marked_install) and + self._pcache._depcache.is_garbage(self._pkg)) @property def is_auto_installed(self): === modified file 'aptsources/sourceslist.py' --- aptsources/sourceslist.py 2011-08-08 22:48:43 +0000 +++ aptsources/sourceslist.py 2011-11-13 19:00:32 +0000 @@ -33,7 +33,7 @@ import time import apt_pkg -from aptsources.distinfo import DistInfo +from distinfo import DistInfo from apt.deprecation import function_deprecated_by === modified file 'data/templates/Ubuntu.info.in' --- data/templates/Ubuntu.info.in 2011-09-28 16:27:20 +0000 +++ data/templates/Ubuntu.info.in 2011-11-13 19:00:32 +0000 @@ -1,5 +1,123 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: precise +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://archive.ubuntu.com/ubuntu +MatchURI-amd64: archive.ubuntu.com/ubuntu +BaseURI-i386: http://archive.ubuntu.com/ubuntu +MatchURI-i386: archive.ubuntu.com/ubuntu +MirrorsFile-amd64: Ubuntu.mirrors +MirrorsFile-i386: Ubuntu.mirrors +_Description: Ubuntu 12.04 'Precise Pangolin' +Component: main +_CompDescription: Officially supported +_CompDescriptionLong: Canonical-supported free software +Component: universe +_CompDescription: Community-maintained +_CompDescriptionLong: Community-maintained free software +Component: restricted +_CompDescription: Non-free drivers +_CompDescriptionLong: Proprietary drivers for devices +Component: multiverse +ParentComponent: universe +_CompDescription: Restricted software +_CompDescriptionLong: Software restricted by copyright or legal issues + +Suite: precise +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Ubuntu 12.04 'Precise Pangolin' + +Suite: precise +RepositoryType: deb +MatchName: .* +BaseURI: cdrom:\[Ubuntu.*12.04 +MatchURI: cdrom:\[Ubuntu.*12.04 +_Description: Cdrom with Ubuntu 12.04 'Precise Pangolin' +Available: False +Component: main +_CompDescription: Officially supported +Component: restricted +_CompDescription: Restricted copyright + +Suite: precise +Official: false +RepositoryType: deb +BaseURI: http://archive.canonical.com +MatchURI: archive.canonical.com +_Description: Canonical Partners +Component: partner +_CompDescription: Software packaged by Canonical for their partners +_CompDescriptionLong: This software is not part of Ubuntu. + +Suite: precise +Official: false +RepositoryType: deb +BaseURI: http://extras.ubuntu.com +MatchURI: extras.ubuntu.com +_Description: Independent +Component: main +_CompDescription: Provided by third-party software developers +_CompDescriptionLong: Software offered by third party developers. + +Suite: precise-security +ParentSuite: precise +RepositoryType: deb +BaseURI: http://ports.ubuntu.com/ubuntu-ports/ +MatchURI: ports.ubuntu.com/ubuntu-ports +BaseURI-amd64: http://security.ubuntu.com/ubuntu/ +MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com +BaseURI-i386: http://security.ubuntu.com/ubuntu/ +MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com +_Description: Important security updates + +Suite: precise-security +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com +_Description: Important security updates + +Suite: precise-updates +ParentSuite: precise +RepositoryType: deb +_Description: Recommended updates + +Suite: precise-updates +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Recommended updates + +Suite: precise-proposed +ParentSuite: precise +RepositoryType: deb +_Description: Pre-released updates + +Suite: precise-proposed +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Pre-released updates + +Suite: precise-backports +ParentSuite: precise +RepositoryType: deb +_Description: Unsupported updates + +Suite: precise-backports +ParentSuite: precise +RepositoryType: deb-src +BaseURI: http://archive.ubuntu.com/ubuntu/ +MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports +_Description: Unsupported updates + Suite: oneiric RepositoryType: deb BaseURI: http://ports.ubuntu.com/ubuntu-ports/ @@ -13,10 +131,10 @@ _Description: Ubuntu 11.10 'Oneiric Ocelot' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -132,10 +250,10 @@ _Description: Ubuntu 11.04 'Natty Narwhal' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -250,10 +368,10 @@ _Description: Ubuntu 10.10 'Maverick Meerkat' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -333,10 +451,10 @@ _Description: Ubuntu 10.04 'Lucid Lynx' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -396,14 +514,15 @@ _Description: Ubuntu 9.10 'Karmic Koala' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse +ParentComponent: universe _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues @@ -458,10 +577,10 @@ _Description: Ubuntu 9.04 'Jaunty Jackalope' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -520,14 +639,15 @@ _Description: Ubuntu 8.10 'Intrepid Ibex' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse +ParentComponent: universe _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues @@ -583,14 +703,15 @@ _Description: Ubuntu 8.04 'Hardy Heron' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices Component: multiverse +ParentComponent: universe _CompDescription: Restricted software _CompDescriptionLong: Software restricted by copyright or legal issues @@ -647,10 +768,10 @@ _Description: Ubuntu 7.10 'Gutsy Gibbon' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -711,10 +832,10 @@ _Description: Ubuntu 7.04 'Feisty Fawn' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -772,10 +893,10 @@ _Description: Ubuntu 6.10 'Edgy Eft' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -833,10 +954,10 @@ _Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free software Component: universe _CompDescription: Community-maintained (universe) -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices === modified file 'data/templates/Ubuntu.mirrors' --- data/templates/Ubuntu.mirrors 2011-10-04 16:35:52 +0000 +++ data/templates/Ubuntu.mirrors 2011-11-13 19:00:32 +0000 @@ -125,6 +125,7 @@ #LOC:EE http://ftp.estpak.ee/ubuntu/ #LOC:ES +http://dafi.inf.um.es/ubuntu/ http://ftp.caliu.cat/pub/distribucions/ubuntu/archive/ http://ftp.dat.etsit.upm.es/ubuntu/ http://ftp.gui.uva.es/sites/ubuntu.com/ubuntu/ @@ -156,6 +157,8 @@ http://ubuntu.univ-reims.fr/ubuntu/ http://www-ftp.lip6.fr/pub/linux/distributions/Ubuntu/archive/ http://wwwftp.ciril.fr/pub/linux/ubuntu/archives/ +#LOC:GA +http://miroirs.refer.ga/ubuntu/ #LOC:GB http://archive.ubuntu.com/ubuntu/ http://ftp.ticklers.org/archive.ubuntu.org/ubuntu/ @@ -208,6 +211,7 @@ http://mirror.isoc.org.il/pub/ubuntu/ #LOC:IN ftp://ftp.iitb.ac.in/distributions/ubuntu/archives/ +http://ftp.iitm.ac.in/ubuntu/ http://mirror.cse.iitk.ac.in/ubuntu/ #LOC:IS http://speglar.simnet.is/ubuntu/ @@ -237,7 +241,6 @@ ftp://mirror.space.kz/ubuntu/ http://mirror.neolabs.kz/ubuntu/ #LOC:LK -http://archive.ubuntu.schoolnet.lk/ubuntu/ http://mirror.learn.ac.lk/ubuntu/ #LOC:LT http://ftp.litnet.lt/ubuntu/ @@ -270,6 +273,7 @@ #LOC:NL ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com/ http://ftp.snt.utwente.nl/pub/os/linux/ubuntu/ +http://ftp.telfort.nl/pub/mirror/ubuntu/ http://ftp.tudelft.nl/archive.ubuntu.com/ http://mirror.nl.leaseweb.net/ubuntu/ http://nl.archive.ubuntu.com/ubuntu/ @@ -277,6 +281,7 @@ http://osmirror.rug.nl/ubuntu/ http://ubuntu.mirror.atratoip.net/ubuntu/ http://ubuntu.mirror.cambrium.nl/ubuntu/ +http://ubuntu.tiscali.nl/ http://ubuntuarchive.eweka.nl/ubuntu/ #LOC:NO http://archive.mirror.blix.eu/ubuntu/ @@ -312,11 +317,9 @@ http://ubuntu.dcc.fc.up.pt/ #LOC:RO http://ftp.astral.ro/mirrors/ubuntu.com/ubuntu/ -http://ftp.info.uvt.ro/ubuntu/ http://ftp.roedu.net/mirrors/ubuntulinux.org/ubuntu/ http://mirror.arlug.ro/pub/ubuntu/ubuntu/ http://mirrors.adnettelecom.ro/ubuntu/ -http://mirrors.penguin-host.com/ubuntu/ #LOC:RS http://rpm.scl.rs/linux/ubuntu/archive/ http://ubuntu.etf.bg.ac.rs/ubuntu/ @@ -333,10 +336,10 @@ http://ubuntu.mirrors.isu.net.sa/ubuntu/ #LOC:SE http://ftp.acc.umu.se/ubuntu/ +http://ftp.availo.se/ubuntu/ http://ftp.df.lth.se/ubuntu/ http://ftp.ds.karen.hj.se/ubuntu/ http://ftp.lysator.liu.se/ubuntu/ -http://ftp.port80.se/ubuntu/ http://ftp.portlane.com/ubuntu/ http://ftp.sunet.se/pub/os/Linux/distributions/ubuntu/ubuntu/ http://ubuntu.cybercomhosting.com/ubuntu/ @@ -376,7 +379,6 @@ http://shadow.ind.ntou.edu.tw/ubuntu/ http://tw.archive.ubuntu.com/ubuntu/ http://ubuntu.cs.nctu.edu.tw/ubuntu/ -http://ubuntu.stu.edu.tw/ubuntu/ #LOC:UA http://mirror.mirohost.net/ubuntu/ http://mirrors.uaip.org/ubuntu/ @@ -407,7 +409,7 @@ http://mirror.pnl.gov/ubuntu/ http://mirror.symnds.com/ubuntu/ http://mirror.team-cymru.org/ubuntu/ -http://mirror.umoss.org/ubuntu/ +http://mirror.umd.edu/ubuntu/ http://mirror.uoregon.edu/ubuntu/ http://mirror.us.leaseweb.net/ubuntu/ http://mirror.vcu.edu/pub/gnu+linux/ubuntu/ @@ -418,13 +420,16 @@ http://mirrors.cs.wmich.edu/ubuntu/ http://mirrors.easynews.com/linux/ubuntu/ http://mirrors.ecvps.com/ubuntu/ +http://mirrors.gigenet.com/ubuntuarchive/ http://mirrors.mit.edu/ubuntu/ http://mirrors.pavlovmedia.net/ubuntu/ http://mirrors.rit.edu/ubuntu/ +http://mirrors.us.kernel.org/ubuntu/ http://mirrors.xmission.com/ubuntu/ http://samaritan.ucmerced.edu/ubuntu/ http://san.csc.calpoly.edu/ubuntu/ubuntu/ http://ubuntu.cs.utah.edu/ubuntu/ +http://ubuntu.eecs.wsu.edu/ http://ubuntu.mirror.frontiernet.net/ubuntu/ http://ubuntu.mirrors.pair.com/archive/ http://ubuntu.mirrors.tds.net/pub/ubuntu/ @@ -435,7 +440,6 @@ http://ubuntu.washdc-linux.com/ubuntu/ http://ubuntu.wikimedia.org/ubuntu/ http://www.club.cc.cmu.edu/pub/ubuntu/ -http://www.gtlib.gatech.edu/pub/ubuntu/ http://www.lug.bu.edu/mirror/ubuntu/ #LOC:UZ http://ubuntu.snet.uz/ubuntu/ === modified file 'debian/changelog' --- debian/changelog 2011-10-04 16:35:52 +0000 +++ debian/changelog 2011-11-13 19:00:32 +0000 @@ -1,3 +1,49 @@ +python-apt (0.8.1ubuntu2) oneiric; urgency=low + + * fixed a typo, changed "Open Source software" to "free software" (LP: #500940 + + -- Nikola Pavlović Sun, 13 Nov 2011 16:26:11 +0100 + +python-apt (0.8.1ubuntu1) precise; urgency=low + + * aptsources/sourceslist.py: + - import distinfo from the same dir (LP: #871007) + * data/templates/Ubuntu.info.in: + - add precise + + -- Michael Vogt Wed, 19 Oct 2011 17:46:18 +0200 + +python-apt (0.8.1) unstable; urgency=low + + [ Julian Andres Klode ] + * Breaks: debsecan (<< 0.4.15) [not only << 0.4.14] (Closes: #629512) + + [ Michael Vogt ] + * python/arfile.cc: + - use APT::Configuration::getCompressionTypes() instead of duplicating + the supported methods here + * tests/test_debfile.py: + - add test for raise on unknown data.tar.xxx + * tests/test_aptsources_ports.py, tests/test_aptsources.py: + - use tmpdir during the tests to fix test failure with apt from + experimental + * tests/test_apt_cache.py: + - fix test by providing proper fixture data + - fix test if sources.list is not readable (as is the case on some + PPA buildds) + * apt/package.py: + - fix py3 compatiblity with print + * tests/test_all.py: + - skip all tests if sources.list is not readable (as is the case on + some builds) + - packages in marked_install state can also be auto-removable + * add concept of "ParentComponent" for e.g. ubuntu/multiverse + that needs universe enabled as well (plus add test) + * apt/progress/gtk2.py: + - update to the latest vte API for child-exited (LP: #865388) + + -- Michael Vogt Wed, 19 Oct 2011 16:39:13 +0200 + python-apt (0.8.0ubuntu9) oneiric; urgency=low * apt/progress/gtk2.py: === modified file 'tests/test_apt_cache.py' --- tests/test_apt_cache.py 2011-08-08 14:24:29 +0000 +++ tests/test_apt_cache.py 2011-11-13 19:00:32 +0000 @@ -133,7 +133,7 @@ old_source_list = apt_pkg.config.find("dir::etc::sourcelist") old_source_parts = apt_pkg.config.find("dir::etc::sourceparts") apt_pkg.config.set("dir::etc::sourcelist", base_sources) - apt_pkg.config.set("dir::etc::sourceparts", "xxx") + apt_pkg.config.set("dir::etc::sourceparts", "/tmp") # main sources.list sources_list = base_sources with open(sources_list, "w") as f: === modified file 'tests/test_progress.py' --- tests/test_progress.py 2011-04-12 15:25:38 +0000 +++ tests/test_progress.py 2011-11-13 19:00:32 +0000 @@ -27,7 +27,7 @@ apt_pkg.init() apt_pkg.config.set("APT::Architecture", "amd64") apt_pkg.config.set("Dir::Etc", basedir) - apt_pkg.config.set("Dir::Etc::sourceparts", "/xxx") + apt_pkg.config.set("Dir::Etc::sourceparts", "/tmp") # setup lists dir if not os.path.exists("./tmp/partial"): os.makedirs("./tmp/partial")