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

Proposed by Dmitry Shachnev on 2013-03-10
Status: Merged
Merge reported by: Dmitry Shachnev
Merged at revision: not available
Proposed branch: lp:~mitya57/ubuntu/raring/python-defaults/2.7.3-10ubuntu6
Merge into: lp:ubuntu/raring/python-defaults
Diff against target: 300 lines (+170/-4) (has conflicts)
6 files modified
debian/changelog (+89/-0)
debian/control (+37/-1)
debian/ (+33/-1)
dh_python2.rst (+3/-0)
pyclean.rst (+3/-0)
pycompile.rst (+5/-2)
Text conflict in debian/changelog
Text conflict in debian/control
Text conflict in debian/
To merge this branch: bzr merge lp:~mitya57/ubuntu/raring/python-defaults/2.7.3-10ubuntu6
Reviewer Review Type Date Requested Status
James Page Needs Fixing on 2013-03-25
Barry Warsaw 2013-03-12 Pending
Ubuntu branches 2013-03-10 Pending
Review via email:

Description of the Change

Summary of the changes:

* Cherry-pick from Debian:
  - drop unused 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.

To post a comment you must log in.
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) wrote :

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.


review: Needs Fixing
Dmitry Shachnev (mitya57) wrote :

Right, removing from the queue.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.


People subscribed via source and target branches