Merge lp:~mitya57/ubuntu/raring/python-defaults/2.7.3-10ubuntu6 into lp:ubuntu/raring/python-defaults

[Dmitry Shachnev]

Summary of the changes:

* Cherry-pick from Debian:
  - drop unused idle.sh file and unittest target in Makefile.
* Revert my previous prerm/postrm changes:
  - prerm is never called as `prerm purge`.
  - configuration files shouldn't be deleted on package remove.
* Added missing docinfo to man pages, to fix a lintian warning
  (see Debian #702777).

The prerm/postrm reverts were originally requested by Julien Cristau for wheezy, and already applied there.

I didn't cherry-pick recent Matthias' changes, but I can if needed.

[lp:~mitya57/ubuntu/raring/python-defaults/2.7.3-10ubuntu6]

102. By Dmitry Shachnev on 2013-03-12

Added missing docinfo to man pages, to fix a lintian warning
(see Debian #702777)

103. By Dmitry Shachnev on 2013-03-22

s/Debian Developers/Piotr Ożarowski/g in dh_python2.rst and pyclean.rst

[James Page (james-page)]

Hi Dmitry

python-defaults appears to have moved on a bit since this MP was raised; Looking at the changelog I suspect that most of you proposed fixes have been merged from Debian my Matthias.

Please could you review and either re-propose or withdraw this merge proposal.

Thanks!

review: Needs Fixing

[Dmitry Shachnev (mitya57)]

Right, removing from the queue.

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-21 10:07:07 +0000
+++ debian/changelog	2013-03-22 09:01:21 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 python-defaults (2.7.3-13ubuntu1) raring; urgency=low
 
   * Merge with Debian; remaining changes:
@@ -112,6 +113,94 @@
 
  -- Scott Kitterman <[e-mail]>  Fri, 08 Feb 2013 16:26:12 -0500
 
+=======
+python-defaults (2.7.3-10ubuntu6) raring; urgency=low
+
+  * Cherry-pick from Debian:
+    - drop unused idle.sh file and unittest target in Makefile.
+  * Revert my previous prerm/postrm changes:
+    - prerm is never called as `prerm purge`.
+    - configuration files shouldn't be deleted on package remove.
+  * Added missing docinfo to man pages, to fix a lintian warning
+    (see Debian #702777).
+
+ -- Dmitry Shachnev <[e-mail]>  Fri, 22 Mar 2013 12:49:58 +0400
+
+python-defaults (2.7.3-10ubuntu5) raring; urgency=low
+
+  * python-all-{dev,dbg}: Depend on libpython-all-{dev,dbg}.
+
+ -- Matthias Klose <[e-mail]>  Sun, 27 Jan 2013 19:59:56 +0100
+
+python-defaults (2.7.3-10ubuntu4) raring; urgency=low
+
+  * Build libpython-all-{dev,dbg} packages.
+
+ -- Matthias Klose <[e-mail]>  Fri, 25 Jan 2013 20:35:02 +0100
+
+python-defaults (2.7.3-10ubuntu3) raring; urgency=low
+
+  * Move lsb-release to Build-Depends.
+
+ -- Matthias Klose <[e-mail]>  Wed, 12 Dec 2012 11:11:11 +0100
+
+python-defaults (2.7.3-10ubuntu2) raring; urgency=low
+
+  * Make python-{all,all-dev,all-dbg} Multi-Arch: allowed.
+
+ -- Matthias Klose <[e-mail]>  Wed, 12 Dec 2012 11:02:45 +0100
+
+python-defaults (2.7.3-10ubuntu1) raring; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Move python-docutils, and debiandoc-sgml to Build-Depends from B-D-Indep.
+      This fixes build failures with --no-arch-all and in the buildds on
+      powerpc, armhf, and amd64.
+    - debian/control.in: Build depend on lsb-release to set correct
+      Maintainer fields when building on Ubuntu.
+    - debian/rules: Ignore version check, as our default versions differ
+      from Debian's.
+    - debian/control.in, debian/debian_defaults: Drop python2.6 support.
+
+ -- Matthias Klose <[e-mail]>  Wed, 12 Dec 2012 09:17:34 +0100
+
+python-defaults (2.7.3-10) experimental; urgency=low
+
+  * Build dependency packages as architecture dependent packages.
+  * Make python, python-{minimal,dev,dbg} Multi-Arch: allowed.
+  * Build Multi-Arch: any packages libpython-{dev,dbg} packages providing
+    $(DEB_HOST_GNU_TYPE/DEB_HOST_MULTIARCH)-python-config symlinks.
+  * Provide python2 symlinks.
+
+ -- Matthias Klose <[e-mail]>  Wed, 12 Dec 2012 00:25:00 +0100
+
+python-defaults (2.7.3-3ubuntu2) raring; urgency=low
+
+  * debian/control.in: move python-docutils, and debiandoc-sgml to
+    Build-Depends from B-D-Indep.  This fixes build failures with
+    --no-arch-all and in the buildds on powerpc, armhf, and amd64.
+
+ -- Barry Warsaw <[e-mail]>  Wed, 28 Nov 2012 17:04:08 -0500
+
+python-defaults (2.7.3-3ubuntu1) raring; urgency=low
+
+  * Resynchronize with Debian unstable, remaining Ubuntu changes:
+    - debian/control.in: Build depend on lsb-release to set correct
+      Maintainer fields when building on Ubuntu.
+    - debian/rules: Ignore version check, as our default versions differ
+      from Debian's.
+    - debian/control.in, debian/debian_defaults: Drop python2.6 support.
+    - debian/rules: Provide Python pkgconfig defaults.
+    - debian/rules: Re-add the python2 and python2-config symlinks,
+      formerly present in the python2.7 packages (see PEP 394).
+    - debian/control.in, debian/rules: Build dependency packages as
+      architecture dependent packages (for cross-building python
+      extension packages, see LP: #934593).
+  * debian/rules: in binary-arch section, use -a argument for dh_* commands.
+
+ -- Dmitry Shachnev <[e-mail]>  Wed, 28 Nov 2012 14:50:19 +0400
+
+>>>>>>> MERGE-SOURCE
 python-defaults (2.7.3-3) unstable; urgency=low
 
   [ Piotr Ożarowski ]

=== modified file 'debian/control'
--- debian/control	2013-03-21 10:07:07 +0000
+++ debian/control	2013-03-22 09:01:21 +0000
@@ -4,8 +4,13 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Matthias Klose <[e-mail]>
 Uploaders: Scott Kitterman <[e-mail]>, Piotr Ożarowski <[e-mail]>
+<<<<<<< TREE
 Build-Depends: debhelper (>= 8~), python-docutils (>= 0.4-3),
   libhtml-tree-perl, debiandoc-sgml, lsb-release
+=======
+Build-Depends: debhelper (>= 8~), python-docutils (>= 0.4-3), debiandoc-sgml, lsb-release
+Build-Depends-Indep: libhtml-tree-perl
+>>>>>>> MERGE-SOURCE
 Standards-Version: 3.9.3
 Homepage: http://www.python.org/
 Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian
@@ -15,7 +20,11 @@
 Architecture: any
 Multi-Arch: allowed
 Priority: standard
+<<<<<<< TREE
 Depends: ${misc:Depends}, python2.7 (>= 2.7.3-10~), python-minimal (= ${binary:Version}), libpython-stdlib (= ${binary:Version})
+=======
+Depends: ${misc:Depends}, python2.7 (>= 2.7.3-10~), python-minimal (= ${binary:Version})
+>>>>>>> MERGE-SOURCE
 Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version})
 Conflicts: python-central (<< 0.5.5)
 Breaks: python-csv (<< 1.0-4), python-bz2 (<< 1.1-8), python-email (<< 2.5.5-3), update-manager-core (<< 0.200.5-2)
@@ -55,6 +64,7 @@
  Python version (currently v2.7).
 
 Package: python-dev
+<<<<<<< TREE
 Architecture: any
 Multi-Arch: allowed
 Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), python2.7-dev (>= 2.7.3-10~)
@@ -86,6 +96,27 @@
  Python, the high-level, interactive object oriented language,
  includes an extensive class library with lots of goodies for
  network programming, system administration, sounds and graphics.
+=======
+Architecture: any
+Multi-Arch: allowed
+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), python2.7-dev (>= 2.7.3-10~)
+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
+ in applications.
+ .
+ This package is a dependency package, which depends on Debian's default
+ Python version (currently v2.7).
+
+Package: libpython-dev
+Architecture: any
+Multi-Arch: same
+Depends: libpython2.7-dev (>= 2.7.3-10~), ${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
+ in applications.
+>>>>>>> MERGE-SOURCE
  .
  This package is a dependency package, which depends on Debian's default
  Python version (currently v2.7).
@@ -133,7 +164,12 @@
 Multi-Arch: allowed
 Section: debug
 Priority: extra
-Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.3-10~)
+<<<<<<< TREE
+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.3-10~)
+=======
+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.3-10~)
+Provides: python-gdbm-dbg, python-tk-dbg
+>>>>>>> MERGE-SOURCE
 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.

=== modified file 'debian/control.in'
--- debian/control.in	2013-03-21 10:07:07 +0000
+++ debian/control.in	2013-03-22 09:01:21 +0000
@@ -3,8 +3,13 @@
 Priority: optional
 Maintainer: Matthias Klose <[e-mail]>
 Uploaders: Scott Kitterman <[e-mail]>, Piotr Ożarowski <[e-mail]>
+<<<<<<< TREE
 Build-Depends: debhelper (>= 8~), python-docutils (>= 0.4-3),
   libhtml-tree-perl, debiandoc-sgml, lsb-release
+=======
+Build-Depends: debhelper (>= 8~), python-docutils (>= 0.4-3), debiandoc-sgml, lsb-release
+Build-Depends-Indep: libhtml-tree-perl
+>>>>>>> MERGE-SOURCE
 Standards-Version: 3.9.3
 Homepage: http://www.python.org/
 Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian
@@ -54,6 +59,7 @@
  Python version (currently v@VER@).
 
 Package: python-dev
+<<<<<<< TREE
 Architecture: any
 Multi-Arch: allowed
 Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), @PVER@-dev (>= @PREVVER@)
@@ -85,6 +91,27 @@
  Python, the high-level, interactive object oriented language,
  includes an extensive class library with lots of goodies for
  network programming, system administration, sounds and graphics.
+=======
+Architecture: any
+Multi-Arch: allowed
+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), @PVER@-dev (>= @PREVVER@)
+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
+ in applications.
+ .
+ This package is a dependency package, which depends on Debian's default
+ Python version (currently v@VER@).
+
+Package: libpython-dev
+Architecture: any
+Multi-Arch: same
+Depends: lib@PVER@-dev (>= @PREVVER@), ${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
+ in applications.
+>>>>>>> MERGE-SOURCE
  .
  This package is a dependency package, which depends on Debian's default
  Python version (currently v@VER@).
@@ -132,7 +159,12 @@
 Multi-Arch: allowed
 Section: debug
 Priority: extra
-Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python@VER@-dbg (>= @PREVVER@)
+<<<<<<< TREE
+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python@VER@-dbg (>= @PREVVER@)
+=======
+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python@VER@-dbg (>= @PREVVER@)
+Provides: python-gdbm-dbg, python-tk-dbg
+>>>>>>> MERGE-SOURCE
 Description: debug build of the Python Interpreter (version @VER@)
  Python interpreter configured with --pydebug. Dynamically loaded modules are
  searched in /usr/lib/python@VER@/lib-dynload/debug first.

=== modified file 'dh_python2.rst'
--- dh_python2.rst	2012-11-28 14:50:19 +0000
+++ dh_python2.rst	2013-03-22 09:01:21 +0000
@@ -6,6 +6,9 @@
 calculates Python dependencies, adds maintainer scripts to byte compile files, etc.
 -----------------------------------------------------------------------------------
 
+:Manual section: 1
+:Author: Piotr Ożarowski, 2012-2013
+
 SYNOPSIS
 ========
   dh_python2 -p PACKAGE [-V [X.Y][-][A.B]] DIR_OR_FILE [-X REGEXPR]

=== modified file 'pyclean.rst'
--- pyclean.rst	2011-02-28 20:28:05 +0000
+++ pyclean.rst	2013-03-22 09:01:21 +0000
@@ -6,6 +6,9 @@
 removes .pyc and .pyo files
 ---------------------------
 
+:Manual section: 1
+:Author: Piotr Ożarowski, 2012-2013
+
 SYNOPSIS
 ========
   pyclean [-p PACKAGE | DIR_OR_FILE]

=== modified file 'pycompile.rst'
--- pycompile.rst	2011-02-28 20:28:05 +0000
+++ pycompile.rst	2013-03-22 09:01:21 +0000
@@ -1,11 +1,14 @@
-==========
+===========
  pycompile
-==========
+===========
 
 --------------------------------
 byte compile Python source files
 --------------------------------
 
+:Manual section: 1
+:Author: Debian Developers, 2012-2013
+
 SYNOPSIS
 ========
   pycompile [-V [X.Y][-][A.B]] DIR_OR_FILE [-X REGEXPR]