Merge lp:~jbicha/apport/drop-py2 into lp:~ubuntu-core-dev/ubuntu/bionic/apport/ubuntu

Proposed by Jeremy Bicha
Status: Needs review
Proposed branch: lp:~jbicha/apport/drop-py2
Merge into: lp:~ubuntu-core-dev/ubuntu/bionic/apport/ubuntu
Diff against target: 123 lines (+4/-57)
4 files modified
debian/control (+3/-38)
debian/python-apport.install (+0/-2)
debian/python-problem-report.install (+0/-1)
debian/rules (+1/-16)
To merge this branch: bzr merge lp:~jbicha/apport/drop-py2
Reviewer Review Type Date Requested Status
Brian Murray Pending
Review via email: mp+343218@code.launchpad.net

Commit message

Drop unused Python2 packages python-apport & python-problem-report (LP: #1763735)

Build with pybuild to simplify debian/rules
Update Vcs-Bzr field

Description of the change

We should update test/run to look for pyflakes3 instead of pyflakes too but I wasn't sure how you handled "upstream" changes. It's a bit confusing how there are two separate bzr branches that don't appear to be in sync?

I suggest updating .bzr-builddeb/default.conf to say native = True instead of merge = True so that bzr-buildpackage works without trying to find an original tarball somewhere since that doesn't exist since this is a debian 1.0 source format package.

To post a comment you must log in.
Revision history for this message
Jeremy Bicha (jbicha) wrote :

Brian, now that cosmic is open, could you look into this merge proposal?

Unmerged revisions

2627. By Jeremy Bicha

Update Vcs-Bzr field

2626. By Jeremy Bicha

Drop unused Python2 packages python-apport & python-problem-report (LP: #1763735)

Build with pybuild to simplify debian/rules

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2018-03-27 14:09:09 +0000
3+++ debian/control 2018-04-13 15:28:05 +0000
4@@ -2,6 +2,7 @@
5 Section: utils
6 Priority: optional
7 Build-Depends: debhelper (>= 9),
8+ dh-python,
9 dh-translations,
10 dh-systemd,
11 gdb,
12@@ -9,11 +10,9 @@
13 gir1.2-glib-2.0 (>= 1.29.17),
14 lsb-release,
15 net-tools,
16- python-all,
17 python3-all
18-Build-Depends-Indep: python-distutils-extra (>= 2.24~),
19+Build-Depends-Indep:
20 python3-distutils-extra (>= 2.24~),
21- python-apt (>= 0.7.9),
22 python3-apt (>= 0.7.9),
23 intltool,
24 xvfb,
25@@ -33,9 +32,8 @@
26 default-jdk | java-sdk
27 Maintainer: Martin Pitt <martin.pitt@ubuntu.com>
28 Standards-Version: 3.9.8
29-X-Python-Version: >= 2.7
30 X-Python3-Version: >= 3.0
31-Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/ubuntu/artful/apport/ubuntu
32+Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/ubuntu/bionic/apport/ubuntu
33 Homepage: https://wiki.ubuntu.com/Apport
34
35 Package: apport
36@@ -61,19 +59,6 @@
37 handling the crash reports. For desktops, you should consider
38 installing the GTK+ or Qt user interface (apport-gtk or apport-kde).
39
40-Package: python-problem-report
41-Section: python
42-Architecture: all
43-Depends: ${python:Depends},
44- ${misc:Depends}
45-Description: Python library to handle problem reports
46- This Python library provides an interface for creating, modifying,
47- and accessing standardized problem reports for program and kernel
48- crashes and packaging bugs.
49- .
50- These problem reports use standard Debian control format syntax
51- (RFC822).
52-
53 Package: python3-problem-report
54 Section: python
55 Architecture: all
56@@ -87,26 +72,6 @@
57 These problem reports use standard Debian control format syntax
58 (RFC822).
59
60-Package: python-apport
61-Section: python
62-Architecture: all
63-Depends: ${python:Depends},
64- python-apt (>= 0.7.9),
65- python-httplib2,
66- python-problem-report (>= 0.94),
67- lsb-release,
68- python-launchpadlib (>= 1.5.7),
69- ${misc:Depends}
70-Recommends: apport
71-Description: Python library for Apport crash report handling
72- This Python package provides high-level functions for creating and
73- handling apport crash reports:
74- .
75- * Query available and new reports.
76- * Add OS, packaging, and process runtime information to a report.
77- * Various frontend utility functions.
78- * Python hook to generate crash reports when Python scripts fail.
79-
80 Package: python3-apport
81 Section: python
82 Architecture: all
83
84=== removed file 'debian/python-apport.install'
85--- debian/python-apport.install 2012-06-11 08:04:32 +0000
86+++ debian/python-apport.install 1970-01-01 00:00:00 +0000
87@@ -1,2 +0,0 @@
88-usr/lib/python2*/*-packages/apport/*
89-usr/lib/python2*/*-packages/apport_python_hook.py
90
91=== removed file 'debian/python-problem-report.install'
92--- debian/python-problem-report.install 2012-06-11 07:40:43 +0000
93+++ debian/python-problem-report.install 1970-01-01 00:00:00 +0000
94@@ -1,1 +0,0 @@
95-usr/lib/python2*/*-packages/problem_report*
96
97=== modified file 'debian/rules'
98--- debian/rules 2017-12-13 18:30:20 +0000
99+++ debian/rules 2018-04-13 15:28:05 +0000
100@@ -1,22 +1,7 @@
101 #!/usr/bin/make -f
102
103 %:
104- dh "$@" --with python2,python3,translations,systemd
105-
106-# needs manual commands for Python 3, see Debian #597105
107-override_dh_auto_clean:
108- dh_auto_clean
109- rm -rf build
110-
111-override_dh_auto_build:
112- dh_auto_build
113- python3 setup.py build
114-
115-override_dh_auto_install:
116- dh_auto_install
117- set -ex; for python in $(shell py3versions -r); do \
118- $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
119- done
120+ dh $@ --with python3,translations,systemd --buildsystem=pybuild
121
122 override_dh_auto_test:
123 ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS)))

Subscribers

People subscribed via source and target branches