diff -Nru python-apt-0.7.9~exp2ubuntu10.1~ppa1/data/templates/Ubuntu.mirrors python-apt-0.7.9~exp2ubuntu11/data/templates/Ubuntu.mirrors --- python-apt-0.7.9~exp2ubuntu10.1~ppa1/data/templates/Ubuntu.mirrors 2009-04-16 15:23:17.000000000 +0100 +++ python-apt-0.7.9~exp2ubuntu11/data/templates/Ubuntu.mirrors 2009-04-16 16:12:16.000000000 +0100 @@ -57,7 +57,6 @@ http://mirrors.shlug.org/ubuntu/ http://ubuntu.dormforce.net/ubuntu/ http://mirror.lupaworld.com/ubuntu/ -http://mirror.rootguide.org/ubuntu/ http://ubuntu.cn99.com/ubuntu/ #LOC:CO http://matematicas.unal.edu.co/ubuntu/ @@ -181,7 +180,6 @@ http://www.ftp.ne.jp/Linux/packages/ubuntu/archive/ http://ubuntutym.u-toyama.ac.jp/ubuntu/ http://ubuntu-ashisuto.ubuntulinux.jp/ubuntu/ -http://ftp.riken.jp/Linux/ubuntu/ http://ftp.yz.yamagata-u.ac.jp/pub/linux/ubuntu/archives/ http://ftp.jaist.ac.jp/pub/Linux/ubuntu/ http://ubuntu.mithril-linux.org/archives/ diff -Nru /tmp/lxGHV199zB/python-apt-0.7.9~exp2ubuntu10.1~ppa1/debian/changelog /tmp/tdLaIpRUa0/python-apt-0.7.9~exp2ubuntu11/debian/changelog --- python-apt-0.7.9~exp2ubuntu10.1~ppa1/debian/changelog 2009-04-16 15:23:15.000000000 +0100 +++ python-apt-0.7.9~exp2ubuntu11/debian/changelog 2009-04-16 16:12:06.000000000 +0100 @@ -1,8 +1,13 @@ -python-apt (0.7.9~exp2ubuntu10.1~ppa1) jaunty; urgency=low +python-apt (0.7.9~exp2ubuntu11) jaunty; urgency=low - * build python2.4-apt package (LP: #354812) + [ Matthias Klose ] + * Build for python2.4 as well. LP: #354812. - -- Michael Vogt Thu, 16 Apr 2009 16:12:01 +0200 + [ Michael vogt ] + * setup.py: + - only use sphinx for python2.5 or later + + -- Michael Vogt Thu, 16 Apr 2009 16:50:38 +0200 python-apt (0.7.9~exp2ubuntu10) jaunty; urgency=low diff -Nru /tmp/lxGHV199zB/python-apt-0.7.9~exp2ubuntu10.1~ppa1/debian/control /tmp/tdLaIpRUa0/python-apt-0.7.9~exp2ubuntu11/debian/control --- python-apt-0.7.9~exp2ubuntu10.1~ppa1/debian/control 2009-04-16 15:23:15.000000000 +0100 +++ python-apt-0.7.9~exp2ubuntu11/debian/control 2009-04-16 16:12:06.000000000 +0100 @@ -5,8 +5,8 @@ XSBC-Original-Maintainer: APT Development Team Uploaders: Matt Zimmerman , Michael Vogt Standards-Version: 3.7.2.2 -XS-Python-Version: all -Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.20), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.6.11), python-all-dbg, python-sphinx (>= 0.5), python2.4-dev +XS-Python-Version: 2.4, all +Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.20), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.6.11), python-all-dbg, python-sphinx (>= 0.5), python2.4-dev, python2.4-dbg XS-Original-Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/python-apt/ubuntu @@ -41,23 +41,3 @@ variety of functions. . This package contains the extension built for the python debug interpreter. - -Package: python2.4-apt -Architecture: any -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, lsb-release -Recommends: iso-codes -Priority: optional -Provides: ${python:Provides} -Suggests: python-apt-dbg, python-gtk2, python-vte -Description: Python interface to libapt-pkg (Python 2.4 version) - The apt_pkg Python interface will provide full access to the internal - libapt-pkg structures allowing Python programs to easily perform a - variety of functions, such as: - . - - Access to the APT configuration system - - Access to the APT package information database - - Parsing of Debian package control files, and other files with a - similar structure - . - The included 'aptsources' Python interface provides an abstraction of - the sources.list configuration on the repository and the distro level. diff -Nru /tmp/lxGHV199zB/python-apt-0.7.9~exp2ubuntu10.1~ppa1/debian/rules /tmp/tdLaIpRUa0/python-apt-0.7.9~exp2ubuntu11/debian/rules --- python-apt-0.7.9~exp2ubuntu10.1~ppa1/debian/rules 2009-04-16 15:23:15.000000000 +0100 +++ python-apt-0.7.9~exp2ubuntu11/debian/rules 2009-04-16 16:12:06.000000000 +0100 @@ -25,14 +25,6 @@ build/python-apt:: pydoc -w -build/python2.4-apt:: - # now build a minimal python2.4 version - python2.4 setup24.py build - -install/python2.4-apt:: - python2.4 setup24.py install --root $(CURDIR)/debian/python2.4-apt - rm -rf $(CURDIR)/debian/python2.4-apt/usr/share/python-apt - install/python-apt-dbg:: for i in $(cdbs_python_build_versions); do \ python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-apt-dbg --install-layout=deb; \ diff -Nru /tmp/lxGHV199zB/python-apt-0.7.9~exp2ubuntu10.1~ppa1/setup24.py /tmp/tdLaIpRUa0/python-apt-0.7.9~exp2ubuntu11/setup24.py --- python-apt-0.7.9~exp2ubuntu10.1~ppa1/setup24.py 2009-04-16 15:23:15.000000000 +0100 +++ python-apt-0.7.9~exp2ubuntu11/setup24.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -#! /usr/bin/env python -# $Id: setup.py,v 1.2 2002/01/08 07:13:21 jgg Exp $ - -from distutils.core import setup, Extension -from distutils.sysconfig import parse_makefile -from DistUtilsExtra.command import build_extra, build_i18n -import glob -import os -import shutil -import sys - - -# The apt_pkg module -files = map(lambda source: "python/"+source, - parse_makefile("python/makefile")["APT_PKG_SRC"].split()) -apt_pkg = Extension("apt_pkg", files, libraries=["apt-pkg"]) - -# The apt_inst module -files = map(lambda source: "python/"+source, - parse_makefile("python/makefile")["APT_INST_SRC"].split()) -apt_inst = Extension("apt_inst", files, libraries=["apt-pkg", "apt-inst"]) - -# Replace the leading _ that is used in the templates for translation -templates = [] - -# build doc -if len(sys.argv) > 1 and sys.argv[1] == "build": - if not os.path.exists("build/data/templates/"): - os.makedirs("build/data/templates") - for template in glob.glob('data/templates/*.info.in'): - source = open(template, "r") - build = open(os.path.join("build", template[:-3]), "w") - lines = source.readlines() - for line in lines: - build.write(line.lstrip("_")) - source.close() - build.close() - - -if len(sys.argv) > 1 and sys.argv[1] == "clean" and '-a' in sys.argv: - for dirname in "build/doc", "doc/build", "build/data", "build/mo": - if os.path.exists(dirname): - print "Removing", dirname - shutil.rmtree(dirname) - else: - print "Not removing", dirname, "because it does not exist" - -setup(name="python-apt", - version="0.7.9", - description="Python bindings for APT", - author="APT Development Team", - author_email="deity@lists.debian.org", - ext_modules=[apt_pkg, apt_inst], - packages=['apt', 'apt.gtk', 'aptsources'], - data_files = [('share/python-apt/templates', - glob.glob('build/data/templates/*.info')), - ('share/python-apt/templates', - glob.glob('data/templates/*.mirrors'))], - license = 'GNU GPL', - platforms = 'posix') - diff -Nru /tmp/lxGHV199zB/python-apt-0.7.9~exp2ubuntu10.1~ppa1/setup.py /tmp/tdLaIpRUa0/python-apt-0.7.9~exp2ubuntu11/setup.py --- python-apt-0.7.9~exp2ubuntu10.1~ppa1/setup.py 2009-04-16 15:23:15.000000000 +0100 +++ python-apt-0.7.9~exp2ubuntu11/setup.py 2009-04-16 16:12:06.000000000 +0100 @@ -61,7 +61,8 @@ license = 'GNU GPL', platforms = 'posix') -if len(sys.argv) > 1 and sys.argv[1] == "build": +if (len(sys.argv) > 1 and sys.argv[1] == "build" and + sys.version_info[0] >= 2 and sys.version_info[1] >= 5): import sphinx sphinx.main(["sphinx", "-b", "html", "-d", "build/doc/doctrees", os.path.abspath("doc/source"), "build/doc/html"])