diff -Nru python-defaults-2.7.9/.bzrignore python-defaults-2.7.11/.bzrignore --- python-defaults-2.7.9/.bzrignore 1970-01-01 00:00:00.000000000 +0000 +++ python-defaults-2.7.11/.bzrignore 2015-12-09 12:20:32.000000000 +0000 @@ -0,0 +1,25 @@ +stamp-build +stamp-dh_python +debian/idle +debian/*.debhelper.log + +debian/libpython-all-dbg +debian/libpython-all-dev +debian/libpython-dbg +debian/libpython-dev +debian/libpython-stdlib +debian/python +debian/python-all +debian/python-all-dbg +debian/python-all-dev +debian/python-dbg +debian/python-dev +debian/python-doc +debian/python-examples +debian/python-minimal + +debian/python-minimal.postinst +debian/python.postinst +debian/python.postrm +debian/python.preinst +debian/python.prerm diff -Nru python-defaults-2.7.9/debian/changelog python-defaults-2.7.11/debian/changelog --- python-defaults-2.7.9/debian/changelog 2015-03-16 22:32:08.000000000 +0000 +++ python-defaults-2.7.11/debian/changelog 2015-12-09 12:15:19.000000000 +0000 @@ -1,3 +1,11 @@ +python-defaults (2.7.11-1) unstable; urgency=medium + + * Bump version to 2.7.11. + * Stop shipping menu files. + * Fix some lintian warnings. + + -- Matthias Klose Wed, 09 Dec 2015 13:07:35 +0100 + python-defaults (2.7.9-1) unstable; urgency=medium * Bump version to 2.7.9. diff -Nru python-defaults-2.7.9/debian/control python-defaults-2.7.11/debian/control --- python-defaults-2.7.9/debian/control 2015-03-16 22:37:08.000000000 +0000 +++ python-defaults-2.7.11/debian/control 2015-12-09 12:17:35.000000000 +0000 @@ -3,10 +3,10 @@ Priority: optional Maintainer: Matthias Klose Uploaders: Scott Kitterman , Piotr Ożarowski , Barry Warsaw -Build-Depends: debhelper (>= 8~), dpkg-dev (>= 1.17.11), python2.7 (>= 2.7.8-5), +Build-Depends: debhelper (>= 8~), dpkg-dev (>= 1.17.11), python2.7 (>= 2.7.11-2), lsb-release, python-all, - python2.7 (>= 2.7.9-1~), + python2.7 (>= 2.7.11-1~), debiandoc-sgml, Standards-Version: 3.9.6 Homepage: http://www.python.org/ @@ -18,8 +18,8 @@ Multi-Arch: allowed Priority: standard Pre-Depends: python-minimal (= ${binary:Version}) -Depends: ${misc:Depends}, python2.7 (>= 2.7.9-1~), libpython-stdlib (= ${binary:Version}) -Suggests: python-doc (= ${binary:Version}), python-tk (>= 2.7.9-1~) +Depends: ${misc:Depends}, python2.7 (>= 2.7.11-1~), libpython-stdlib (= ${binary:Version}) +Suggests: python-doc (= ${binary:Version}), python-tk (>= 2.7.11-1~) Conflicts: python-central (<< 0.5.5) Breaks: update-manager-core (<< 0.200.5-2) Replaces: python-dev (<< 2.6.5-2) @@ -36,7 +36,7 @@ Architecture: any Multi-Arch: allowed Priority: standard -Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.9-1~), dpkg (>= 1.13.20) +Depends: ${misc:Depends}, python2.7-minimal (>= 2.7.11-1~), dpkg (>= 1.13.20) Recommends: python Conflicts: python-central (<< 0.5.5) Breaks: python (<= 2.7.3-1~), python-dev (<< 2.6), python-dbg (<< 2.6), python-all (<< 2.6), python-all-dev (<< 2.6), python-all-dbg (<< 2.6), python-examples (<< 2.6), idle (<< 2.6), python2.5-minimal (<< 2.5.5-7), python2.6-minimal (<< 2.6.5~rc2-2), python3.1-minimal (<< 3.1.2~rc1-2), python-support (<< 1.0.10ubuntu2) @@ -49,7 +49,7 @@ Package: python-examples Architecture: all -Depends: ${misc:Depends}, python (>= ${binary:Version}), python2.7-examples (>= 2.7.9-1~) +Depends: ${misc:Depends}, python (>= ${binary:Version}), python2.7-examples (>= 2.7.11-1~) Description: examples for the Python language (default version) Examples, Demos and Tools for Python. These are files included in the upstream Python distribution. @@ -60,7 +60,7 @@ Package: python-dev Architecture: any Multi-Arch: allowed -Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), python2.7-dev (>= 2.7.9-1~) +Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), python2.7-dev (>= 2.7.11-1~) Description: header files and a static library for Python (default) Header files, a static library and development tools for building Python modules, extending the Python interpreter or embedding Python @@ -73,7 +73,7 @@ Architecture: any Multi-Arch: same Section: libdevel -Depends: libpython2.7-dev (>= 2.7.9-1~), ${misc:Depends} +Depends: libpython2.7-dev (>= 2.7.11-1~), ${misc:Depends} Description: header files and a static library for Python (default) Header files, a static library and development tools for building Python modules, extending the Python interpreter or embedding Python @@ -85,7 +85,8 @@ Package: libpython-stdlib Architecture: any Multi-Arch: same -Depends: libpython2.7-stdlib (>= 2.7.9-1~), ${misc:Depends} +Priority: standard +Depends: libpython2.7-stdlib (>= 2.7.11-1~), ${misc:Depends} Description: interactive high-level object-oriented language (default python version) Python, the high-level, interactive object oriented language, includes an extensive class library with lots of goodies for @@ -110,7 +111,7 @@ Package: python-doc Section: doc Architecture: all -Depends: ${misc:Depends}, python2.7-doc (>= 2.7.9-1~) +Depends: ${misc:Depends}, python2.7-doc (>= 2.7.11-1~) Suggests: python-examples, python (= ${binary:Version}) Breaks: python (<< 2.3.5) Replaces: python (<< 2.3.5) @@ -137,7 +138,7 @@ Multi-Arch: allowed Section: debug Priority: extra -Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.9-1~) +Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.11-1~) Description: debug build of the Python Interpreter (version 2.7) Python interpreter configured with --pydebug. Dynamically loaded modules are searched in /usr/lib/python2.7/lib-dynload/debug first. @@ -147,7 +148,7 @@ Multi-Arch: same Section: debug Priority: extra -Depends: libpython2.7-dbg (>= 2.7.9-1~), ${misc:Depends} +Depends: libpython2.7-dbg (>= 2.7.11-1~), ${misc:Depends} Description: debug build of the Python Interpreter (version 2.7) Python interpreter configured with --pydebug. Dynamically loaded modules are searched in /usr/lib/python2.7/lib-dynload/debug first. diff -Nru python-defaults-2.7.9/debian/control.in python-defaults-2.7.11/debian/control.in --- python-defaults-2.7.9/debian/control.in 2015-02-28 16:03:22.000000000 +0000 +++ python-defaults-2.7.11/debian/control.in 2015-12-09 12:10:35.000000000 +0000 @@ -85,6 +85,7 @@ Package: libpython-stdlib Architecture: any Multi-Arch: same +Priority: standard Depends: libpython@VER@-stdlib (>= @PREVVER@), ${misc:Depends} Description: interactive high-level object-oriented language (default python version) Python, the high-level, interactive object oriented language, diff -Nru python-defaults-2.7.9/debian/idle.menu python-defaults-2.7.11/debian/idle.menu --- python-defaults-2.7.9/debian/idle.menu 2012-12-04 16:01:41.000000000 +0000 +++ python-defaults-2.7.11/debian/idle.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -?package(idle):needs="X11" section="Applications/Programming"\ - title="IDLE (Python IDE)"\ - icon="/usr/share/pixmaps/idle.xpm"\ - command="/usr/bin/idle" \ - hints="Environments" diff -Nru python-defaults-2.7.9/debian/python.lintian-overrides python-defaults-2.7.11/debian/python.lintian-overrides --- python-defaults-2.7.9/debian/python.lintian-overrides 2012-12-04 16:01:41.000000000 +0000 +++ python-defaults-2.7.11/debian/python.lintian-overrides 2015-12-09 12:16:53.000000000 +0000 @@ -1,4 +1,5 @@ # this is the only package that can depend on it -depends-on-python-minimal depends -# manpage is in python-minimal package: -binary-without-manpage usr/bin/pyversions +python binary: depends-on-python-minimal + +# we rely on our patched python library, don't pick up a local version +python binary: command-with-path-in-maintainer-script diff -Nru python-defaults-2.7.9/debian/rules python-defaults-2.7.11/debian/rules --- python-defaults-2.7.9/debian/rules 2014-12-11 10:43:36.000000000 +0000 +++ python-defaults-2.7.11/debian/rules 2015-12-09 12:23:34.000000000 +0000 @@ -24,13 +24,13 @@ PREVVER := $(shell awk '/^python/ && NR > 1 {print substr($$2,2,length($$2)-2); exit}' debian/changelog) # first version with Multi-Arch: allowed -PREVVER := 2.7.9-1~ +PREVVER := 2.7.11-1~ # not yet allowed ma_allowed = yes ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy lucid maverick natty oneiric precise quantal raring saucy trusty)) - bd_i586 = dpkg-dev (>= 1.17.11), python2.7 (>= 2.7.8-5) + bd_i586 = dpkg-dev (>= 1.17.11), python2.7 (>= 2.7.11-2) endif @@ -170,7 +170,7 @@ cd faq && \ for p in *.ht; do \ p=`basename $$p .ht`; \ - mv $$p.html ../debian/python/usr/share/doc/python/faq/; \ + cp $$p.html ../debian/python/usr/share/doc/python/faq/; \ done mv debian/python/usr/share/doc/python/faq/FAQ.html \ debian/python/usr/share/doc/python/ @@ -220,7 +220,6 @@ # dh_installdebconf -i $(NOPKGS) dh_lintian -i dh_installdocs -i $(NOPKGS) --all debian/README.Debian - dh_installmenu -i $(NOPKGS) dh_installchangelogs -i $(NOPKGS) for p in examples idle; do \ @@ -380,7 +379,6 @@ dh_lintian -a dh_installdocs -a $(NOPKGS) --all debian/README.Debian - dh_installmenu -a $(NOPKGS) dh_installchangelogs -a $(NOPKGS) for p in all all-dev all-dbg dbg dev; do \ diff -Nru python-defaults-2.7.9/faq/extending.html python-defaults-2.7.11/faq/extending.html --- python-defaults-2.7.9/faq/extending.html 2014-08-18 08:02:03.000000000 +0000 +++ python-defaults-2.7.11/faq/extending.html 2015-12-09 12:23:39.000000000 +0000 @@ -3,7 +3,7 @@ - + Extending/Embedding FAQ