[diffoscope] 01/01: Now Debian has a dedicated xxd binary package. Use that instead of all of vim-common

Mattia Rizzolo mattia at debian.org
Mon Sep 12 10:26:30 CEST 2016


This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository diffoscope.

commit da3fe7131315121c429c77b60f998da3f4854bf8
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Sep 12 08:26:02 2016 +0000

    Now Debian has a dedicated xxd binary package.  Use that instead of all of vim-common
---
 debian/control    | 2 +-
 diffoscope/exc.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 5690f6a..257bfc7 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,7 @@ Build-Depends:
  sqlite3 <!nocheck>,
  squashfs-tools <!nocheck>,
  unzip <!nocheck>,
- vim-common <!nocheck>,
+ xxd <!nocheck> | vim-common <!nocheck>,
 Standards-Version: 3.9.8
 Homepage: https://diffoscope.org/
 Vcs-Git: https://anonscm.debian.org/git/reproducible/diffoscope.git
diff --git a/diffoscope/exc.py b/diffoscope/exc.py
index 5e77b2c..116e813 100644
--- a/diffoscope/exc.py
+++ b/diffoscope/exc.py
@@ -184,7 +184,7 @@ class RequiredToolNotFound(Exception):
             'FreeBSD': 'squashfs-tools',
         },
         'xxd': {
-            'debian': 'vim-common',
+            'debian': 'xxd | vim-common',
             'arch': 'vim',
             'FreeBSD': 'vim | vim-lite',
         },

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git


More information about the diffoscope mailing list