[Git][reproducible-builds/diffoscope][split-pkgs] Do a 2-packages split instead of 3

[Mattia Rizzolo]

Mattia Rizzolo pushed to branch split-pkgs at Reproducible Builds / diffoscope


Commits:
1f1e7bd1 by Mattia Rizzolo at 2020-11-24T14:01:18+01:00
Do a 2-packages split instead of 3

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

- - - - -


8 changed files:

- debian/clean
- debian/control
- − debian/diffoscope-core.docs
- debian/diffoscope-basic.docs → debian/diffoscope-minimal.docs
- debian/diffoscope-core.install → debian/diffoscope-minimal.install
- debian/diffoscope-core.manpages → debian/diffoscope-minimal.manpages
- debian/rules
- diffoscope/main.py


Changes:

=====================================
debian/clean
=====================================
@@ -1,5 +1,5 @@
 debian/diffoscope.1
-debian/diffoscope-core.bash-completion
+debian/diffoscope-minimal.bash-completion
 diffoscope.egg-info/
 .cache/
 .pytest_cache/


=====================================
debian/control
=====================================
@@ -94,37 +94,18 @@ Homepage: https://diffoscope.org
 Vcs-Git: https://salsa.debian.org/reproducible-builds/diffoscope.git
 Vcs-Browser: https://salsa.debian.org/reproducible-builds/diffoscope
 
-Package: diffoscope-core
+Package: diffoscope-minimal
 Architecture: all
 Depends:
  python3-distutils,
  python3-pkg-resources,
  ${misc:Depends},
  ${python3:Depends},
-Breaks: diffoscope (<< 162~)
-Replaces: diffoscope (<< 162~)
-Description: in-depth comparison of files, archives, and directories
- diffoscope will try to get to the bottom of what makes files or directories
- different. It will recursively unpack archives of many kinds and transform
- various binary formats into more human-readable form to compare them. It can
- compare two tarballs, ISO images, or PDF just as easily. The differences can
- be shown in a text or HTML report.
- .
- This package depends only on the basics to get diffoscope running, without
- support for file-format-specific comparison.
- .
- diffoscope is developed as part of the “reproducible builds” project.
-
-Package: diffoscope-basic
-Architecture: all
-Depends:
- diffoscope-core,
- ${misc:Depends},
 Recommends:
- ${diffoscope-basic:Recommends},
+ ${diffoscope-minimal:Recommends},
  ${python3:Recommends},
-Enhances:
- diffoscope-core,
+Breaks: diffoscope (<< 162~)
+Replaces: diffoscope (<< 162~)
 Description: in-depth comparison of files, archives, and directories
  diffoscope will try to get to the bottom of what makes files or directories
  different. It will recursively unpack archives of many kinds and transform
@@ -132,8 +113,8 @@ Description: in-depth comparison of files, archives, and directories
  compare two tarballs, ISO images, or PDF just as easily. The differences can
  be shown in a text or HTML report.
  .
- This is a dependency package that recommends a set of 3rd party tools needed
- to produce file-format-specific comparisons, excluding those that are
+ This package only recommends a partial set of the supported 3rd party tools
+ needed to produce file-format-specific comparisons, excluding those that are
  considered too large or too niche for the general use.
  .
  diffoscope is developed as part of the “reproducible builds” project.
@@ -143,7 +124,7 @@ Architecture: all
 Suggests:
  libjs-jquery,
 Depends:
- diffoscope-core,
+ diffoscope-minimal,
  ${misc:Depends},
 Recommends:
  ${diffoscope:Recommends},


=====================================
debian/diffoscope-core.docs deleted
=====================================
@@ -1 +0,0 @@
-diffoscope.docs
\ No newline at end of file


=====================================
debian/diffoscope-basic.docs → debian/diffoscope-minimal.docs
=====================================


=====================================
debian/diffoscope-core.install → debian/diffoscope-minimal.install
=====================================


=====================================
debian/diffoscope-core.manpages → debian/diffoscope-minimal.manpages
=====================================


=====================================
debian/rules
=====================================
@@ -18,7 +18,7 @@ ifneq ($(DEB_VERSION),$(PY_VERSION))
 endif
 
 export PATH := $(CURDIR)/bin:$(PATH)
-export PYBUILD_DESTDIR = debian/diffoscope-core
+export PYBUILD_DESTDIR = debian/diffoscope-minimal
 export PYBUILD_TEST_ARGS = -vv -r sxX -l --cov=diffoscope --cov-report=term-missing --cov-report=html
 export PYBUILD_BEFORE_TEST = flake8 --config=/dev/null --select=F821
 export PYBUILD_AFTER_TEST = debian/tests/basic-command-line
@@ -37,31 +37,27 @@ endif
 doc/%.1:
 	$(MAKE) -C doc $*.1
 
-debian/diffoscope-core.bash-completion:
+debian/diffoscope-minimal.bash-completion:
 	register-python-argcomplete3 diffoscope > $@
 
-execute_after_dh_auto_build: debian/diffoscope-core.bash-completion
+execute_after_dh_auto_build: debian/diffoscope-minimal.bash-completion
 	dh_auto_build -O--buildsystem=makefile -Ddoc
 
 override_dh_python3:
 	# dh_python3 will only work on binaries shipping files
-	dh_python3 -p diffoscope-core \
+	dh_python3 -p diffoscope-minimal \
 		--depends-section=distro_detection \
 		--recommends-section=cmdline \
 		--recommends-section=comparators
-	grep Recommends debian/diffoscope-core.substvars >> debian/diffoscope-basic.substvars
-	grep Recommends debian/diffoscope-core.substvars >> debian/diffoscope.substvars
-	sed -i '/^python3:Recommends/d' debian/diffoscope-core.substvars
-	@# double check everything is as expected
-	@if grep -q Recommends debian/diffoscope-core.substvars ; then echo "Unexepcted Recommends in diffoscope-core substvar" ; false ; fi
-	# Remove big Recommends from the -basic package, leaving them only in the full one
-	sed -i 's/python3-guestfs,//' debian/diffoscope-basic.substvars
-	sed -i 's/python3-binwalk,//' debian/diffoscope-basic.substvars
+	grep Recommends debian/diffoscope-minimal.substvars >> debian/diffoscope.substvars
+	# Remove big Recommends from the -minimal package, leaving them only in the full one
+	sed -i 's/python3-guestfs,//' debian/diffoscope-minimal.substvars
+	sed -i 's/python3-binwalk,//' debian/diffoscope-minimal.substvars
 
 execute_before_dh_gencontrol:
 	bin/diffoscope --list-debian-substvars | tee -a \
 		debian/diffoscope.substvars \
-		debian/diffoscope-basic.substvars \
+		debian/diffoscope-minimal.substvars \
 		> /dev/null
 	head debian/*.substvars
 


=====================================
diffoscope/main.py
=====================================
@@ -597,7 +597,7 @@ class ListDebianSubstvarsAction(argparse._StoreTrueAction):
 
         print("diffoscope:Recommends={}".format(", ".join(sorted(packages))))
         print(
-            "diffoscope-basic:Recommends={}".format(
+            "diffoscope-minimal:Recommends={}".format(
                 ", ".join(sorted(packages_basic))
             )
         )



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/1f1e7bd12a46df2d505aca97b367bb432df5c16b

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/1f1e7bd12a46df2d505aca97b367bb432df5c16b
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/20201124/59fb632d/attachment.htm>