diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2014-04-17 17:45:45 +0200 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2014-04-23 14:38:43 +0200 |
commit | 11cd137420d45f795b67f54f73cbf97010206d7a (patch) | |
tree | a0eda3c8ba35edd933435dfb410e5808b2953564 | |
parent | 66a67b941a86150dd3d8b50208cbcdef9a2ff2d7 (diff) | |
download | mupdf-11cd137420d45f795b67f54f73cbf97010206d7a.tar.xz |
Fix 693518: update Makerules and debian/control
Debian doesn't have libopenjp2 as a package (whereas gentoo does) so
I've removed it from the control file. You'll need to use the
thirdparty submodule for openjpeg2 until such a time as it exists.
-rw-r--r-- | Makerules | 4 | ||||
-rw-r--r-- | platform/debian/control | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -71,8 +71,8 @@ SYS_X11_LIBS = $(shell pkg-config --libs x11 xext) SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2) SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2) -SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1) -SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1) +SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2) +SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2) SYS_JBIG2DEC_LIBS = -ljbig2dec SYS_JPEG_LIBS = -ljpeg SYS_ZLIB_LIBS = -lz diff --git a/platform/debian/control b/platform/debian/control index 2525e067..fdd6ebd5 100644 --- a/platform/debian/control +++ b/platform/debian/control @@ -2,7 +2,7 @@ Source: mupdf Section: text Priority: optional Maintainer: Tor Andersson <tor@ghostscript.com> -Build-Depends: debhelper (>= 5), make, pkg-config, gcc, coreutils, binutils, tar, libfreetype6-dev, libx11-dev, libxext-dev, libjbig2dec-dev, libopenjpeg-dev, libjpeg8-dev, zenity, zlib1g-dev +Build-Depends: debhelper (>= 5), make, pkg-config, gcc, coreutils, binutils, tar, libfreetype6-dev, libx11-dev, libxext-dev, libjbig2dec-dev, libjpeg8-dev, zenity, zlib1g-dev Standards-Version: 3.7.2 Package: libmupdf-dev |