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

[Jeremy Bícha]

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

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

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.

[Jeremy Bícha (jbicha)]

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

Unmerged revisions

2627. By Jeremy Bícha on 2018-04-13

Update Vcs-Bzr field

2626. By Jeremy Bícha on 2018-04-13

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

Build with pybuild to simplify debian/rules

=== modified file 'debian/control'
--- debian/control	2018-03-27 14:09:09 +0000
+++ debian/control	2018-04-13 15:28:05 +0000
@@ -2,6 +2,7 @@
 Section: utils
 Priority: optional
 Build-Depends: debhelper (>= 9),
+ dh-python,
  dh-translations,
  dh-systemd,
  gdb,
@@ -9,11 +10,9 @@
  gir1.2-glib-2.0 (>= 1.29.17),
  lsb-release,
  net-tools,
- python-all,
  python3-all
-Build-Depends-Indep: python-distutils-extra (>= 2.24~),
+Build-Depends-Indep: 
  python3-distutils-extra (>= 2.24~),
- python-apt (>= 0.7.9),
  python3-apt (>= 0.7.9),
  intltool,
  xvfb,
@@ -33,9 +32,8 @@
  default-jdk | java-sdk
 Maintainer: Martin Pitt <[e-mail]>
 Standards-Version: 3.9.8
-X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.0
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/ubuntu/artful/apport/ubuntu
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/ubuntu/bionic/apport/ubuntu
 Homepage: https://wiki.ubuntu.com/Apport
 
 Package: apport
@@ -61,19 +59,6 @@
  handling the crash reports. For desktops, you should consider
  installing the GTK+ or Qt user interface (apport-gtk or apport-kde).
 
-Package: python-problem-report
-Section: python
-Architecture: all
-Depends: ${python:Depends},
- ${misc:Depends}
-Description: Python library to handle problem reports
- This Python library provides an interface for creating, modifying,
- and accessing standardized problem reports for program and kernel
- crashes and packaging bugs.
- .
- These problem reports use standard Debian control format syntax
- (RFC822).
-
 Package: python3-problem-report
 Section: python
 Architecture: all
@@ -87,26 +72,6 @@
  These problem reports use standard Debian control format syntax
  (RFC822).
 
-Package: python-apport
-Section: python
-Architecture: all
-Depends: ${python:Depends}, 
- python-apt (>= 0.7.9),
- python-httplib2,
- python-problem-report (>= 0.94),
- lsb-release,
- python-launchpadlib (>= 1.5.7),
- ${misc:Depends}
-Recommends: apport
-Description: Python library for Apport crash report handling
- This Python package provides high-level functions for creating and
- handling apport crash reports:
- .
-  * Query available and new reports.
-  * Add OS, packaging, and process runtime information to a report.
-  * Various frontend utility functions.
-  * Python hook to generate crash reports when Python scripts fail.
-
 Package: python3-apport
 Section: python
 Architecture: all

=== removed file 'debian/python-apport.install'
--- debian/python-apport.install	2012-06-11 08:04:32 +0000
+++ debian/python-apport.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/python2*/*-packages/apport/*
-usr/lib/python2*/*-packages/apport_python_hook.py

=== removed file 'debian/python-problem-report.install'
--- debian/python-problem-report.install	2012-06-11 07:40:43 +0000
+++ debian/python-problem-report.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/python2*/*-packages/problem_report*

=== modified file 'debian/rules'
--- debian/rules	2017-12-13 18:30:20 +0000
+++ debian/rules	2018-04-13 15:28:05 +0000
@@ -1,22 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh "$@" --with python2,python3,translations,systemd
-
-# needs manual commands for Python 3, see Debian #597105
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf build
-
-override_dh_auto_build:
-	dh_auto_build
-	python3 setup.py build
-
-override_dh_auto_install:
-	dh_auto_install
-	set -ex; for python in $(shell py3versions -r); do \
-	    $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
-	done
+	dh $@ --with python3,translations,systemd --buildsystem=pybuild
 
 override_dh_auto_test:
 ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS)))