[Git][reproducible-builds/diffoscope][master] 3 commits: Reference the Debian 'ocaml' package instead of 'ocaml-nox'. (Closes: #1125094)

[Chris Lamb (@lamby)]

Chris Lamb pushed to branch master at Reproducible Builds / diffoscope


Commits:
af884a8f by Chris Lamb at 2026-01-09T12:02:43-08:00
Reference the Debian 'ocaml' package instead of 'ocaml-nox'. (Closes: #1125094)

- - - - -
275b3f94 by Chris Lamb at 2026-01-09T12:03:46-08:00
Update copyright years.

- - - - -
739f05c1 by Chris Lamb at 2026-01-09T12:04:12-08:00
releasing package diffoscope version 310

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/tests/control
- diffoscope/__init__.py
- diffoscope/external_tools.py


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,10 @@
-diffoscope (310) UNRELEASED; urgency=medium
+diffoscope (310) unstable; urgency=medium
 
-  * WIP (generated upon release).
+  [ Chris Lamb ]
+  * Reference the Debian 'ocaml' package instead of 'ocaml-nox'.
+    (Closes: #1125094)
 
- -- Chris Lamb <lamby at debian.org>  Fri, 14 Nov 2025 09:51:11 -0800
+ -- Chris Lamb <lamby at debian.org>  Fri, 09 Jan 2026 12:04:10 -0800
 
 diffoscope (309) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -56,7 +56,7 @@ Build-Depends:
  lz4 <!nocheck>,
  lzip <!nocheck>,
  mono-devel (>= 6.14.1+ds-3) <!nocheck> | mono-utils (<< 6.14.1+ds-3) <!nocheck>,
- ocaml-nox <!nocheck>,
+ ocaml <!nocheck>,
  odt2txt <!nocheck>,
  oggvideotools [!s390x] <!nocheck>,
  openssh-client <!nocheck>,


=====================================
debian/tests/control
=====================================
@@ -7,7 +7,7 @@
 #   $ mv debian/tests/control.tmp debian/tests/control
 
 Tests: pytest-with-recommends
-Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], 7zip, abootimg, acl, apksigcopier, apksigner, apktool, binutils-multiarch, bzip2, caca-utils, colord, coreboot-utils [!risv64], db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fonttools, fp-utils [!riscv64 !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg-utils, gpg, hdf5-tools, html2text, imagemagick, jsbeautifier, libarchive-tools, libxmlb-utils, llvm, lz4, lzip, mono-devel (>= 6.14.1+ds-3) [!riscv64] | mono-utils (<< 6.14.1+ds-3) [!riscv64], ocaml-nox, odt2txt, oggvideotools [!s390x], openssh-client, openssl, perl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, systemd-ukify, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd, xz-utils, zip, zstd, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
+Depends: python3-all, diffoscope, black, python3-pytest, python3-h5py, file, linux-image-amd64 [amd64] | linux-image-generic [amd64], 7zip, abootimg, acl, apksigcopier, apksigner, apktool, binutils-multiarch, bzip2, caca-utils, colord, coreboot-utils [!risv64], db-util, default-jdk-headless | default-jdk | java-sdk, device-tree-compiler, docx2txt, e2fsprogs, enjarify, ffmpeg, fontforge-extras, fonttools, fp-utils [!riscv64 !s390x], genisoimage, gettext, ghc, ghostscript, giflib-tools, gnumeric, gnupg-utils, gpg, hdf5-tools, html2text, imagemagick, jsbeautifier, libarchive-tools, libxmlb-utils, llvm, lz4, lzip, mono-devel (>= 6.14.1+ds-3) [!riscv64] | mono-utils (<< 6.14.1+ds-3) [!riscv64], ocaml, odt2txt, oggvideotools [!s390x], openssh-client, openssl, perl, pgpdump, poppler-utils, procyon-decompiler, python3-pdfminer, r-base-core, rpm2cpio, sng, sqlite3, squashfs-tools, systemd-ukify, tcpdump, u-boot-tools, unzip, wabt, xmlbeans, xxd, xz-utils, zip, zstd, python3-argcomplete, python3-binwalk, python3-defusedxml, python3-distro, python3-guestfs, python3-jsondiff, python3-progressbar, python3-pypdf, python3-debian, python3-pyxattr, python3-rpm, python3-tlsh
 
 Tests: pytest
 Depends: python3-all, diffoscope, python3-pytest, python3-h5py, file, python3-tlsh


=====================================
diffoscope/__init__.py
=====================================
@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-VERSION = "309"
+VERSION = "310"


=====================================
diffoscope/external_tools.py
=====================================
@@ -1,7 +1,7 @@
 #
 # diffoscope: in-depth comparison of files, archives, and directories
 #
-# Copyright © 2017-2025 Chris Lamb <lamby at debian.org>
+# Copyright © 2017-2026 Chris Lamb <lamby at debian.org>
 # Copyright © 2021 Jean-Romain Garnier <salsa at jean-romain.com>
 #
 # diffoscope is free software: you can redistribute it and/or modify
@@ -159,7 +159,7 @@ EXTERNAL_TOOLS = {
         "arch": "binutils",
         "guix": "binutils",
     },
-    "ocamlobjinfo": {"debian": "ocaml-nox", "arch": "ocaml", "guix": "ocaml"},
+    "ocamlobjinfo": {"debian": "ocaml", "arch": "ocaml", "guix": "ocaml"},
     "odt2txt": {"debian": "odt2txt", "arch": "odt2txt", "guix": "odt2txt"},
     "oggDump": {"debian": "oggvideotools"},
     "openssl": {"debian": "openssl", "arch": "openssl", "guix": "openssl"},



View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/e9eedc6c2ee3f265dda35fa7a78ef9cc0bb69d19...739f05c1e9ddd2a4c251f367599401be6629dbd8

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/diffoscope/-/compare/e9eedc6c2ee3f265dda35fa7a78ef9cc0bb69d19...739f05c1e9ddd2a4c251f367599401be6629dbd8
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/20260109/0639be3f/attachment.htm>