[diffoscope] 03/05: wrap-and-sort, broken by the revert, as it had conflicts

Mattia Rizzolo mattia at debian.org
Fri Aug 19 11:04:43 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 89737edccbc929a4faa4514b0b75e5034e6f474b
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri Aug 19 08:55:59 2016 +0000

    wrap-and-sort, broken by the revert, as it had conflicts
    
    Gbp-Dch: Ignore
---
 debian/control | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 933726e..edbe71e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,14 +15,14 @@ Build-Depends:
  debhelper (>= 9),
  default-jdk-headless <!nocheck>,
  dh-python (>= 2.20160818~),
+ enjarify <!nocheck>,
+ fp-utils <!nocheck>,
+ ghostscript <!nocheck>,
  libjs-jquery,
  libjs-jquery-hotkeys,
  libjs-jquery-isonscreen,
  libjs-jquery-tablesorter,
  libjs-jquery-throttle-debounce,
- enjarify <!nocheck>,
- fp-utils <!nocheck>,
- ghostscript <!nocheck>,
  llvm <!nocheck>,
  mono-utils <!nocheck>,
  pdftk <!nocheck>,
@@ -34,8 +34,8 @@ Build-Depends:
  python3-guestfs <!nocheck>,
  python3-libarchive-c,
  python3-magic,
- python3-pytest-cov,
  python3-pytest <!nocheck>,
+ python3-pytest-cov,
  python3-rpm <!nocheck>,
  python3-setuptools,
  python3-tlsh (>= 3.4.1) <!nocheck>,

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


More information about the diffoscope mailing list