Ubuntu

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) 6 files modified (has conflicts)
Text conflict in debian/changelog
Text conflict in debian/control
Text conflict in debian/control.in
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: mp+152592@code.launchpad.net

Description of the Change

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.

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.

Thanks!

review: Needs Fixing
Dmitry Shachnev (mitya57) wrote :

Right, removing from the queue.

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2013-03-21 10:07:07 +0000
3+++ debian/changelog 2013-03-22 09:01:21 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 python-defaults (2.7.3-13ubuntu1) raring; urgency=low
7
8 * Merge with Debian; remaining changes:
9@@ -112,6 +113,94 @@
10
11 -- Scott Kitterman <scott@kitterman.com> Fri, 08 Feb 2013 16:26:12 -0500
12
13+=======
14+python-defaults (2.7.3-10ubuntu6) raring; urgency=low
15+
16+ * Cherry-pick from Debian:
17+ - drop unused idle.sh file and unittest target in Makefile.
18+ * Revert my previous prerm/postrm changes:
19+ - prerm is never called as `prerm purge`.
20+ - configuration files shouldn't be deleted on package remove.
21+ * Added missing docinfo to man pages, to fix a lintian warning
22+ (see Debian #702777).
23+
24+ -- Dmitry Shachnev <mitya57@ubuntu.com> Fri, 22 Mar 2013 12:49:58 +0400
25+
26+python-defaults (2.7.3-10ubuntu5) raring; urgency=low
27+
28+ * python-all-{dev,dbg}: Depend on libpython-all-{dev,dbg}.
29+
30+ -- Matthias Klose <doko@ubuntu.com> Sun, 27 Jan 2013 19:59:56 +0100
31+
32+python-defaults (2.7.3-10ubuntu4) raring; urgency=low
33+
34+ * Build libpython-all-{dev,dbg} packages.
35+
36+ -- Matthias Klose <doko@ubuntu.com> Fri, 25 Jan 2013 20:35:02 +0100
37+
38+python-defaults (2.7.3-10ubuntu3) raring; urgency=low
39+
40+ * Move lsb-release to Build-Depends.
41+
42+ -- Matthias Klose <doko@ubuntu.com> Wed, 12 Dec 2012 11:11:11 +0100
43+
44+python-defaults (2.7.3-10ubuntu2) raring; urgency=low
45+
46+ * Make python-{all,all-dev,all-dbg} Multi-Arch: allowed.
47+
48+ -- Matthias Klose <doko@ubuntu.com> Wed, 12 Dec 2012 11:02:45 +0100
49+
50+python-defaults (2.7.3-10ubuntu1) raring; urgency=low
51+
52+ * Merge with Debian; remaining changes:
53+ - Move python-docutils, and debiandoc-sgml to Build-Depends from B-D-Indep.
54+ This fixes build failures with --no-arch-all and in the buildds on
55+ powerpc, armhf, and amd64.
56+ - debian/control.in: Build depend on lsb-release to set correct
57+ Maintainer fields when building on Ubuntu.
58+ - debian/rules: Ignore version check, as our default versions differ
59+ from Debian's.
60+ - debian/control.in, debian/debian_defaults: Drop python2.6 support.
61+
62+ -- Matthias Klose <doko@ubuntu.com> Wed, 12 Dec 2012 09:17:34 +0100
63+
64+python-defaults (2.7.3-10) experimental; urgency=low
65+
66+ * Build dependency packages as architecture dependent packages.
67+ * Make python, python-{minimal,dev,dbg} Multi-Arch: allowed.
68+ * Build Multi-Arch: any packages libpython-{dev,dbg} packages providing
69+ $(DEB_HOST_GNU_TYPE/DEB_HOST_MULTIARCH)-python-config symlinks.
70+ * Provide python2 symlinks.
71+
72+ -- Matthias Klose <doko@debian.org> Wed, 12 Dec 2012 00:25:00 +0100
73+
74+python-defaults (2.7.3-3ubuntu2) raring; urgency=low
75+
76+ * debian/control.in: move python-docutils, and debiandoc-sgml to
77+ Build-Depends from B-D-Indep. This fixes build failures with
78+ --no-arch-all and in the buildds on powerpc, armhf, and amd64.
79+
80+ -- Barry Warsaw <barry@ubuntu.com> Wed, 28 Nov 2012 17:04:08 -0500
81+
82+python-defaults (2.7.3-3ubuntu1) raring; urgency=low
83+
84+ * Resynchronize with Debian unstable, remaining Ubuntu changes:
85+ - debian/control.in: Build depend on lsb-release to set correct
86+ Maintainer fields when building on Ubuntu.
87+ - debian/rules: Ignore version check, as our default versions differ
88+ from Debian's.
89+ - debian/control.in, debian/debian_defaults: Drop python2.6 support.
90+ - debian/rules: Provide Python pkgconfig defaults.
91+ - debian/rules: Re-add the python2 and python2-config symlinks,
92+ formerly present in the python2.7 packages (see PEP 394).
93+ - debian/control.in, debian/rules: Build dependency packages as
94+ architecture dependent packages (for cross-building python
95+ extension packages, see LP: #934593).
96+ * debian/rules: in binary-arch section, use -a argument for dh_* commands.
97+
98+ -- Dmitry Shachnev <mitya57@ubuntu.com> Wed, 28 Nov 2012 14:50:19 +0400
99+
100+>>>>>>> MERGE-SOURCE
101 python-defaults (2.7.3-3) unstable; urgency=low
102
103 [ Piotr Ożarowski ]
104
105=== modified file 'debian/control'
106--- debian/control 2013-03-21 10:07:07 +0000
107+++ debian/control 2013-03-22 09:01:21 +0000
108@@ -4,8 +4,13 @@
109 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
110 XSBC-Original-Maintainer: Matthias Klose <doko@debian.org>
111 Uploaders: Scott Kitterman <scott@kitterman.com>, Piotr Ożarowski <piotr@debian.org>
112+<<<<<<< TREE
113 Build-Depends: debhelper (>= 8~), python-docutils (>= 0.4-3),
114 libhtml-tree-perl, debiandoc-sgml, lsb-release
115+=======
116+Build-Depends: debhelper (>= 8~), python-docutils (>= 0.4-3), debiandoc-sgml, lsb-release
117+Build-Depends-Indep: libhtml-tree-perl
118+>>>>>>> MERGE-SOURCE
119 Standards-Version: 3.9.3
120 Homepage: http://www.python.org/
121 Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian
122@@ -15,7 +20,11 @@
123 Architecture: any
124 Multi-Arch: allowed
125 Priority: standard
126+<<<<<<< TREE
127 Depends: ${misc:Depends}, python2.7 (>= 2.7.3-10~), python-minimal (= ${binary:Version}), libpython-stdlib (= ${binary:Version})
128+=======
129+Depends: ${misc:Depends}, python2.7 (>= 2.7.3-10~), python-minimal (= ${binary:Version})
130+>>>>>>> MERGE-SOURCE
131 Suggests: python-doc (= ${binary:Version}), python-tk (= ${binary:Version})
132 Conflicts: python-central (<< 0.5.5)
133 Breaks: python-csv (<< 1.0-4), python-bz2 (<< 1.1-8), python-email (<< 2.5.5-3), update-manager-core (<< 0.200.5-2)
134@@ -55,6 +64,7 @@
135 Python version (currently v2.7).
136
137 Package: python-dev
138+<<<<<<< TREE
139 Architecture: any
140 Multi-Arch: allowed
141 Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), python2.7-dev (>= 2.7.3-10~)
142@@ -86,6 +96,27 @@
143 Python, the high-level, interactive object oriented language,
144 includes an extensive class library with lots of goodies for
145 network programming, system administration, sounds and graphics.
146+=======
147+Architecture: any
148+Multi-Arch: allowed
149+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), python2.7-dev (>= 2.7.3-10~)
150+Description: header files and a static library for Python (default)
151+ Header files, a static library and development tools for building
152+ Python modules, extending the Python interpreter or embedding Python
153+ in applications.
154+ .
155+ This package is a dependency package, which depends on Debian's default
156+ Python version (currently v2.7).
157+
158+Package: libpython-dev
159+Architecture: any
160+Multi-Arch: same
161+Depends: libpython2.7-dev (>= 2.7.3-10~), ${misc:Depends}
162+Description: header files and a static library for Python (default)
163+ Header files, a static library and development tools for building
164+ Python modules, extending the Python interpreter or embedding Python
165+ in applications.
166+>>>>>>> MERGE-SOURCE
167 .
168 This package is a dependency package, which depends on Debian's default
169 Python version (currently v2.7).
170@@ -133,7 +164,12 @@
171 Multi-Arch: allowed
172 Section: debug
173 Priority: extra
174-Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.3-10~)
175+<<<<<<< TREE
176+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.3-10~)
177+=======
178+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python2.7-dbg (>= 2.7.3-10~)
179+Provides: python-gdbm-dbg, python-tk-dbg
180+>>>>>>> MERGE-SOURCE
181 Description: debug build of the Python Interpreter (version 2.7)
182 Python interpreter configured with --pydebug. Dynamically loaded modules are
183 searched in /usr/lib/python2.7/lib-dynload/debug first.
184
185=== modified file 'debian/control.in'
186--- debian/control.in 2013-03-21 10:07:07 +0000
187+++ debian/control.in 2013-03-22 09:01:21 +0000
188@@ -3,8 +3,13 @@
189 Priority: optional
190 Maintainer: Matthias Klose <doko@debian.org>
191 Uploaders: Scott Kitterman <scott@kitterman.com>, Piotr Ożarowski <piotr@debian.org>
192+<<<<<<< TREE
193 Build-Depends: debhelper (>= 8~), python-docutils (>= 0.4-3),
194 libhtml-tree-perl, debiandoc-sgml, lsb-release
195+=======
196+Build-Depends: debhelper (>= 8~), python-docutils (>= 0.4-3), debiandoc-sgml, lsb-release
197+Build-Depends-Indep: libhtml-tree-perl
198+>>>>>>> MERGE-SOURCE
199 Standards-Version: 3.9.3
200 Homepage: http://www.python.org/
201 Vcs-Bzr: http://alioth.debian.org/anonscm/bzr/pkg-python/python-defaults-debian
202@@ -54,6 +59,7 @@
203 Python version (currently v@VER@).
204
205 Package: python-dev
206+<<<<<<< TREE
207 Architecture: any
208 Multi-Arch: allowed
209 Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), @PVER@-dev (>= @PREVVER@)
210@@ -85,6 +91,27 @@
211 Python, the high-level, interactive object oriented language,
212 includes an extensive class library with lots of goodies for
213 network programming, system administration, sounds and graphics.
214+=======
215+Architecture: any
216+Multi-Arch: allowed
217+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dev (= ${binary:Version}), @PVER@-dev (>= @PREVVER@)
218+Description: header files and a static library for Python (default)
219+ Header files, a static library and development tools for building
220+ Python modules, extending the Python interpreter or embedding Python
221+ in applications.
222+ .
223+ This package is a dependency package, which depends on Debian's default
224+ Python version (currently v@VER@).
225+
226+Package: libpython-dev
227+Architecture: any
228+Multi-Arch: same
229+Depends: lib@PVER@-dev (>= @PREVVER@), ${misc:Depends}
230+Description: header files and a static library for Python (default)
231+ Header files, a static library and development tools for building
232+ Python modules, extending the Python interpreter or embedding Python
233+ in applications.
234+>>>>>>> MERGE-SOURCE
235 .
236 This package is a dependency package, which depends on Debian's default
237 Python version (currently v@VER@).
238@@ -132,7 +159,12 @@
239 Multi-Arch: allowed
240 Section: debug
241 Priority: extra
242-Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python@VER@-dbg (>= @PREVVER@)
243+<<<<<<< TREE
244+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python@VER@-dbg (>= @PREVVER@)
245+=======
246+Depends: ${misc:Depends}, python (= ${binary:Version}), libpython-dbg (= ${binary:Version}), python@VER@-dbg (>= @PREVVER@)
247+Provides: python-gdbm-dbg, python-tk-dbg
248+>>>>>>> MERGE-SOURCE
249 Description: debug build of the Python Interpreter (version @VER@)
250 Python interpreter configured with --pydebug. Dynamically loaded modules are
251 searched in /usr/lib/python@VER@/lib-dynload/debug first.
252
253=== modified file 'dh_python2.rst'
254--- dh_python2.rst 2012-11-28 14:50:19 +0000
255+++ dh_python2.rst 2013-03-22 09:01:21 +0000
256@@ -6,6 +6,9 @@
257 calculates Python dependencies, adds maintainer scripts to byte compile files, etc.
258 -----------------------------------------------------------------------------------
259
260+:Manual section: 1
261+:Author: Piotr Ożarowski, 2012-2013
262+
263 SYNOPSIS
264 ========
265 dh_python2 -p PACKAGE [-V [X.Y][-][A.B]] DIR_OR_FILE [-X REGEXPR]
266
267=== modified file 'pyclean.rst'
268--- pyclean.rst 2011-02-28 20:28:05 +0000
269+++ pyclean.rst 2013-03-22 09:01:21 +0000
270@@ -6,6 +6,9 @@
271 removes .pyc and .pyo files
272 ---------------------------
273
274+:Manual section: 1
275+:Author: Piotr Ożarowski, 2012-2013
276+
277 SYNOPSIS
278 ========
279 pyclean [-p PACKAGE | DIR_OR_FILE]
280
281=== modified file 'pycompile.rst'
282--- pycompile.rst 2011-02-28 20:28:05 +0000
283+++ pycompile.rst 2013-03-22 09:01:21 +0000
284@@ -1,11 +1,14 @@
285-==========
286+===========
287 pycompile
288-==========
289+===========
290
291 --------------------------------
292 byte compile Python source files
293 --------------------------------
294
295+:Manual section: 1
296+:Author: Debian Developers, 2012-2013
297+
298 SYNOPSIS
299 ========
300 pycompile [-V [X.Y][-][A.B]] DIR_OR_FILE [-X REGEXPR]

Subscribers

People subscribed via source and target branches