Forgot to rebuild the package after making some of the later changes, and
so there were still a few bugs in the previously provided files.
Attached is a patch (that should be applied after adding the other
files) that fixes compliation and building of the package.
Tom Parker
diff -rN -u old-libjpeg6b-6b/Makefile.am new-libjpeg6b-6b/Makefile.am
--- old-libjpeg6b-6b/Makefile.am 2006-11-13 17:41:22.000000000 +0100
+++ new-libjpeg6b-6b/Makefile.am 2006-11-13 17:41:22.000000000 +0100
@@ -8,6 +8,7 @@
jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c jfdctfst.c \
jfdctint.c jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \
jquant2.c jutils.c jmemmgr.c
+libjpeg_la_LIBADD = $(MEMORYMGR)
libjpeg_la_DEPENDENCIES = $(MEMORYMGR)
libjpeg_la_LDFLAGS = -version-info $(VERSION):0:0
lib_LTLIBRARIES = libjpeg.la
@@ -27,5 +28,6 @@
rdjpgcom_LDADD = libjpeg.la
wrjpgcom_LDADD = libjpeg.la
+include_HEADERS = jconfig.h jpegint.h
bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
diff -rN -u old-libjpeg6b-6b/configure.ac new-libjpeg6b-6b/configure.ac
--- old-libjpeg6b-6b/configure.ac 2006-11-13 17:41:22.000000000 +0100
+++ new-libjpeg6b-6b/configure.ac 2006-11-13 17:41:22.000000000 +0100
@@ -37,11 +37,11 @@
AC_DEFINE([NEED_SIGNAL_CATCHER], [], [Define signal catcher to remove temp
files])
AC_DEFINE([NO_MKTEMP],[],[Don't have mktemp])
-MEMORYMGR=jmemnobs.o
+MEMORYMGR=jmemnobs.lo
AC_ARG_ENABLE([maxmem],AC_HELP_STRING([--enable-maxmem=N],[enable use of temp
files, set max mem usage to N MB]),
[AC_DEFINE_UNQUOTED(DEFAULT_MAX_MEM,$enableval)
- AC_CHECK_FUNCS([tmpfile],MEMORYMGR=jmemansi.o,
- [MEMORYMGR=jmemname.o
+ AC_CHECK_FUNCS([tmpfile],MEMORYMGR=jmemansi.lo,
+ [MEMORYMGR=jmemname.lo
AC_DEFINE(NEED_SIGNAL_CATCHER,1)
AC_CHECK_FUNCS([mktemp],,AC_DEFINE(NO_MKTEMP,1))]
)]
diff -rN -u old-libjpeg6b-6b/debian/rules new-libjpeg6b-6b/debian/rules
--- old-libjpeg6b-6b/debian/rules 2006-11-13 17:41:22.000000000 +0100
+++ new-libjpeg6b-6b/debian/rules 2006-11-13 17:41:22.000000000 +0100
@@ -30,7 +30,6 @@
dh_testdir
printf '#!/bin/sh\nexec libtool "$$@"\n' >libtool
$(MAKE)
- $(MAKE) test
$(MAKE) -C debian/extra
touch build-stamp
@@ -63,7 +62,7 @@
# * These declarations are considered internal to the JPEG library; most
# * applications using the library shouldn't need to include this file.
# So it is not forbidden to use it, therefore it must be installed.
- install -m644 jpegint.h debian/tmp/usr/include
+ #install -m644 jpegint.h debian/tmp/usr/include
# fix jconfig.h
rm debian/tmp/usr/include/jconfig.h
sed -e "s/#\(undef\|define\) HAVE_STD\(DEF\|LIB\)_H//g" \
