From 449739ab2277b09bf5b0c5269df57d594736b8df Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Fri, 4 Nov 2022 15:35:41 +0100 Subject: [PATCH] Getting rid of the now obsolete exiftool dependency --- .github/workflows/ci.yml | 1 - INSTALL.adoc | 1 - Makefile.in | 1 - bin/daps-check-deps | 3 --- configure.ac | 8 ++------ debian/control | 1 - packaging/daps.spec | 1 - packaging/debian/control | 2 -- 8 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7fde17f9..270e2cec3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,6 @@ jobs: imagemagick \ inkscape \ jing \ - libimage-exiftool-perl \ libsaxon-java \ libtool \ libxml-commons-external-java \ diff --git a/INSTALL.adoc b/INSTALL.adoc index d8e4c9a80..27e7596ec 100644 --- a/INSTALL.adoc +++ b/INSTALL.adoc @@ -105,7 +105,6 @@ installed. |aspell |aspell |aspell |ditaa |ditaa |ditaa |epubcheck |epubcheck |? -|exiftool |libimage-exiftool-perl |perl-Image-ExifTool |libreoffice-draw |libreoffice-draw |libreoffice-draw |optipng |optipng |optipng |perl-checkbot |checkbot |? diff --git a/Makefile.in b/Makefile.in index 08454c295..82d8a6d82 100644 --- a/Makefile.in +++ b/Makefile.in @@ -312,7 +312,6 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EPUBCHECK = @EPUBCHECK@ ETAGS = @ETAGS@ -EXIFTOOL = @EXIFTOOL@ GREP = @GREP@ HAVE_PYMOD_LXML = @HAVE_PYMOD_LXML@ INKSCAPE = @INKSCAPE@ diff --git a/bin/daps-check-deps b/bin/daps-check-deps index 1365dbda6..f513af955 100755 --- a/bin/daps-check-deps +++ b/bin/daps-check-deps @@ -214,9 +214,6 @@ fi # aspell print_prg "aspell" "IMPORTANT" " (subcommand 'spellcheck' not supported)" -# exiftool -print_prg "exiftool" "IMPORTANT" " (subcommand 'optipng' not supported)" - # optipng print_prg "optipng" "IMPORTANT" " (subcommand 'optipng' not supported)" diff --git a/configure.ac b/configure.ac index 0ba54ec36..bec20f4f5 100644 --- a/configure.ac +++ b/configure.ac @@ -183,9 +183,6 @@ fi dnl dia AC_PATH_PROG([DIA], [dia], [0]) -dnl exiftool -AC_PATH_PROG([EXIFTOOL], [exiftool], [0]) - dnl inkscape AC_PATH_PROG([INKSCAPE], [inkscape], [0]) @@ -522,9 +519,8 @@ else fi dnl Optimize PNGs (optipng) -if test 0 = "$OPTIPNG" -o 0 = "$EXIFTOOL"; then - AC_MSG_RESULT([Size optimization for .png | no | install optipng and/or exiftool -]) +if test 0 = "$OPTIPNG"; then + AC_MSG_RESULT([Size optimization for .png | no | install optipng]) else AC_MSG_RESULT([Size optimization for .png | yes |]) fi diff --git a/debian/control b/debian/control index 39a0803d2..9298f8cb2 100644 --- a/debian/control +++ b/debian/control @@ -60,7 +60,6 @@ Suggests: aspell-en, checkbot, epubcheck, dia, - libimage-exiftool-perl, optipng, xmlformat-perl Description: DocBook Authoring and Publishing Suite (DAPS) diff --git a/packaging/daps.spec b/packaging/daps.spec index 38cda7066..6a10052ec 100644 --- a/packaging/daps.spec +++ b/packaging/daps.spec @@ -90,7 +90,6 @@ Recommends: aspell-en Recommends: calibre Recommends: ditaa Recommends: epubcheck -Recommends: exiftool %ifarch aarch64 %{ix86} x86_64 Recommends: libreoffice-draw %endif diff --git a/packaging/debian/control b/packaging/debian/control index c840f767f..67268452c 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -22,7 +22,6 @@ Build-Depends: debhelper (>= 8.0.0), python-lxml, libxml-commons-external-java, libxmlgraphics-commons-java, - libimage-exiftool-perl, fop, libxml2, remake, @@ -62,7 +61,6 @@ Depends: ${shlibs:Depends}, libxml2, libxml-commons-external-java, libxmlgraphics-commons-java, - libimage-exiftool-perl, fop, remake, xmlstarlet,