[Git][reproducible-builds/diffoscope][master] 6 commits: d/control: Bump debhelper compat level to 13.

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch master at Reproducible Builds / diffoscope


Commits:
934b5685 by Mattia Rizzolo at 2020-05-26T20:32:17+02:00
d/control: Bump debhelper compat level to 13.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
f469abc4 by Mattia Rizzolo at 2020-05-26T20:34:05+02:00
d/rules: Use the new execute_after_*/execture_before_* dh rules.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
00bd6346 by Mattia Rizzolo at 2020-05-26T20:35:32+02:00
d/control: sort build-deps

Gbp-Dch: Ignore
Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
a9d39e5c by Mattia Rizzolo at 2020-05-26T20:36:45+02:00
d/rules: fix grammar in a comment

Gbp-Dch: Ignore
Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
6219fa6a by Mattia Rizzolo at 2020-05-26T21:04:48+02:00
Remove now apparently unneeded dh_python3 py3dist mapping overrides

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
59c336c9 by Mattia Rizzolo at 2020-05-26T21:05:20+02:00
Add a py3dist override for the rpm-python module

Closes: #949598
Fixes: https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/89
Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


3 changed files:

- debian/control
- debian/py3dist-overrides
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -8,15 +8,15 @@ Uploaders:
  Mattia Rizzolo <mattia at debian.org>,
 Build-Depends:
  abootimg <!nocheck>,
- apktool [!ppc64el !s390x] <!nocheck>,
  apksigner <!nocheck>,
+ apktool [!ppc64el !s390x] <!nocheck>,
  bash-completion,
  binutils-multiarch <!nocheck>,
  black <!nocheck>,
  caca-utils <!nocheck>,
  colord <!nocheck>,
  db-util <!nocheck>,
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
  default-jdk-headless <!nocheck> | default-jdk <!nocheck>,
  device-tree-compiler (>= 1.4.2) <!nocheck>,
  dh-python (>= 2.20160818~),
@@ -62,12 +62,12 @@ Build-Depends:
  python3-debian <!nocheck>,
  python3-distro <!nocheck>,
  python3-docutils,
- python3-pdfminer <!nocheck>,
  python3-guestfs <!nocheck>,
  python3-h5py <!nocheck>,
  python3-jsondiff <!nocheck>,
  python3-libarchive-c,
  python3-magic,
+ python3-pdfminer <!nocheck>,
  python3-progressbar <!nocheck>,
  python3-pypdf2 <!nocheck>,
  python3-pytest <!nocheck>,


=====================================
debian/py3dist-overrides
=====================================
@@ -1,3 +1,2 @@
-tlsh python3-tlsh (>= 3.4.1)
-python-magic python3-magic
 guestfs python3-guestfs
+rpm-python python3-rpm


=====================================
debian/rules
=====================================
@@ -2,7 +2,7 @@
 
 include /usr/share/dpkg/pkg-info.mk
 
-SHELL := /bin/bash  # for the <(echo …) below, this was easiest way.
+SHELL := /bin/bash  # for the <(echo …) below, this was the easiest way.
 PY_VERSION := $(shell awk '/^VERSION = / {gsub(/"/, "", $$3); print $$3}' diffoscope/__init__.py )
 CHECK_VERSION := $(shell grep '^$(PY_VERSION)[^0-9].*$$' <(echo $(DEB_VERSION)))
 
@@ -39,8 +39,7 @@ doc/%.1:
 debian/diffoscope.bash-completion:
 	register-python-argcomplete3 diffoscope > $@
 
-override_dh_auto_build: debian/diffoscope.bash-completion
-	dh_auto_build -O--buildsystem=pybuild
+execute_after_dh_auto_build: debian/diffoscope.bash-completion
 	dh_auto_build -O--buildsystem=makefile -Ddoc
 
 override_dh_python3:
@@ -49,9 +48,8 @@ override_dh_python3:
 		--recommends-section=cmdline \
 		--recommends-section=comparators \
 
-override_dh_gencontrol:
+execute_before_dh_gencontrol:
 	bin/diffoscope --list-debian-substvars >> debian/diffoscope.substvars
-	dh_gencontrol -O--buildsystem=pybuild
 
 diffoscope/presenters/icon.py: favicon.png
 	(echo '# Generated from $@'; \



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/5f9faf9f1585719696feda146f93e2e455dde847...59c336c9c7aa6ae0df44a15046d707ae6e747a7d

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/5f9faf9f1585719696feda146f93e2e455dde847...59c336c9c7aa6ae0df44a15046d707ae6e747a7d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20200526/95e05c66/attachment.htm>