--- gutenprint-5.0.0~rc2.orig/scripts/config.guess +++ gutenprint-5.0.0~rc2/scripts/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2005-08-03' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -138,16 +138,6 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_MACHINE}" in - i?86) - test -z "$VENDOR" && VENDOR=pc - ;; - *) - test -z "$VENDOR" && VENDOR=unknown - ;; -esac -test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -804,7 +794,7 @@ i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; - amd64:CYGWIN*:*:*) + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; p*:CYGWIN*:*) @@ -825,25 +815,25 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux + echo cris-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux + echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-${VENDOR}-linux + echo frv-unknown-linux-gnu exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:*) eval $set_cc_for_build @@ -862,7 +852,7 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -881,13 +871,16 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) - echo powerpc-${VENDOR}-linux + echo powerpc-unknown-linux-gnu exit ;; ppc64:Linux:*:*) - echo powerpc64-${VENDOR}-linux + echo powerpc64-unknown-linux-gnu exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -901,33 +894,33 @@ esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-${VENDOR}-linux ;; - PA8*) echo hppa2.0-${VENDOR}-linux ;; - *) echo hppa-${VENDOR}-linux ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-${VENDOR}-linux + echo hppa64-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-${VENDOR}-linux + echo x86_64-unknown-linux-gnu exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so @@ -942,18 +935,18 @@ p'` case "$ld_supported_targets" in elf32-i386) - TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux" + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; a.out-i386-linux) - echo "${UNAME_MACHINE}-${VENDOR}-linuxaout" + echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; coff-i386) - echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff" + echo "${UNAME_MACHINE}-pc-linux-gnucoff" exit ;; "") - # Either a pre-BFD a.out linker (linuxoldld) or + # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. - echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld" + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" exit ;; esac # Determine whether the default compiler is a.out or elf @@ -983,7 +976,7 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit } test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } --- gutenprint-5.0.0~rc2.orig/scripts/config.sub +++ gutenprint-5.0.0~rc2/scripts/config.sub @@ -1181,7 +1181,7 @@ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ @@ -1215,6 +1215,9 @@ -linux-dietlibc) os=-linux-dietlibc ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; -sunos5*) os=`echo $os | sed -e 's|sunos5|solaris2|'` ;; --- gutenprint-5.0.0~rc2.orig/debian/cupsys-driver-gutenprint.postinst +++ gutenprint-5.0.0~rc2/debian/cupsys-driver-gutenprint.postinst @@ -0,0 +1,56 @@ +#! /bin/sh +# postinst script for cupsys-driver-gutenprint +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/doc/packaging-manual/ +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +#s/^if\s+\[\s+"\$1"\s+=\s+"configure"\s+\];\s+then\s+ldconfig\b//m; + +if [ "$1" = "configure" ]; then + # Upgrade in-use PPD files + /usr/sbin/cups-genppdconfig.5.0 -u >/dev/null + /usr/sbin/cups-genppdupdate.5.0 >/dev/null + + if [ ! -h /usr/share/cups/model ] && [ ! -e /usr/share/cups/model/gutenprint ]; then + rm -f /usr/share/cups/model/gutenprint/5.0/en/*.ppd.gz + rmdir --ignore-fail-on-non-empty /usr/share/cups/model/gutenprint/5.0/en + rmdir --ignore-fail-on-non-empty /usr/share/cups/model/gutenprint/5.0 + rmdir --ignore-fail-on-non-empty /usr/share/cups/model/gutenprint + ln -s ../../ppd/gutenprint /usr/share/cups/model/gutenprint + fi + + # Restart CUPSys (to register new and updated PPDs) + [ -x /etc/init.d/cupsys ] && invoke-rc.d cupsys force-reload || true +elif [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ] || [ "$1" = "abort-deconfigure" ]; then + : +else + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- gutenprint-5.0.0~rc2.orig/debian/control +++ gutenprint-5.0.0~rc2/debian/control @@ -0,0 +1,306 @@ +Source: gutenprint +Section: graphics +Priority: optional +Maintainer: Debian Printing Group +Uploaders: Roger Leigh +Standards-Version: 3.6.2 +Build-Depends: libcupsys2-dev (>= 1.1.99.b1.r4929-0ubuntu7), libcupsimage2-dev, libgtk2.0-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 4.0.2), zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch + +Package: gimp-print +Architecture: any +Depends: ${shlibs:Depends}, gimp (>= 2.0.4-1) +Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version}) +Enhances: gimp +Description: print plugin for the GIMP + This package includes the Print plugin for the GIMP. + . + This is Gutenprint version 5.0.0-rc2, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: cupsys-driver-gimpprint +Architecture: any +Section: graphics +Depends: cupsys-driver-gutenprint (>= ${Source-Version}) +Description: printer drivers for CUPS + This is a transitional package to migrate existing users of + cupsys-driver-gimpprint to cupsys-driver-gutenprint (its + successor). It may be safely removed after upgrading. + +Package: cupsys-driver-gutenprint +Architecture: any +Section: graphics +Depends: ${shlibs:Depends}, perl (>= 5.8.0), cupsys (>= 1.1.23) | cups (>= 1.1.23) +Recommends: gnome-gv | postscript-viewer +Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version}) +Replaces: cupsys-driver-gimpprint, cupsys-driver-gimpprint-data +Description: printer drivers for CUPS + This package includes a CUPS driver based on Gutenprint. + . + The CUPS drivers contain all of the files needed to support + photo-quality printing on any printer supported by Gutenprint. You + can find out more about the Common UNIX Printing System ("CUPS"), an + IPP-based printing system for UNIX/Linux, at: + . + http://www.cups.org + . + This is Gutenprint version 5.0.0-rc2, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: libgutenprint-dev +Architecture: any +Section: libdevel +Depends: libgutenprint2 (= ${Source-Version}), pkg-config (>= 0.14.0) +Suggests: libgutenprint-doc (= ${Source-Version}) +Description: development files for the Gutenprint printer driver library + This package contains the header files for the Gutenprint library, + along with a static version of libgutenprint. + . + Install this package if you wish to develop programs that use + libgutenprint. + . + This is Gutenprint version 5.0.0-rc2, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: libgutenprint-doc +Architecture: all +Section: doc +Suggests: libgutenprint-dev (= ${Source-Version}) +Description: documentation for the Gutenprint printer driver library + This package contains lots of info-files, DVI docs and other + documentation about the Gutenprint library for photo-quality + printing. + . + Install this package if you want to have lots of info about the + Gutenprint library when you're programming. + . + This is Gutenprint version 5.0.0-rc2, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: libgutenprint2 +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Suggests: gutenprint-locales (>= ${Source-Version}) +Description: runtime for the Gutenprint printer driver library + This package includes the Gutenprint shared library, needed to + run programs using Gutenprint drivers. + . + This is Gutenprint version 5.0.0-rc2, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: libgutenprintui2-dev +Architecture: any +Section: devel +Depends: libgutenprintui2-1 (= ${Source-Version}), pkg-config (>= 0.14.0) +Suggests: libgutenprint-doc (= ${Source-Version}) +Description: development files for the Gutenprint printer driver user interface library + This package contains the header files for the libgutenprintui + library, along with a static version of libgutenprintui. + libgutenprintui contains GTK+ widgets which may be used for print + dialogs etc. for use with libgutenprint. + . + Install this package if you wish to develop packages that use + libgutenprintui. + . + This is Gutenprint version 5.0.0-rc2, a beta + development release in the 5.0 line. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: libgutenprintui2-1 +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Recommends: gutenprint-locales (>= ${Source-Version}) +Description: runtime for the Gutenprint printer driver user interface library + This package includes the libgutenprintui library, necessary to run + gimp-print. libgutenprintui contains GTK+ widgets which may be + used for print dialogs etc. for use with libgutenprint. + . + This is Gutenprint version 5.0.0-rc2, a beta + development release in the 5.0 line. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: gutenprint-locales +Architecture: all +Section: libs +Description: locale data files for Gutenprint + This package contains the i18n files of Gutenprint, used by + libgutenprint2, cupsys-driver-gutenprint and + escputil. It is also used by the GIMP Print plugin. + . + They are needed when you want the programs in Gutenprint to print + their messages in other languages than US English. + . + This is Gutenprint version 5.0.0-rc2, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: escputil +Architecture: any +Section: utils +Depends: ${shlibs:Depends} +Suggests: gutenprint-locales (>= ${Source-Version}) +Description: maintenance utility for Epson Stylus printers + escputil is a utility to clean and align the heads of Epson Stylus + printers. It can also check the current ink levels in the printer. + . + This is Gutenprint version 5.0.0-rc2, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: ijsgimpprint +Architecture: any +Section: text +Depends: ijsgutenprint (>= ${Source-Version}) +Description: printer drivers for CUPS + This is a transitional package to migrate existing users of + ijsgimpprint to ijsgutenprint (its successor). It may be + safely removed after upgrading. + +Package: ijsgutenprint +Architecture: any +Section: text +Depends: ${shlibs:Depends}, gs-esp (>= 6.53) | gs-gpl (>= 8.01-1) | gs (>= 6.53) | gs-afpl (>= 8.14) +Description: inkjet server - Ghostscript driver for Gutenprint + This package contains the ijsgutenprint binary which provides + Ghostscript with a Gutenprint driver, including all printers + supported by Gutenprint. ijsgutenprint is an IJS server (driver), + which communicates with Ghostscript (an IJS client) using the IJS + (InkJet Server) communications protocol. IJS is a method for + separating ghostscript drivers from ghostscript, to allow + ghostscript to be more extensible. + . + If you wish to print using Ghostscript and the Gutenprint drivers, + install this package. This is typical for LPRng setups. If you + are using CUPS, cupsys-driver-gutenprint is a better choice, but + this package will still work with the appropriate foomatic setup + if you wish to make use of foomatic. + . + This is Gutenprint version 5.0.0-rc2, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: foomatic-db-gimp-print +Architecture: all +Section: text +Depends: foomatic-db-gutenprint (>= ${Source-Version}) +Description: linuxprinting.org printer support - database for Gimp-Print printer drivers + This is a transitional package to migrate existing users of + foomatic-db-gimp-print to foomatic-db-gutenprint (its successor). It + may be safely removed after upgrading. + +Package: foomatic-db-gutenprint +Architecture: all +Section: text +Depends: foomatic-db, ijsgutenprint (>= ${Source-Version}) +Conflicts: foomatic-bin (<< 2.9), foomatic-db (<< 2.9) +Description: linuxprinting.org printer support - database for Gutenprint printer drivers + Foomatic is a printing system designed to make it easier to set up + common printers for use with Debian (and other operating systems). + It provides the "glue" between a print spooler (like CUPS or lpr) and + your actual printer, by telling your computer how to process files + sent to the printer. + . + This package includes support for printers using the Gutenprint + printer driver suite. + . + Home Page: http://www.linuxprinting.org/ + . + This is Gutenprint version 5.0.0-rc2, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: gutenprint-doc +Architecture: all +Section: doc +Suggests: cupsys-driver-gutenprint (>= ${Source-Version}), foomatic-db-gutenprint (>= ${Source-Version}), gimp-print (>= ${Source-Version}), ijsgutenprint (>= ${Source-Version}) +Description: users' guide for Gutenprint and CUPS + This package contains a user guide for programs using the + Gutenprint library for photographic quality printing. Currently + this covers using the Print plugin for the GIMP and the Common Unix + Printing System (CUPS). + . + The documentation is available in both HTML and PDF formats for + on-line viewing and hardcopy. + . + This is Gutenprint version 5.0.0-rc2, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + --- gutenprint-5.0.0~rc2.orig/debian/foomatic-db-gutenprint.install +++ gutenprint-5.0.0~rc2/debian/foomatic-db-gutenprint.install @@ -0,0 +1,2 @@ +debian/install/usr/share/foomatic/db/source/driver/gutenprint*.xml usr/share/foomatic/db/source/driver +debian/install/usr/share/foomatic/db/source/opt/gutenprint-ijs* usr/share/foomatic/db/source/opt --- gutenprint-5.0.0~rc2.orig/debian/libgutenprintui2-1.install +++ gutenprint-5.0.0~rc2/debian/libgutenprintui2-1.install @@ -0,0 +1 @@ +debian/install/usr/lib/libgutenprintui2.so.* usr/lib --- gutenprint-5.0.0~rc2.orig/debian/rules +++ gutenprint-5.0.0~rc2/debian/rules @@ -0,0 +1,151 @@ +#!/usr/bin/make -f +# rules to package gutenprint +# $Id: rules,v 1.58 2005/06/26 17:06:59 rleigh Exp $ +# +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +# Use dpatch. +include /usr/share/dpatch/dpatch.make + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +# Get upstream version, and define libgutenprint suffix +#UPSTREAM_VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/.* //" | sed "s/-[^-]*$$//") +UPSTREAM_VERSION = 5.0.0-rc2 +UPSTREAM_VERSION_COMPACT = $(shell echo '$(UPSTREAM_VERSION)' | sed "s/\(.*\..*\)\..*/\1/" +#LIBRARY_VERSION = -$(UPSTREAM_VERSION) +LIBRARY_VERSION = 2 +LIBRARYUI_VERSION = 1 + +GENERATED_FILES = \ + debian/libgutenprint2.install + +autoconfigure: autoconfigure-stamp +autoconfigure-stamp: debian/control $(GENERATED_FILES) + dh_testdir + mkdir debian/build; \ + cd debian/build; \ + ../../configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --mandir=\$${prefix}/share/man \ + --disable-static --enable-shared --disable-rpath \ + --with-modules=dlopen \ + --enable-libgutenprintui2 \ + --without-gimp --with-gimp2 --with-cups --with-ijs \ + --with-foomatic --with-foomatic3 \ + --disable-test \ + --enable-cups-level3-ppds --disable-translated-cups-ppds \ + --disable-cups-level3-ps --disable-static-genppd + touch autoconfigure-stamp + + +build: build-stamp debian/control +build-stamp: patch-stamp autoconfigure-stamp + dh_testdir + + cd debian/build; \ + $(MAKE) + + touch build-stamp + +clean: realclean unpatch +realclean: debian/control + dh_testdir + rm -f build-stamp autoconfigure-stamp + + -$(MAKE) distclean + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub scripts/config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess scripts/config.guess + + rm -rf debian/build debian/install + -$(MAKE) distclean + + rm -f $(GENERATED_FILES) + + dh_clean + +install: DH_OPTIONS= +install: build debian/control + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd debian/build; \ + $(MAKE) DESTDIR=`pwd`/../install install + + dh_install + + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs -i + dh_installexamples -i + dh_installchangelogs -i NEWS + dh_link -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installdocs -a + cp src/cups/README debian/cupsys-driver-gutenprint/usr/share/doc/cupsys-driver-gutenprint/README.cups + mv debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppd.8 debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppd.5.0.8 + mv debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdconfig.8 debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdconfig.5.0.8 + mv debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdupdate.8 debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdupdate.5.0.8 + mv debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.1 debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.5.0.1 + ln -s ijsgutenprint.5.0.1.gz debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.1.gz + ln -s ijsgutenprint.5.0 debian/ijsgutenprint/usr/bin/ijsgutenprint + dh_installexamples -a + dh_installchangelogs -a NEWS + dh_strip -a + dh_link -a + dh_compress -a + dh_fixperms -a +# Strip DT_RPATH from CUPS binaries. + find debian/cupsys-driver-gutenprint/usr/lib -type f -perm +0111 -print0 | xargs -0 chrpath --delete + chrpath --delete debian/cupsys-driver-gutenprint/usr/sbin/cups-genppd.5.0 + dh_link -pcupsys-driver-gutenprint /usr/share/ppd/gutenprint /usr/share/cups/model/gutenprint + dh_makeshlibs -a -V -X usr/lib/gutenprint + dh_installdeb -a + dh_shlibdeps -a -X usr/lib/gutenprint -l$(CURDIR)/debian/libgutenprint$(LIBRARY_VERSION)/usr/lib:$(CURDIR)/debian/libgutenprintui1-$(LIBRARYUI_VERSION)/usr/lib:$(CURDIR)/debian/libgutenprintui2-$(LIBRARYUI_VERSION)/usr/lib + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch + +SEDPATTERN = -e "s/\#UPSTREAM_VERSION\#/$(UPSTREAM_VERSION)/g" -e "s/\#LIBRARY_VERSION\#/$(LIBRARY_VERSION)/g" -e "s/\#LIBRARYUI_VERSION\#/$(LIBRARYUI_VERSION)/g" + +debian/control: debian/control.in debian/changelog debian/rules + sed $(SEDPATTERN) $< debian/control.gfdl >$@ + +debian/libgutenprint2.install: debian/libgutenprint2.install.in debian/changelog + sed $(SEDPATTERN) <$< >$@ + +.PHONY: build clean binary-indep binary-arch binary install autoconfigure patch unpatch --- gutenprint-5.0.0~rc2.orig/debian/escputil.docs +++ gutenprint-5.0.0~rc2/debian/escputil.docs @@ -0,0 +1 @@ +README --- gutenprint-5.0.0~rc2.orig/debian/libgutenprint-dev.install +++ gutenprint-5.0.0~rc2/debian/libgutenprint-dev.install @@ -0,0 +1,3 @@ +debian/install/usr/lib/libgutenprint.so usr/lib +debian/install/usr/lib/pkgconfig/gutenprint.pc usr/lib/pkgconfig +debian/install/usr/include/gutenprint usr/include --- gutenprint-5.0.0~rc2.orig/debian/changelog +++ gutenprint-5.0.0~rc2/debian/changelog @@ -0,0 +1,736 @@ +gutenprint (5.0.0~rc2-0ubuntu5) dapper; urgency=low + + * debian/cupsys-driver-gutenprint.postrm: Robustify directory cleanup on + purge to not fail for nonexisting directories. Closes: LP#41900 + + -- Martin Pitt Tue, 2 May 2006 16:50:44 +0200 + +gutenprint (5.0.0~rc2-0ubuntu4) dapper; urgency=low + + * debian/cupsys-driver-gutenprint.postinst: Do not fail if + /usr/share/cups/model/gutenprint already exists, but is not a symlink. + Closes: LP#39743 + + -- Martin Pitt Tue, 2 May 2006 14:28:59 +0200 + +gutenprint (5.0.0~rc2-0ubuntu3) dapper; urgency=low + + * debian/cupsys-driver-gutenprint.postinst: Quiesce package configuration, + do not spit out a neverending list of PPD files. + * debian/rules, debian/control.in: Drop libgtk1.2-dev build dependency, drop + libgutenprintui1 library (it's not used for anything in Ubuntu and + obsoleted by the GTK 2.0 library). + + -- Martin Pitt Thu, 13 Apr 2006 15:19:53 +0200 + +gutenprint (5.0.0~rc2-0ubuntu2) dapper; urgency=low + + * Place ppd files in /usr/share/ppd. + * cupsys-driver-gutenprint: Add compatibility link in /usr/share/cups/model. + * Require libcupsys2-dev (>= 1.1.99.b1.r4929-0ubuntu7) as build dependency. + + -- Matthias Klose Tue, 11 Apr 2006 19:39:04 +0200 + +gutenprint (5.0.0~rc2-0ubuntu1) dapper; urgency=low + + * Synchronize with Debian unstable. + * Re-include the user's guide (GFDL licensed). + + -- Matthias Klose Thu, 6 Apr 2006 18:16:23 +0000 + +gutenprint (4.3.99+cvs20060121.dfsg.1-1) unstable; urgency=low + + * New upstream release candidate (5.0.0-rc2). + * The many options provided by Gutenprint are now documented, and this + documentation (gutenprint-options) is now provided for the + cupsys-driver-gutenprint, ijsgimpprint and gimp-print packages in their + documentation directories (Closes: #323172). + * Revert accidental conversion to a debian-native source package in the last + release. + * debian/cupsys-driver-gimpprint.postinst, + debian/cupsys-driver-gimpprint.postrm: Use invoke-rc.d when reloading + cupsys, and don't fail if cupsys fails to reload. Patches pulled from + the Ubuntu patch repository for gimp-print. + + -- Roger Leigh Sun, 22 Jan 2006 14:21:19 +0000 + +gutenprint (4.3.99+cvs20051122.dfsg.1-2) unstable; urgency=low + + * debian/control.in: Remove xlibs-dev from Build-Depends, in + anticipation of its removal from unstable. + + -- Roger Leigh Fri, 16 Dec 2005 10:53:04 +0000 + +gutenprint (4.3.99+cvs20051122.dfsg.1-1) unstable; urgency=low + + * New upstream CVS snapshot (Closes: #340155). + * The GFDL licensed user's guide has been removed from the + upstream tarball to create a DFSG-free .orig.tar.gz. + * Several Epson Stylus Photo printers have been retuned since the + last version (Closes: #335789). + * The Epson Stylus C88 is now supported (Closes: #338961). + * debian/control.in: + - Improve the ijsgutenprint package description (Closes: #337845). + - Remove 'Suggests: gutenprint-doc (>= ${Source-Version})' from + gimp-print and cupsys-driver-gutenprint. + - Remove the gutenprint-doc package, which was GFDL licensed. + The control data is kept in debian/control.gfdl. + * debian/rules: Update UPSTREAM_VERSION to 5.0.0-rc2. + * debian/copyright: Remove the GFDL manual paragraph, and document + its removal due to DFSG incompatibility. + + -- Roger Leigh Tue, 22 Nov 2005 15:44:02 +0000 + +gutenprint (4.3.99+cvs20050901-1) unstable; urgency=low + + * New upstream release candidate. + * Drop patches which have been incorporated upstream: + - 01_cups_genppdupdate_filename_metacharacters.dpatch + - 02_escp2_r800_papers.dpatch + - 03_escp2_colour_adjust_segfault.dpatch + - 04_print_settings_corruption.dpatch + * debian/control: + - cupsys-driver-gutenprint: Drop libperlmenu-perl dependency. + - gimp-print: Add an "Enhances: gimp" to reinforce the fact this is a + useful part of gimp (Closes: #322066). This does not entirely fix the + upgrade issues, but without a strict dependency in gimp (which the + author does not want), this is the best that can be done. + * src/cups/cups-genppdconfig.in: Remove support for perlmenu in favour + of dialog(1). This prevents a number of warnings on startup, and also + removes a lot of dead code (Closes: #323450). Applied as + 05_genppdconfig_remove_perlmenu.dpatch. + + -- Roger Leigh Sat, 3 Sep 2005 20:46:06 +0100 + +gutenprint (4.3.99+cvs20050813-2) unstable; urgency=low + + * src/main/print-canon.c: Change "Plain PIXMA" paper name to + "PlainPIXMA" in order to avoid illegal whitespace in + generated PPD files (Closes: #322397). + + -- Roger Leigh Wed, 31 Aug 2005 21:16:10 +0100 + +gutenprint (4.3.99+cvs20050813-1) unstable; urgency=low + + * New upstream release candidate. + * src/cups/cups-genppdconfig.in: drop Locale::gettext patch, + which is now incorporated upstream. + * debian/control.in, debian/rules: Use dpatch. + * Added cups-genppdupdate patch as + 01_cups_genppdupdate_filename_metacharacters.dpatch + * Don't segfault when using certain paper types with an Epson R800. + Applied patch from Dan Torop as 02_escp2_r800_papers.dpatch + and 03_escp2_colour_adjust_segfault.dpatch (Closes: #321603). + * Don't corrupt print settings under certain conditions, due to + using uninitialised global variables. Applied patch from upstream + based on a patch contributed by Dan Torop as + 04_print_settings_corruption.dpatch (Closes: #321599). + * debian/debian/cupsys-driver-gutenprint.postinst: Remove bashisms. + + -- Roger Leigh Sun, 14 Aug 2005 22:20:52 +0100 + +gutenprint (4.3.99+cvs20050801-1) unstable; urgency=low + + * New upstream release candidate. + * src/cups/cups-genppdconfig.in: Remove "use Locale::gettext" to + drop missing dependency on liblocale-gettext-perl + (Closes: #320745). + + -- Roger Leigh Tue, 2 Aug 2005 21:06:08 +0100 + +gutenprint (4.3.99+cvs20050715-4) unstable; urgency=low + + * debian/rules: Correct the names of the ijsgutenprint + symlinks. + + -- Roger Leigh Thu, 28 Jul 2005 23:19:35 +0100 + +gutenprint (4.3.99+cvs20050715-3) unstable; urgency=low + + * src/cups/cups-genppdupdate.in: Apply patch to handle shell + metacharacters in PPD filenames, to fix a regression from + cupsys-driver-gimpprint (Closes: #319109). + * debian/control.in: Add foomatic-db-gimp-print as a + transitional package to ease upgrades. + * debian/rules: ijsgutenprint symlinks should not be relative + to the build directory (Closes: #319416). + + -- Roger Leigh Thu, 28 Jul 2005 21:14:31 +0100 + +gutenprint (4.3.99+cvs20050715-2) unstable; urgency=low + + * debian/control.in: + - ijsgimpprint depends on ijsgutenprint, not + cupsys-driver-gutenprint (Closes: #318911). + - ijsgimpprint is in section text, not graphics + (correction of override disparity). + + -- Roger Leigh Mon, 18 Jul 2005 18:39:47 +0100 + +gutenprint (4.3.99+cvs20050715-1) unstable; urgency=low + + * New upstream release candidate. + * debian/control.in: Change Maintainer to Debian Printing Group + . + * debian/rules: Don't build translated PPDs. They may be generated + after installation by the user. + + -- Roger Leigh Sat, 16 Jul 2005 22:45:28 +0100 + +gutenprint (4.3.99+cvs20050702-1) experimental; urgency=low + + * New upstream release candidate (Closes: #293890). + * Renamed package to gutenprint. The following packages were + renamed in consequence: + - cupsys-driver-gimpprint renamed to cupsys-driver-gutenprint + - foomatic-db-gimp-print renamed to foomatic-db-gutenprint + - gimpprint-doc renamed to gutenprint-doc + - gimpprint-locales renamed to gutenprint-locales + - ijsgimpprint renamed to ijsgutenprint + - libgimpprint renamed to libgutenprint + - libgimpprint-dev renamed to libgutenprint-dev + - libgimpprint-doc renamed to libgutenprint-doc + * New packages: + - libgimpprintui1-1 (GTK+ 1.2 UI library) + - libgimpprintui1-dev (GTK+ 1.2 UI library headers) + - libgimpprintui2-1 (GTK+ 2.0 UI library) + - libgimpprintui2-dev (GTK+ 2.0 UI library headers) + * Upgrade to Standards-Version 3.6.2 + * Build-Depends: + - replace libreadline4-dev with libreadline5-dev + - add libcupsimage2-dev + - remove libtool + * debian/rules: add LIBRARYUI_VERSION, required to support + separate sonames for libgutenprint and libgutenprintui*. + * cupsys-driver-gutenprint: + - add cups-genppdupdate + - generates the PPDs in postinst, and removes them in prerm + - use new versioned CUPS executables + * libgutenprint: add modules and XML data. + * libgutenprint-doc: + - fix documentation installation for new API reference and + developer's reference. + - distribute gutenprint.pdf; gutenprint.ps is no longer created. + * Remove old and outdated manual pages. + * Provide versioned ijsgutenprint manual page, and unversioned + symlinks for the binary and manpage. + * Create a dummy cupsys-driver-gimpprint package to enable + upgrades from stable. + * Create a dummy ijsgimpprint package to enable upgrades from stable. + * Remove symlinks in debian directory. + * Don't autogenerate files in debian directory for anything but the + libgutenprintui package. + + -- Roger Leigh Sat, 2 Jul 2005 10:12:46 +0100 + +gimp-print (4.2.7-10) unstable; urgency=high + + * cupsys-driver-gimpprint: Depend on a perl >= 5.8.0, otherwise + upgrades from woody may fail due to /usr/bin/cups-genppdupdate + using features only available in perl 5.8 (Closes: #307286). + * Build-Depend on libreadline5-dev, rather than the old + libreadline4-dev. + + -- Roger Leigh Mon, 2 May 2005 14:58:39 +0100 + +gimp-print (4.2.7-9) unstable; urgency=low + + * debian/cups-genppdupdate: Fix grepping of PPDs to work with PPD + file names with shell metacharacters in them. Patch from Martin + Pitt (Closes: #302434). + + -- Roger Leigh Thu, 31 Mar 2005 22:10:41 +0100 + +gimp-print (4.2.7-8) unstable; urgency=low + + * cupsys-driver-gimpprint: Depend on cupsys >= 1.1.23 to ensure + that /etc/init.d/cupsys supports the force-reload option. + Some older versions of cupsys did not, and this causes + package configuration to fail when restarting cupsys. + (Closes: #300966) + + -- Roger Leigh Wed, 23 Mar 2005 18:06:35 +0000 + +gimp-print (4.2.7-7) unstable; urgency=low + + * debian/control.in: + - Prefer gs-esp as gs interpreter. Patch from Colin Watson. + - Recommend gnome-gv as default postscript-viewer. Patch + from Sebastien Bacher. + + -- Roger Leigh Tue, 22 Mar 2005 00:20:09 +0000 + +gimp-print (4.2.7-6) unstable; urgency=low + + * Allow A4 printing on HP DesignJet printers. Patch from + Klaus Singvogel. + + -- Roger Leigh Sat, 19 Mar 2005 09:58:18 +0000 + +gimp-print (4.2.7-5) unstable; urgency=low + + * Patch src/cups/Makefile.in so that genppd will use the "C" + locale when generating PPDs, not the locale of the build + system. This will prevent wrongly UTF-8 encoded "ISOLatin1" + PPDs being generated (Closes: #293178). + * ijsgimpprint: Conditionally depend upon gs-afpl instead of + gs-aladdin, which it replaces (Closes: #293384). + + -- Roger Leigh Wed, 2 Feb 2005 21:45:16 +0000 + +gimp-print (4.2.7-4) unstable; urgency=low + + * cupsys-driver-gimpprint: Use "force-reload" rather than + "reload" in postinst and postrm (Closes: #274820). Reported + by Martin Pitt. + * Applied GNU/k*BSD patch from Robert Millan (Closes: #263763). + + -- Roger Leigh Tue, 5 Oct 2004 19:46:08 +0100 + +gimp-print (4.2.7-3) unstable; urgency=low + + * foomatic-db-gimp-print: ensure all files are UTF-8 encoded + by building the package in a UTF-8 locale (en_GB.UTF-8). + Thanks to Chris Lawrence for finding this problem. + + -- Roger Leigh Tue, 21 Sep 2004 21:37:38 +0100 + +gimp-print (4.2.7-2) unstable; urgency=medium + + * Medium urgency to facilitate the libtiff transition. + * cupsys-driver-gimpprint: + - Link explicitly with -lcupsimage, rather than + `cups-config --image --libs`. This prevents unnecessary + libpng, libjpeg and libtiff dependencies. The cups-config + logic in configure is overridden. Thanks to Steve Langasek + for this patch (Closes: #262852). + - Backport some PPD generation logic from current Gimp-Print + CVS, and use the new PPD keywords in cups-genppdupdate. + The PPD PCFileName keyword was made compliant with the PPD + standard with version 4.2.6 (read: crippled to an 8.3 DOS + filename) which broke the upgrade script since the full PPD + name could no longer be encoded. The new Gimp-Print specific + keywords *StpDriverName, *StpPPDLocation and *StpLocale have + been added to the PPDs, and this information is now used to + correctly upgrade PPDs (Closes: #260072). + * debian/rules: Don't enable maintainer-mode when running + configure. + + -- Roger Leigh Tue, 3 Aug 2004 19:23:19 +0100 + +gimp-print (4.2.7-1) unstable; urgency=low + + * New upstream stable release. + * Dropped patches for: + - missing strdup prototype in AM_PATH_GIMPPRINT (#233971). + - fixing garbage output when files generated with psnup are + printed (#175970). + - correct margin definitions for Epson Stylus C63, C64, C83 + and C84. + All of these patches have been incorporated into the new + release. + * Update to Standards-Version 3.6.1. + * cupsys-driver-gimpprint: update Recommends to depend upon the + current gs package names, and put the virtual package + postscript-viewer as the last alternative, rather than the + first. + * cupsys-driver-gimpprint: patched src/cups/Makefile.am to + disable linking rastertoprinter with a static libgimpprint. + + -- Roger Leigh Sat, 17 Jul 2004 17:38:35 +0100 + +gimp-print (4.2.6-7) unstable; urgency=high + + * Reupload with high urgency to shorten libcupsys2-gnutls10 + transition waiting time. + + -- Roger Leigh Fri, 9 Jul 2004 11:56:34 +0100 + +gimp-print (4.2.6-6) unstable; urgency=low + + * cupsys-driver-gimpprint-data depends on cupsys-driver-gimpprint. + + -- Roger Leigh Wed, 7 Jul 2004 13:26:51 +0100 + +gimp-print (4.2.6-5) unstable; urgency=medium + + * NMU. + * Rebuild against libcupsys2-gnutls10. + + -- Kenshi Muto Thu, 27 May 2004 16:39:55 +0000 + +gimp-print (4.2.6-4) unstable; urgency=low + + * Split architecture-independent data in cupsys-driver-gimpprint + into a separate arch-all cupsys-driver-gimpprint-data package + which cupsys-driver-gimpprint depends upon (Closes: #233338). + * Add missing strdup prototype in AM_PATH_GIMPPRINT in + gimpprint.m4. This prevents configure scripts using this macro + from segfaulting on ia64 (Closes: #233971). + * Correct margin definitions for Epson Stylus C63, C64, C83 and + C84. This is a temporary fix until the margins have been + correctly computed. + * Build-Depend upon libijs-dev (>= 0.35-1) to ensure that + ijsgimpprint is built against the current libijs + (Closes: #237561). + + -- Roger Leigh Fri, 12 Mar 2004 20:32:51 +0000 + +gimp-print (4.2.6-3) unstable; urgency=low + + * Rebuild against new Foomatic packages. This should hopefully + fix autobuilding problems with older Foomatic releases (which + wouldn't autoconfigure on the buildd). + + -- Roger Leigh Mon, 1 Mar 2004 13:07:07 +0000 + +gimp-print (4.2.6-2) unstable; urgency=low + + * Fix garbage output when files generated with psnup are printed. + The output quality will be degraded, and warnings will be + logged, since the job options have been broken. This is + because psnup generates non-ADSC compliant PostScript which + makes pstops output incorrect job options. Patch from + Martin Kögler (Closes: #175970). + + -- Roger Leigh Tue, 10 Feb 2004 19:39:17 +0000 + +gimp-print (4.2.6-1) unstable; urgency=low + + * New upstream stable release. + * cupsys-driver-gimpprint: cups-genppdupdate should escape + metacharacters in queue names. quotemeta fix from David + Beaumont (Closes: #223081). + * A locale issue which resulted in buggy PostScript output + with some locales has been fixed (Closes: #221662). + * CUPS PPD files moved from /usr/share/cups/model/gimp-print + to /usr/share/cups/model/gimp-print/4.2. This is the + 5.0 naming scheme, and will allow 4.2 and 5.0 to + coexist. cups-genppdupdate uses the new scheme. + + -- Roger Leigh Tue, 13 Jan 2004 23:42:02 +0000 + +gimp-print (4.2.5-6) unstable; urgency=low + + * Change Recommends on gimpprint-locales to Suggests (Closes: #212302). + * cupsys-driver-gimpprint postrm should not reload cupsys if it + has already been removed (Closes: #217295). + + -- Roger Leigh Sun, 26 Oct 2003 23:10:31 +0000 + +gimp-print (4.2.5-5) unstable; urgency=low + + * Clean up package descriptions in debian/control.in. + * Don't depend on essential package gzip. + + -- Roger Leigh Sun, 7 Sep 2003 23:04:56 +0100 + +gimp-print (4.2.5-4) unstable; urgency=low + + * Fix the use of an unintialised value in cups-genppdupdate + (Closes: #193501). + * cups-genppdupdate no longer prints an error when there are no PPD files + available (use Perl glob() instead of shell globbing). + * Update cups-genppdupdate using the latest upstream CVS version. + * Replace cupsys-driver-gimpprint dependency on libcompress-zlib-perl, with + a gzip dependency (gunzip replaces Compress::Zlib in cups-genppdupdate). + * Update for Foomatic 3.0: + - Update foomatic-db-gimp-print description (sync with foomatic-db). + - Build-Depend on foomatic-db-engine (foomatic-bin is deprecated). + - Update foomatic-db-gimp-print dependencies (correctly depend on the + new foomatic packages and conflict with the old packages). + - Run configure with --with-foomatic3 + * Include escputil fix from 4.2.6 prerelease to fix intermittent hanging + reads from printer (Closes: #156228). + * Audit all manual pages to ensure correct use of hyphens and minus signs, + required for copy and paste in a unicode locale (Closes: #203930). + * gimp1.2-print has been removed now the gimp package provides an up-to-date + version of the Print plugin. + * Updated debian/copyright to include the GFDL-licensed User's Guide. + + -- Roger Leigh Mon, 25 Aug 2003 19:12:24 +0100 + +gimp-print (4.2.5-3) unstable; urgency=low + + * Build-Depend on libcupsimage2-dev (Closes: #189093). + * Remove automake, autoconf, libtool, and bison from + Build-Depends, since they are not strictly required. + * Remove docbook-utils, texi2html and imagemagick from Build-Depends, + since the documentation is pre-generated in the upstream tarball. + * Change my maintainer email address to . + * Move libgimpprint1-dev to section libdevel. + + -- Roger Leigh Wed, 23 Apr 2003 12:57:58 +0100 + +gimp-print (4.2.5-2) unstable; urgency=low + + * cupsys-driver-gimpprint: cups-genppdupdate will not die if grep exits with + a nonzero status (for example, there are no Gimp-Print PPDs in use). + (Closes: #179137) + * cupsys-driver-gimpprint: Depend on libcompress-zlib-perl, since dh_perl + doesn't compute module dependencies. + (Closes: #179120, #179170, #179171, #179203) + + -- Roger Leigh Fri, 31 Jan 2003 23:26:51 +0000 + +gimp-print (4.2.5-1) unstable; urgency=low + + * New stable release + * Update for Standards-Version 3.5.7 + * Use debian/build and debian/install instead of debian/gimp-print-build + and debian/gimp-print-install, respectively. + * Use dh_install rather than dh_movefiles. This makes debian/rules + slightly cleaner, and debian/install is unchanged after install. + * Create symlinks for HTML manuals, since different versions + of texi2html and db2html create different names. + * Make the dependencies sane (remove incorrect dependencies, and correct + dubious ones). foomatic-db-gimp-print now depends only upon foomatic-db + and ijsgimpprint. + * escputil has been changed to section "utils", and the override changed + (Closes: #145094). + * Gimp-Print PPDs are automatically upgraded using a new tool, + cups-genppdupdate, which will prevent the in-use PPDs mismatching with + the libgimpprint version in use (Closes: #172116). + * The Epson stc640 will now print in greyscale and black and white at + resolutions >= 720 DPI (Closes: #170473). + * The CUPS epson backend uses non-blocking I/O, and so will not hang with + some models when no status readback data is sent. + + -- Roger Leigh Wed, 29 Jan 2003 11:37:49 +0000 + +gimp-print (4.2.4-1) unstable; urgency=low + + * New stable release. + * foomatic-db-gimp-print: removed "stp" data, to start the transition + to using ijsgimpprint only. + * The escputil manual page documents the needed kernel configuration + options (Closes: #139000). + * The gimpprint-doc package includes the following manual pages: + gimpprint-color.7, gimpprint-dithers.7, gimpprint-imagetypes.7 + gimpprint-inktypes.7, gimpprint-mediasizes.7 + gimpprint-mediasources.7, gimpprint-mediatypes.7 + gimpprint-models.7, gimpprint-resolutions.7 + This documents all the features of gimp-print, in particular all of the + details from src/ghost/README (Closes: #113075). + * Magenta and cyan are no longer swapped on some Lexmark printers + (Closes: #166815). + + -- Roger Leigh Tue, 26 Nov 2002 20:54:30 +0000 + +gimp-print (4.2.3-2) unstable; urgency=low + + * Use libtool 1.4.3 instead of the release version, to correctly support + shared libraries on some architectures. Closes #168901 + * escputil is now in section "utils". Closes #145094 + + -- Roger Leigh Tue, 19 Nov 2002 20:55:01 +0000 + +gimp-print (4.2.3-1) unstable; urgency=low + + * New stable release. + * Fixed doc-base problems in libgimpprint-doc. The doc-base file is + generated with sed to insert the version number, Closes #149847 + * libgimpprint$(VERSION)-doc provides and conflicts with a virtual + package libgimpprint-doc to prevent clashes with gimpprint.info + docs. + * New package ijsgimpprint. This provides an IJS server for use + with ghostscript. + * Remove the autotools, texi2html, imagemagick and docbook-utils from the + Build-Depends. + * Put config.sub and config.guess into scripts/ and clean + libgimpprint-doc.doc-base + * I am the new maintainer of gimp-print for Debian. + + -- Roger Leigh Sun, 20 Oct 2002 22:10:17 +0100 + +gimp-print (4.2.2-pre2-1) unstable; urgency=low + + * New stable release, Closes: #148737 + * Upgrade to debhelper version 4 (RL) + * Automate library versioning to work for stable and unstable series. + LIBRARY_VERSION is the library major version or -UPSTREAM_VERSION (RL) + * Update configure regeneration to work with configure.ac (RL) + * libgimpprint$(VERSION)-dev provides and conflicts with a virtual + package `libgimpprint-dev' (RL) + * Remove libgimpprint.postinst as ldconfig is called by debhelper (RL) + * Update package descriptions (RL) + + -- Eric Sharkey Thu, 6 Jun 2002 15:35:28 -0400 + +gimp-print (4.2.2-pre1-1) unstable; urgency=low + + * New upstream release, Closes: #147404, #139218 + * Move escputil to section utils (RL) + * Add postscript-viewer virtual package as an alternative to gs Recommends + for cupsys-driver-gimpprint (RL) + * Reinitialise cupsys after installation or removal of + cupsys-driver-gimpprint (RL) + * Correctly version libgimpprint1 shlibs with -V dh_makeshlibs option + * Fix libgimpprint.postinst to use 'if' instead of 'case', removing a + lintian warning. (RL) + * Split out the message catalogues from the libgimpprint package into + a new gimpprint-locales package to avoid filename conflicts when + multiple libgimpprint versions are installed concurrently. (RL) + * Add libgimpprint-doc.doc-base (existed for six months, but was never + added to CVS!) (RL) + * New package foomatic-db-gimpprint. Contains foomatic data (RL) + + -- Eric Sharkey Sat, 25 May 2002 14:20:17 -0400 + +gimp-print (4.2.0-4) unstable; urgency=low + + * Apply Roger's user's guide Makefile.am patch, Closes: #128421 + * Work around bug #130756 by building docs with EPS1 figures. + + -- Eric Sharkey Sat, 16 Feb 2002 22:46:29 -0500 + +gimp-print (4.2.0-3) unstable; urgency=low + + * Fix locales package description, Closes: #123796 + * Change conflicts to replaces, Closes: #123811 + + -- Eric Sharkey Mon, 31 Dec 2001 12:02:42 -0500 + +gimp-print (4.2.0-2) unstable; urgency=low + + * Fix build dependencies, Closes: #121597 + * Fix broken gimpprint-doc.doc-base pointing to old index filename + * Fix libgimpprint.postinst to use 'if' instead of 'case', removing a + lintian warning. (Roger Leigh) + * Split out the message catalogues from the libgimpprint package into + a new gimpprint-locales package to avoid filename conflicts when + multiple libgimpprint versions are installed concurrently. (RL) + * Add libgimpprint-doc.doc-base (existed for six months, but was never + added to CVS!) (RL) + + -- Eric Sharkey Sun, 9 Dec 2001 09:47:05 -0500 + +gimp-print (4.2.0-1) unstable; urgency=low + + * New upstream release + * cupsys-driver-gimpprint only includes the basic `C' POSIX locale + ppd files due to the size of the ppd files (Roger Leigh) + * New package gimpprint-doc contains the new user guide. (RL) + * Enable i18n (RL) + * Add Build-Depends for gettext (>= 0.10.36-1), because + 'make install' fails with earlier versions due to absent + DESTDIR support. (RL) + * libgimpprint-doc uses ps instead of dvi manual, due to inclusion + of graphics (RL) + * gimp1.2-print no longer registers documentation with doc-base, as + the manual is provided in libgimpprint-doc (RL) + * Disable building of translated PPD files (RL) + + -- Eric Sharkey Sun, 25 Nov 2001 22:20:33 -0500 + +gimp-print (4.1.99-b1-1) unstable; urgency=low + + * New upstream release, Closes: #110066 + * Remove README.dither from libgimpprint-dev.docs (Roger Leigh) + * Add image samples to gimp1.2-print and cupsys-driver-gimpprint (RL) + * Change rules and control to use ABI library versioning (RL) + * Changed library version names to reflect upstream library + versioning change to ABI versioning. (RL) + + -- Eric Sharkey Mon, 23 Jul 2001 10:49:04 -0400 + +gimp-print (4.1.99-a2-1) unstable; urgency=low + + * New upstream release + + -- Eric Sharkey Mon, 23 Jul 2001 10:49:04 -0400 + +gimp-print (4.1.99-a1-1) unstable; urgency=low + + * New upstream release (first 4.2 pre-release) + + -- Eric Sharkey Tue, 10 Jul 2001 16:19:03 -0400 + +gimp-print (4.1.10-1) unstable; urgency=low + + * New upstream release (4.1.8 and 4.1.9 were buggy) + + -- Eric Sharkey Fri, 29 Jun 2001 23:08:27 -0400 + +gimp-print (4.1.7-1) unstable; urgency=low + + * New package libgimpprint-doc for Info and dvi docs. (Roger Leigh) + * Change debian/rules to use separate binary-arch and binary-indep + targets (Roger Leigh) + * New upstream release + + -- Eric Sharkey Wed, 9 May 2001 12:19:43 -0400 + +gimp-print (4.1.6-2) unstable; urgency=low + + * Fix build dependencies to include flex, Closes: #96401 + + -- Eric Sharkey Tue, 8 May 2001 20:09:30 -0400 + +gimp-print (4.1.6-1) unstable; urgency=low + + * New upstream release + + -- Eric Sharkey Mon, 30 Apr 2001 13:45:56 -0400 + +gimp-print (4.1.5-2.01) unstable; urgency=low + + * Recompile 4.1.5-2 with updated debhelper to fix dependencies + * Closes #90741 + + -- Eric Sharkey Fri, 6 Apr 2001 21:11:15 -0400 + +gimp-print (4.1.5-2) unstable; urgency=low + + * Clean up build process so that things work even if some scripts + don't have execute permissions, complicate things a bit by using + funky building script, Closes #89283, I hope... + + -- Eric Sharkey Thu, 15 Mar 2001 21:54:52 -0500 + +gimp-print (4.1.5-1) unstable; urgency=low + + * New upstream release + * First Official version uploaded to Debian + * Close ITP bug for wnpp, Closes #85563 + + -- Eric Sharkey Fri, 2 Mar 2001 19:59:11 -0500 + +gimp-print (4.1.4-2) unstable; urgency=low + + * Repackage gimp-print after forking the Debian branch from 4.1.4 + * Add version numbers to the libgimpprint package name + * Move documentation files from libgimpprint to libgimpprint-dev + + -- Eric Sharkey Tue, 27 Feb 2001 11:22:18 -0500 + +gimp-print (4.1.4-1) unstable; urgency=low + + * New upstream release + * Debian package rewritten from scratch. + * Added diversion of the print plugin that is part of the GIMP + package to /usr/lib/gimp/1.2/print + * Fixed shared library dependencies for programs linked with + libgimpprint + * Added /etc/cups/command.types as a conffile for package cupsys- + driver-gimpprint + * Added gimp1.2-print html and sgml docs to doc-base + * Remove /etc/cups in postrm for cupsys-driver-gimprint (but + won't if not empty) + * Added versioned debhelper Build-Depends + + -- Roger Leigh Fri, 16 Feb 2001 00:16:10 +0000 + +gimp-print (4.0.2-1) unstable; urgency=low + + * Debian packages of the latest GP + + -- Eric Sharkey Sun, 12 Nov 2000 04:46:54 +0900 + +gimp-print (3.1.4-1) unstable; urgency=low + + * Debianised gimp-print built from gimp-print CVS at sourceforge. + + -- Charles Briscoe-Smith Wed, 24 May 2000 00:39:54 +0100 + + --- gutenprint-5.0.0~rc2.orig/debian/README.building +++ gutenprint-5.0.0~rc2/debian/README.building @@ -0,0 +1,78 @@ +Building the gutenprint Debian packages -*- mode: text -*- +======================================= + + +Prerequisites +------------- + +The packages that must be installed to build the gutenprint packages +are listed in the Build-Depends field of the control file +debian/control[.in]. However, these are the prerequisites to build +the Debianised source. Other packages may be needed if building +directly from CVS; it is less likely other tools will be needed if +building from a distributed tarball. Other tools that might +potentially be needed are the latest versions of gettext, texi2html, +docbook-utils and imagemagick. build-essential and devscripts should +also be installed in order to build Debian packages. + +# apt-get build-dep gutenprint + +should do this automatically, if the gutenprint sources are available +in your APT sources.list. + + +Getting the source +------------------ + +Since 5.0.0 (and its prereleases), building from upstream CVS or +the release tarball is no longer supported (and in fact, not even +possible). The Debian packaging is only provided in the Debian +diff. + +To get the source, run + +$ apt-get source gutenprint + +or download it from your nearest Debian mirror. + + +Making changes +-------------- + +If needed, modify debian/changelog to change the version +numbering. The version number should be the same as the package +version number, followed by a hyphen and a Debian package revision +number e.g. 4.2.0-1 for release 4.2.0, Debian revision 1. Run + +$ debian/rules debian/control + +after changing the version number, to ensure the control file is +up-to-date. + + +If any source changes are required, please use dpatch, and place +the patch under debian/patches. Once you have created a diff, +create a dpatch as follows: + +dpatch patch-template -p '0n_patch_name' "Patch description" \ +< mypatch.diff > debian/patches/0n_patch_name.dpatch + +and add "0n_patch_name.dpatch" to debian/patches/00list + + +Building +-------- + +To build the packages: + +$ dpkg-buildpackage -rfakeroot -us -uc +or +$ debuild -us -uc -L -i + +It should build without problems on Debian 3.1 (sarge) and unstable, +but will no longer build on Debian 3.0 (woody) and earlier distributions. + + +I hope you like it! + +Roger Leigh -- Sun, 14 Aug 2005 13:11:35 +0100 --- gutenprint-5.0.0~rc2.orig/debian/libgutenprint-doc.doc-base.reference +++ gutenprint-5.0.0~rc2/debian/libgutenprint-doc.doc-base.reference @@ -0,0 +1,14 @@ +Document: libgutenprint-doc-reference +Title: The libgutenprint API Reference Manual +Author: The Gutenprint Project +Abstract: The gutenprint library routines give programmers an interface to + print high quality bitmap images on most modern printers. It includes drivers + which provide printing quality for UNIX/Linux on a par with proprietary + vendor-supplied drivers in many cases, and can be used for many of the most + demanding printing tasks. This manual is a reference to the libgutenprint + library. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libgutenprint-doc/reference/html/index.html +Files: /usr/share/doc/libgutenprint-doc/reference/html/*.html --- gutenprint-5.0.0~rc2.orig/debian/libgutenprintui1-1.install +++ gutenprint-5.0.0~rc2/debian/libgutenprintui1-1.install @@ -0,0 +1 @@ +debian/install/usr/lib/libgutenprintui.so.* usr/lib --- gutenprint-5.0.0~rc2.orig/debian/libgutenprint-dev.docs +++ gutenprint-5.0.0~rc2/debian/libgutenprint-dev.docs @@ -0,0 +1,2 @@ +README +doc/FAQ.html --- gutenprint-5.0.0~rc2.orig/debian/libgutenprintui1-dev.install +++ gutenprint-5.0.0~rc2/debian/libgutenprintui1-dev.install @@ -0,0 +1,3 @@ +debian/install/usr/lib/libgutenprintui.so usr/lib +debian/install/usr/lib/pkgconfig/gutenprintui.pc usr/lib/pkgconfig +debian/install/usr/include/gutenprintui usr/include --- gutenprint-5.0.0~rc2.orig/debian/gutenprint-doc.install +++ gutenprint-5.0.0~rc2/debian/gutenprint-doc.install @@ -0,0 +1,2 @@ +debian/install/usr/share/gutenprint/doc/*.pdf usr/share/doc/gutenprint-doc +debian/install/usr/share/gutenprint/doc/html usr/share/doc/gutenprint-doc --- gutenprint-5.0.0~rc2.orig/debian/libgutenprint2.install.in +++ gutenprint-5.0.0~rc2/debian/libgutenprint2.install.in @@ -0,0 +1,3 @@ +debian/install/usr/lib/libgutenprint.so.* usr/lib +debian/install/usr/lib/gutenprint usr/lib +debian/install/usr/share/gutenprint/#UPSTREAM_VERSION# usr/share/gutenprint --- gutenprint-5.0.0~rc2.orig/debian/compat +++ gutenprint-5.0.0~rc2/debian/compat @@ -0,0 +1 @@ +4 --- gutenprint-5.0.0~rc2.orig/debian/ijsgutenprint.docs +++ gutenprint-5.0.0~rc2/debian/ijsgutenprint.docs @@ -0,0 +1 @@ +doc/gutenprint-options --- gutenprint-5.0.0~rc2.orig/debian/cupsys-driver-gutenprint.docs +++ gutenprint-5.0.0~rc2/debian/cupsys-driver-gutenprint.docs @@ -0,0 +1,3 @@ +README +doc/FAQ.html +doc/gutenprint-options --- gutenprint-5.0.0~rc2.orig/debian/libgutenprint-doc.doc-base.developer +++ gutenprint-5.0.0~rc2/debian/libgutenprint-doc.doc-base.developer @@ -0,0 +1,15 @@ +Document: libgutenprint-doc-developer +Title: The libgutenprint Reference Manual +Author: The Gutenprint Project +Abstract: The gutenprint library routines give programmers an interface to + print high quality bitmap images on most modern printers. It includes drivers + which provide printing quality for UNIX/Linux on a par with proprietary + vendor-supplied drivers in many cases, and can be used for many of the most + demanding printing tasks. This manual covers developing programs that use + libgutenprint for printing, as well as the concepts and internals of the + library. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/libgutenprint-doc/developer/html/index.html +Files: /usr/share/doc/libgutenprint-doc/developer/html/*.html --- gutenprint-5.0.0~rc2.orig/debian/gutenprint-locales.install +++ gutenprint-5.0.0~rc2/debian/gutenprint-locales.install @@ -0,0 +1 @@ +debian/install/usr/share/locale usr/share --- gutenprint-5.0.0~rc2.orig/debian/escputil.install +++ gutenprint-5.0.0~rc2/debian/escputil.install @@ -0,0 +1,2 @@ +debian/install/usr/bin/escputil usr/bin +debian/install/usr/share/man/man1/escputil.1 usr/share/man/man1 --- gutenprint-5.0.0~rc2.orig/debian/README.Debian +++ gutenprint-5.0.0~rc2/debian/README.Debian @@ -0,0 +1,23 @@ +Gutenprint for Debian +--------------------- + +This is Gutenprint version 5.0.0-rc1, a beta release in the 5.0 +series. Gutenprint is the print facility for the GIMP, and in +addition a suite of drivers that may be used with common UNIX spooling +systems using Ghostscript or CUPS. These drivers provide printing +quality for UNIX/Linux on a par with proprietary vendor-supplied +drivers in many cases, and can be used for many of the most demanding +printing tasks. + +A complete list of supported printers may be found in the NEWS file. +On Debian GNU/Linux, the NEWS file is called `changelog.gz'. + +Documentation can be found in the gutenprint-doc package, which covers +the use of libgutenprint-based programs, and the libgutenprint-doc +package, which covers developing programs using libgutenprint. + +Gutenprint was previously known as Gimp-Print. The name was changed +for the 5.0 release. + + + -- Roger Leigh , Tue, 02 Aug 2005 19:30:56 +0100 --- gutenprint-5.0.0~rc2.orig/debian/control.in +++ gutenprint-5.0.0~rc2/debian/control.in @@ -0,0 +1,283 @@ +Source: gutenprint +Section: graphics +Priority: optional +Maintainer: Debian Printing Group +Uploaders: Roger Leigh +Standards-Version: 3.6.2 +Build-Depends: libcupsys2-dev (>= 1.1.99.b1.r4929-0ubuntu7), libcupsimage2-dev, libgtk2.0-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 4.0.2), zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch + +Package: gimp-print +Architecture: any +Depends: ${shlibs:Depends}, gimp (>= 2.0.4-1) +Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version}) +Enhances: gimp +Description: print plugin for the GIMP + This package includes the Print plugin for the GIMP. + . + This is Gutenprint version #UPSTREAM_VERSION#, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: cupsys-driver-gimpprint +Architecture: any +Section: graphics +Depends: cupsys-driver-gutenprint (>= ${Source-Version}) +Description: printer drivers for CUPS + This is a transitional package to migrate existing users of + cupsys-driver-gimpprint to cupsys-driver-gutenprint (its + successor). It may be safely removed after upgrading. + +Package: cupsys-driver-gutenprint +Architecture: any +Section: graphics +Depends: ${shlibs:Depends}, perl (>= 5.8.0), cupsys (>= 1.1.23) | cups (>= 1.1.23) +Recommends: gnome-gv | postscript-viewer +Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version}) +Replaces: cupsys-driver-gimpprint, cupsys-driver-gimpprint-data +Description: printer drivers for CUPS + This package includes a CUPS driver based on Gutenprint. + . + The CUPS drivers contain all of the files needed to support + photo-quality printing on any printer supported by Gutenprint. You + can find out more about the Common UNIX Printing System ("CUPS"), an + IPP-based printing system for UNIX/Linux, at: + . + http://www.cups.org + . + This is Gutenprint version #UPSTREAM_VERSION#, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: libgutenprint-dev +Architecture: any +Section: libdevel +Depends: libgutenprint#LIBRARY_VERSION# (= ${Source-Version}), pkg-config (>= 0.14.0) +Suggests: libgutenprint-doc (= ${Source-Version}) +Description: development files for the Gutenprint printer driver library + This package contains the header files for the Gutenprint library, + along with a static version of libgutenprint. + . + Install this package if you wish to develop programs that use + libgutenprint. + . + This is Gutenprint version #UPSTREAM_VERSION#, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: libgutenprint-doc +Architecture: all +Section: doc +Suggests: libgutenprint-dev (= ${Source-Version}) +Description: documentation for the Gutenprint printer driver library + This package contains lots of info-files, DVI docs and other + documentation about the Gutenprint library for photo-quality + printing. + . + Install this package if you want to have lots of info about the + Gutenprint library when you're programming. + . + This is Gutenprint version #UPSTREAM_VERSION#, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: libgutenprint#LIBRARY_VERSION# +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Suggests: gutenprint-locales (>= ${Source-Version}) +Description: runtime for the Gutenprint printer driver library + This package includes the Gutenprint shared library, needed to + run programs using Gutenprint drivers. + . + This is Gutenprint version #UPSTREAM_VERSION#, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: libgutenprintui2-dev +Architecture: any +Section: devel +Depends: libgutenprintui2-#LIBRARYUI_VERSION# (= ${Source-Version}), pkg-config (>= 0.14.0) +Suggests: libgutenprint-doc (= ${Source-Version}) +Description: development files for the Gutenprint printer driver user interface library + This package contains the header files for the libgutenprintui + library, along with a static version of libgutenprintui. + libgutenprintui contains GTK+ widgets which may be used for print + dialogs etc. for use with libgutenprint. + . + Install this package if you wish to develop packages that use + libgutenprintui. + . + This is Gutenprint version #UPSTREAM_VERSION#, a beta + development release in the 5.0 line. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: libgutenprintui2-#LIBRARYUI_VERSION# +Architecture: any +Section: libs +Depends: ${shlibs:Depends} +Recommends: gutenprint-locales (>= ${Source-Version}) +Description: runtime for the Gutenprint printer driver user interface library + This package includes the libgutenprintui library, necessary to run + gimp-print. libgutenprintui contains GTK+ widgets which may be + used for print dialogs etc. for use with libgutenprint. + . + This is Gutenprint version #UPSTREAM_VERSION#, a beta + development release in the 5.0 line. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: gutenprint-locales +Architecture: all +Section: libs +Description: locale data files for Gutenprint + This package contains the i18n files of Gutenprint, used by + libgutenprint#LIBRARY_VERSION#, cupsys-driver-gutenprint and + escputil. It is also used by the GIMP Print plugin. + . + They are needed when you want the programs in Gutenprint to print + their messages in other languages than US English. + . + This is Gutenprint version #UPSTREAM_VERSION#, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: escputil +Architecture: any +Section: utils +Depends: ${shlibs:Depends} +Suggests: gutenprint-locales (>= ${Source-Version}) +Description: maintenance utility for Epson Stylus printers + escputil is a utility to clean and align the heads of Epson Stylus + printers. It can also check the current ink levels in the printer. + . + This is Gutenprint version #UPSTREAM_VERSION#, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: ijsgimpprint +Architecture: any +Section: text +Depends: ijsgutenprint (>= ${Source-Version}) +Description: printer drivers for CUPS + This is a transitional package to migrate existing users of + ijsgimpprint to ijsgutenprint (its successor). It may be + safely removed after upgrading. + +Package: ijsgutenprint +Architecture: any +Section: text +Depends: ${shlibs:Depends}, gs-esp (>= 6.53) | gs-gpl (>= 8.01-1) | gs (>= 6.53) | gs-afpl (>= 8.14) +Description: inkjet server - Ghostscript driver for Gutenprint + This package contains the ijsgutenprint binary which provides + Ghostscript with a Gutenprint driver, including all printers + supported by Gutenprint. ijsgutenprint is an IJS server (driver), + which communicates with Ghostscript (an IJS client) using the IJS + (InkJet Server) communications protocol. IJS is a method for + separating ghostscript drivers from ghostscript, to allow + ghostscript to be more extensible. + . + If you wish to print using Ghostscript and the Gutenprint drivers, + install this package. This is typical for LPRng setups. If you + are using CUPS, cupsys-driver-gutenprint is a better choice, but + this package will still work with the appropriate foomatic setup + if you wish to make use of foomatic. + . + This is Gutenprint version #UPSTREAM_VERSION#, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + +Package: foomatic-db-gimp-print +Architecture: all +Section: text +Depends: foomatic-db-gutenprint (>= ${Source-Version}) +Description: linuxprinting.org printer support - database for Gimp-Print printer drivers + This is a transitional package to migrate existing users of + foomatic-db-gimp-print to foomatic-db-gutenprint (its successor). It + may be safely removed after upgrading. + +Package: foomatic-db-gutenprint +Architecture: all +Section: text +Depends: foomatic-db, ijsgutenprint (>= ${Source-Version}) +Conflicts: foomatic-bin (<< 2.9), foomatic-db (<< 2.9) +Description: linuxprinting.org printer support - database for Gutenprint printer drivers + Foomatic is a printing system designed to make it easier to set up + common printers for use with Debian (and other operating systems). + It provides the "glue" between a print spooler (like CUPS or lpr) and + your actual printer, by telling your computer how to process files + sent to the printer. + . + This package includes support for printers using the Gutenprint + printer driver suite. + . + Home Page: http://www.linuxprinting.org/ + . + This is Gutenprint version #UPSTREAM_VERSION#, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + --- gutenprint-5.0.0~rc2.orig/debian/gimp-print.postrm +++ gutenprint-5.0.0~rc2/debian/gimp-print.postrm @@ -0,0 +1,39 @@ +#! /bin/sh +# postrm script for gimp-print +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see /usr/doc/packaging-manual/ + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + if [ remove = "$1" ]; then + dpkg-divert --package gimp-print --remove --rename \ + --divert /usr/lib/gimp/2.0/print.orig \ + /usr/lib/gimp/2.0/plug-ins/print + fi + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + + --- gutenprint-5.0.0~rc2.orig/debian/libgutenprintui2-dev.install +++ gutenprint-5.0.0~rc2/debian/libgutenprintui2-dev.install @@ -0,0 +1,3 @@ +debian/install/usr/lib/libgutenprintui2.so usr/lib +debian/install/usr/lib/pkgconfig/gutenprintui2.pc usr/lib/pkgconfig +debian/install/usr/include/gutenprintui2 usr/include --- gutenprint-5.0.0~rc2.orig/debian/gimp-print.docs +++ gutenprint-5.0.0~rc2/debian/gimp-print.docs @@ -0,0 +1,4 @@ +README +doc/*.html +doc/*.png +doc/gutenprint-options --- gutenprint-5.0.0~rc2.orig/debian/gimp-print.install +++ gutenprint-5.0.0~rc2/debian/gimp-print.install @@ -0,0 +1,2 @@ +debian/install/usr/lib/gimp/2.0/plug-ins/print usr/lib/gimp/2.0/plug-ins +samples/*.png usr/share/doc/gimp-print/samples --- gutenprint-5.0.0~rc2.orig/debian/gutenprint-doc.doc-base +++ gutenprint-5.0.0~rc2/debian/gutenprint-doc.doc-base @@ -0,0 +1,14 @@ +Document: gutenprint-doc +Title: The User's Guide to the Gutenprint Top Quality Printer Drivers +Author: Andy Stewart +Abstract: The Gutenprint Top Quality Printer Drivers are a set of + printer drivers written to take advantage of the full capabilities + of a wide range of printers. This document will explain how to use + the Gutenprint software to achieve high quality printouts from the + GIMP (GNU Image Manipulation Program) and CUPS (Common Unix + Printing System). +Section: Apps/Graphics + +Format: HTML +Index: /usr/share/doc/gutenprint-doc/html/index.html +Files: /usr/share/doc/gutenprint-doc/html/* --- gutenprint-5.0.0~rc2.orig/debian/patches/05_genppdconfig_remove_perlmenu.dpatch +++ gutenprint-5.0.0~rc2/debian/patches/05_genppdconfig_remove_perlmenu.dpatch @@ -0,0 +1,257 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_genppdconfig_remove_perlmenu.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove perlmenu support from cups-genppdconfig.in + +@DPATCH@ + +diff -urN gutenprint-4.3.99+cvs20050901.original/src/cups/cups-genppdconfig.in gutenprint-4.3.99+cvs20050901/src/cups/cups-genppdconfig.in +--- gutenprint-4.3.99+cvs20050901.original/src/cups/cups-genppdconfig.in 2005-09-03 19:46:25.240866064 +0100 ++++ gutenprint-4.3.99+cvs20050901/src/cups/cups-genppdconfig.in 2005-09-02 22:52:31.936066848 +0100 +@@ -36,12 +36,8 @@ + sub create_dir($); + sub dialog_read($$); + sub dialog_read_list (\%\@$$); +-sub perl_menu ($$$$@); +-sub perl_menu_read_list (\%\@$$); +-sub perl_menu_mult ($$@); + + my $DIALOG = "@DIALOG@"; # version of dialog to call +-my $use_dialog = 0; # whether to use dialog + my $BACKTITLE = "Gutenprint CUPS PPD creation"; # dialog screen title + my %printers; # master list of printers + my %languages; # master list of languages +@@ -74,16 +70,6 @@ + exit 0; + } + +-# Can we use dialog? +-if (-x $DIALOG) { +- $use_dialog = 1; +-} else { +- BEGIN { $Curses::OldCurses = 1; } +- use Curses; +- use perlmenu; +- perl_menu_defaults(); +-} +- + while (my $option = main_menu()) { # Display main menu and run selection + if ($option eq "Help") { + display_help(); +@@ -218,21 +204,14 @@ + [ "Create", "Create PPDs" ], + [ "Exit", "Exit the program" ] + ); +- if ($use_dialog) { +- my $dialog_options; +- for my $i ( 0 .. $#menu_options) { +- for my $j ( 0 .. $#{$menu_options[$i]}) { +- $dialog_options .= "\"$menu_options[$i][$j]\" "; +- } +- } +- while (defined($option = dialog_read("cups-genppdconfig", "--no-cancel --default-item Printers --menu \"$menu_desc\" 20 70 6 $dialog_options"))) { +- chomp ($option); +- return $option; ++ my $dialog_options; ++ for my $i ( 0 .. $#menu_options) { ++ for my $j ( 0 .. $#{$menu_options[$i]}) { ++ $dialog_options .= "\"$menu_options[$i][$j]\" "; + } +- } else { +- $option = perl_menu(1, "Main menu", "Choose an option.", +- "Current PPD directory: $chosen_location", +- @menu_options); ++ } ++ while (defined($option = dialog_read("cups-genppdconfig", "--no-cancel --default-item Printers --menu \"$menu_desc\" 20 70 6 $dialog_options"))) { ++ chomp ($option); + return $option; + } + } +@@ -310,19 +289,7 @@ + or die "can't open temporary help file"; + print $HELPFILE "$help_text"; + $HELPFILE->flush(); +- if ($use_dialog) { +- dialog_read("Help", "--textbox $helpfilename 18 76"); +- } else { +- &menu_init(0, "Help", 0); +- open(TEMP,$helpfilename); +- while () { +- s/^(\t+)/' ' x length($1)/e; +- &expand($_) if /\t/; +- &menu_item($_,"", -1); +- } +- close(TEMP); +- &menu_display("Help viewer: (RET/u/t) exit (n/p) next/previous page (b) beginning (e) end"); +- } ++ dialog_read("Help", "--textbox $helpfilename 18 76"); + unlink0($HELPFILE, $helpfilename) or die "Error unlinking help file $helpfilename safely: $!"; + close($HELPFILE) or die "can't close help file $helpfilename: $!"; + return; +@@ -336,12 +303,7 @@ + sub choose_printers { + my $title = "Printer selection"; + my $options = "--checklist \"Choose the printer models you wish to use with CUPS.\" 18 54 11"; +- if ($use_dialog) { +- dialog_read_list(%printers, @chosen_printers, $title, $options); +- } else { +- perl_menu_read_list(%printers, @chosen_printers, $title, +- "Choose the printer models you wish to use with CUPS."); +- } ++ dialog_read_list(%printers, @chosen_printers, $title, $options); + } + + +@@ -352,12 +314,7 @@ + sub choose_languages { + my $title = "Language selection"; + my $options = "--checklist \"Choose the languages you wish to use with CUPS.\" 18 54 11"; +- if ($use_dialog) { +- dialog_read_list(%languages, @chosen_languages, $title, $options); +- } else { +- perl_menu_read_list(%languages, @chosen_languages, $title, +- "Choose the languages you wish to use with CUPS."); +- } ++ dialog_read_list(%languages, @chosen_languages, $title, $options); + } + + +@@ -367,12 +324,8 @@ + # + sub choose_location { + my $location; +- if ($use_dialog) { +- $location = dialog_read("Location selection", +- "--inputbox \"Choose a directory to create the PPD files in.\" 8 61 $chosen_location"); +- } else { +- $location = &menu_getstr(5,12,"Directory:", 1, $chosen_location); +- } ++ $location = dialog_read("Location selection", ++ "--inputbox \"Choose a directory to create the PPD files in.\" 8 61 $chosen_location"); + if (!defined($location)) { + $location = ""; + } +@@ -432,7 +385,7 @@ + } else { + $printers = ""; + } +- if (! $silent && $use_dialog) { ++ if (! $silent) { + open DIALOG, "| $DIALOG --sleep 2 --backtitle \"$BACKTITLE\" --title \"Creating PPD files\" --guage \"Language: \nPPD files: \" 10 72 0" + or die "can't fork dialog: $!"; + } +@@ -449,7 +402,7 @@ + if ($percent > 100) { + $percent = 100; + } +- if (! $silent && $use_dialog) { ++ if (! $silent) { + print DIALOG "$percent\n"; + print DIALOG "XXX\nLanguage: $language\nPPD files: $count/$total\n\n$file\nXXX\n"; + DIALOG->flush(); +@@ -460,7 +413,7 @@ + } + close GENPPD or die "can't close cups-genppd pipe: $!"; + } +- if (! $silent && $use_dialog) { ++ if (! $silent) { + print DIALOG "100\nXXX\nLanguage: \nPPD files: $total/$total\n\nCompleted\nXXX\n"; + close DIALOG or die "can't close dialog pipe"; + } +@@ -521,95 +474,3 @@ + @$list=split(/ /, $tmplist); + } + } +- +- +-# scalar +-# perl_menu($title) +-# +-sub perl_menu ($$$$@) { +- my ($top, $title, $question, $subtitle, @items) = @_; +- my $selection; +- &menu_init(1, "cups-genppdconfig", $top, $title, "$BACKTITLE\n-<$subtitle"); +- +- for my $i ( 0 .. $#items) { +- &menu_item($items[$i][1], $items[$i][0]); +- } +- +- $selection = &menu_display($question); +- return $selection; +-} +- +-# scalar +-# perl_menu_mult($title, $question, @items) +-# +-sub perl_menu_mult ($$@) { +- my ($title, $question, @items) = @_; +- my $selection; +- &menu_init(1, "cups-genppdconfig", 0, $title, $BACKTITLE); +- +- for my $i ( 0 .. $#items) { +- &menu_item($items[$i][1], $items[$i][0], $items[$i][2]); +- } +- +- perl_menu_sel_defaults(); +- $selection = &menu_display_mult($question); +- perl_menu_defaults(); +- if ($selection eq "%UP%" or $selection eq "%NONE%") { +- return undef; +- } +- return $selection; +-} +- +- +-# +-# perl_menu_read_list(%masterlist +-# @chosenlist +-# $title +-# $question +-# - Construct list dialog, entries from %masterlist, +-# defaults from @chosenlist. +-# +-sub perl_menu_read_list (\%\@$$) { +- my $masterlist = $_[0]; +- my $list = $_[1]; +- my $title = $_[2]; +- my $question = $_[3]; +- my $tmplist; +- my @menulist = (); +- my $item; +- my $selected; +-# Make a list for use with perlmenu. +- foreach $item (sort keys %$masterlist) { +- $selected = 0; +- foreach (@$list) { +- if ($item eq $_) { +- $selected = 1; +- last; +- } +- } +- my $formatstring = sprintf "%-14s - %s", $item, $masterlist->{$item}; +- push @menulist, [ $item, $formatstring, $selected ] ; +- } +- $tmplist = perl_menu_mult("$title", "RET=toggle selection (u/t) exit (n/p) next/previous page (b) beginning (e) end", @menulist); +- if (defined($tmplist)) { +- $tmplist =~ s/\"//g; +- @$list=split(/,/, $tmplist); +- } +-} +- +- +-# +-# perl_menu_defaults - set menu defaults +-# +-sub perl_menu_defaults { +- &menu_prefs(1, 0, 1, 0, "y", 0, 0); +-} +- +- +-# +-# perl_menu_sel_defaults - set menu defaults for multiple selections +-# +-sub perl_menu_sel_defaults { +- &menu_prefs(1, 0, 1, 0, "y", 1, 0); +-} +- --- gutenprint-5.0.0~rc2.orig/debian/patches/10_cups_modeldir.dpatch +++ gutenprint-5.0.0~rc2/debian/patches/10_cups_modeldir.dpatch @@ -0,0 +1,1835 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_genppdconfig_remove_perlmenu.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove perlmenu support from cups-genppdconfig.in + +@DPATCH@ + +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/configure gutenprint-5.0.0~rc2/configure +--- gutenprint-5.0.0~rc2.orig/configure 2006-01-16 16:04:40.000000000 +0100 ++++ gutenprint-5.0.0~rc2/configure 2006-04-07 14:09:10.738010160 +0200 +@@ -483,7 +483,7 @@ + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GUTENPRINT_MAJOR_VERSION GUTENPRINT_MINOR_VERSION GUTENPRINT_MICRO_VERSION GUTENPRINT_CURRENT_INTERFACE GUTENPRINT_INTERFACE_AGE GUTENPRINT_BINARY_AGE GUTENPRINT_VERSION GUTENPRINTUI_CURRENT_INTERFACE GUTENPRINTUI_INTERFACE_AGE GUTENPRINTUI_BINARY_AGE GUTENPRINTUI2_CURRENT_INTERFACE GUTENPRINTUI2_INTERFACE_AGE GUTENPRINTUI2_BINARY_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CUPS_CONFIG FOOMATIC_CONFIGURE FOOMATIC_PPDFILE IJS_CONFIG GIMPTOOL_CHECK GTK_CONFIG GTK_CFLAGS GTK_LIBS GIMPTOOL2_CHECK PKG_CONFIG ac_pt_PKG_CONFIG GTK2_CFLAGS GTK2_LIBS GIMP2_CFLAGS GIMP2_LIBS LEX LEXLIB LEX_OUTPUT_ROOT YACC FIND PERL GLIB_MKENUMS CONVERT TEXI2HTML DVIPS DB2PDF DVIPDF DB2PS DB2HTML DOXYGEN DIALOG FOOMATIC_KITLOAD MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GNUCFLAGS GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GIMPTOOL GIMP_CFLAGS GIMP_LIBS GIMP_CFLAGS_NOUI GIMP_LIBS_NOUI GIMP_DATA_DIR GIMP_PLUGIN_DIR BUILD_FOOMATIC_TRUE BUILD_FOOMATIC_FALSE BUILD_FOOMATIC_3_TRUE BUILD_FOOMATIC_3_FALSE BUILD_GHOSTSCRIPT_TRUE BUILD_GHOSTSCRIPT_FALSE BUILD_CUPS_TRUE BUILD_CUPS_FALSE BUILD_CUPS_PPDS_TRUE BUILD_CUPS_PPDS_FALSE CUPS_PPDS_AT_TOP_LEVEL_TRUE CUPS_PPDS_AT_TOP_LEVEL_FALSE BUILD_TRANSLATED_CUPS_PPDS_TRUE BUILD_TRANSLATED_CUPS_PPDS_FALSE USE_LEVEL3_PS_TRUE USE_LEVEL3_PS_FALSE BUILD_ESCPUTIL_TRUE BUILD_ESCPUTIL_FALSE BUILD_TEST_TRUE BUILD_TEST_FALSE BUILD_TESTPATTERN_TRUE BUILD_TESTPATTERN_FALSE BUILD_LIBGUTENPRINTUI_TRUE BUILD_LIBGUTENPRINTUI_FALSE BUILD_LIBGUTENPRINTUI2_TRUE BUILD_LIBGUTENPRINTUI2_FALSE BUILD_GIMP_TRUE BUILD_GIMP_FALSE BUILD_GIMP2_TRUE BUILD_GIMP2_FALSE INSTALL_SAMPLES_TRUE INSTALL_SAMPLES_FALSE INSTALL_USER_GUIDE_TRUE INSTALL_USER_GUIDE_FALSE USE_NLS_TRUE USE_NLS_FALSE BUILD_MODULES_TRUE BUILD_MODULES_FALSE BUILD_GENPPD_STATIC_TRUE BUILD_GENPPD_STATIC_FALSE RELEASE_DATE cups_prefix cups_exec_prefix cups_bindir cups_sbindir cups_conf_datadir cups_conf_serverbin cups_conf_serverroot CUPS_CFLAGS CUPS_LIBS CUPS_PPD_PS_LEVEL GENPPD_LIBS IJS_CFLAGS IJS_LIBS RM gimp_plug_indir gimp2_plug_indir GUTENPRINT_CFLAGS GUTENPRINT_LIBS GUTENPRINT_LIBDEPS GUTENPRINTUI_CFLAGS GUTENPRINTUI_LIBS GUTENPRINTUI_LIBDEPS GUTENPRINTUI_VERSION GUTENPRINTUI2_CFLAGS GUTENPRINTUI2_LIBS GUTENPRINTUI2_LIBDEPS GUTENPRINTUI2_VERSION gutenprint_cflags gutenprint_libs gutenprint_libdeps gutenprintui_cflags gutenprintui_libs gutenprintui_libdeps gutenprintui2_cflags gutenprintui2_libs gutenprintui2_libdeps LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH LIBOBJS LTLIBOBJS LTALLOCA' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GUTENPRINT_MAJOR_VERSION GUTENPRINT_MINOR_VERSION GUTENPRINT_MICRO_VERSION GUTENPRINT_CURRENT_INTERFACE GUTENPRINT_INTERFACE_AGE GUTENPRINT_BINARY_AGE GUTENPRINT_VERSION GUTENPRINTUI_CURRENT_INTERFACE GUTENPRINTUI_INTERFACE_AGE GUTENPRINTUI_BINARY_AGE GUTENPRINTUI2_CURRENT_INTERFACE GUTENPRINTUI2_INTERFACE_AGE GUTENPRINTUI2_BINARY_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CUPS_CONFIG FOOMATIC_CONFIGURE FOOMATIC_PPDFILE IJS_CONFIG GIMPTOOL_CHECK GTK_CONFIG GTK_CFLAGS GTK_LIBS GIMPTOOL2_CHECK PKG_CONFIG ac_pt_PKG_CONFIG GTK2_CFLAGS GTK2_LIBS GIMP2_CFLAGS GIMP2_LIBS LEX LEXLIB LEX_OUTPUT_ROOT YACC FIND PERL GLIB_MKENUMS CONVERT TEXI2HTML DVIPS DB2PDF DVIPDF DB2PS DB2HTML DOXYGEN DIALOG FOOMATIC_KITLOAD MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GNUCFLAGS GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GIMPTOOL GIMP_CFLAGS GIMP_LIBS GIMP_CFLAGS_NOUI GIMP_LIBS_NOUI GIMP_DATA_DIR GIMP_PLUGIN_DIR BUILD_FOOMATIC_TRUE BUILD_FOOMATIC_FALSE BUILD_FOOMATIC_3_TRUE BUILD_FOOMATIC_3_FALSE BUILD_GHOSTSCRIPT_TRUE BUILD_GHOSTSCRIPT_FALSE BUILD_CUPS_TRUE BUILD_CUPS_FALSE BUILD_CUPS_PPDS_TRUE BUILD_CUPS_PPDS_FALSE CUPS_PPDS_AT_TOP_LEVEL_TRUE CUPS_PPDS_AT_TOP_LEVEL_FALSE BUILD_TRANSLATED_CUPS_PPDS_TRUE BUILD_TRANSLATED_CUPS_PPDS_FALSE USE_LEVEL3_PS_TRUE USE_LEVEL3_PS_FALSE BUILD_ESCPUTIL_TRUE BUILD_ESCPUTIL_FALSE BUILD_TEST_TRUE BUILD_TEST_FALSE BUILD_TESTPATTERN_TRUE BUILD_TESTPATTERN_FALSE BUILD_LIBGUTENPRINTUI_TRUE BUILD_LIBGUTENPRINTUI_FALSE BUILD_LIBGUTENPRINTUI2_TRUE BUILD_LIBGUTENPRINTUI2_FALSE BUILD_GIMP_TRUE BUILD_GIMP_FALSE BUILD_GIMP2_TRUE BUILD_GIMP2_FALSE INSTALL_SAMPLES_TRUE INSTALL_SAMPLES_FALSE INSTALL_USER_GUIDE_TRUE INSTALL_USER_GUIDE_FALSE USE_NLS_TRUE USE_NLS_FALSE BUILD_MODULES_TRUE BUILD_MODULES_FALSE BUILD_GENPPD_STATIC_TRUE BUILD_GENPPD_STATIC_FALSE RELEASE_DATE cups_prefix cups_exec_prefix cups_bindir cups_sbindir cups_conf_datadir cups_conf_modeldir cups_conf_serverbin cups_conf_serverroot CUPS_CFLAGS CUPS_LIBS CUPS_PPD_PS_LEVEL GENPPD_LIBS IJS_CFLAGS IJS_LIBS RM gimp_plug_indir gimp2_plug_indir GUTENPRINT_CFLAGS GUTENPRINT_LIBS GUTENPRINT_LIBDEPS GUTENPRINTUI_CFLAGS GUTENPRINTUI_LIBS GUTENPRINTUI_LIBDEPS GUTENPRINTUI_VERSION GUTENPRINTUI2_CFLAGS GUTENPRINTUI2_LIBS GUTENPRINTUI2_LIBDEPS GUTENPRINTUI2_VERSION gutenprint_cflags gutenprint_libs gutenprint_libdeps gutenprintui_cflags gutenprintui_libs gutenprintui_libdeps gutenprintui2_cflags gutenprintui2_libs gutenprintui2_libdeps LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH LIBOBJS LTLIBOBJS LTALLOCA' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -1248,7 +1248,7 @@ + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + +@@ -2908,8 +2908,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2967,8 +2966,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3084,8 +3082,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3139,8 +3136,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3185,8 +3181,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3230,8 +3225,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3750,7 +3744,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 3753 "configure"' > conftest.$ac_ext ++ echo '#line 3747 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -3870,8 +3864,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4180,8 +4173,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4351,8 +4343,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4419,8 +4410,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4680,8 +4670,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4739,8 +4728,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4811,8 +4799,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4856,8 +4843,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5220,7 +5206,7 @@ + + + # Provide some information about the compiler. +-echo "$as_me:5223:" \ ++echo "$as_me:5209:" \ + "checking for Fortran 77 compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` + { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +@@ -5266,8 +5252,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5316,8 +5301,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6318,11 +6302,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6321: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6305: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6325: \$? = $ac_status" >&5 ++ echo "$as_me:6309: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -6580,11 +6564,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6583: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6567: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6587: \$? = $ac_status" >&5 ++ echo "$as_me:6571: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -6642,11 +6626,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6645: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6629: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:6649: \$? = $ac_status" >&5 ++ echo "$as_me:6633: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -7070,8 +7054,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7131,8 +7114,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8342,8 +8324,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8446,8 +8427,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8512,8 +8492,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8606,8 +8585,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8672,8 +8650,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8739,8 +8716,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8806,8 +8782,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8882,7 +8857,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10111,8 +10085,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -11228,11 +11201,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11231: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11204: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:11235: \$? = $ac_status" >&5 ++ echo "$as_me:11208: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -11290,11 +11263,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11293: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11266: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:11297: \$? = $ac_status" >&5 ++ echo "$as_me:11270: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -12119,8 +12092,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12223,8 +12195,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12289,8 +12260,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12383,8 +12353,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12449,8 +12418,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12516,8 +12484,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12583,8 +12550,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12659,7 +12625,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:13611: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:13649: \$? = $ac_status" >&5 ++ echo "$as_me:13615: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -13704,11 +13670,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13707: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13673: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13711: \$? = $ac_status" >&5 ++ echo "$as_me:13677: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -14122,8 +14088,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -14173,8 +14138,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -15826,11 +15790,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15829: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15793: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15833: \$? = $ac_status" >&5 ++ echo "$as_me:15797: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16088,11 +16052,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16091: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16055: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16095: \$? = $ac_status" >&5 ++ echo "$as_me:16059: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16150,11 +16114,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16153: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16117: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16157: \$? = $ac_status" >&5 ++ echo "$as_me:16121: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -16578,8 +16542,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -16639,8 +16602,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -17850,8 +17812,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -17954,8 +17915,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18020,8 +17980,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18114,8 +18073,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18180,8 +18138,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18247,8 +18204,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18314,8 +18270,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18390,7 +18345,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21239,8 +21193,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21294,8 +21247,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21734,8 +21686,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21793,8 +21744,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21910,8 +21860,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21965,8 +21914,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22011,8 +21959,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22056,8 +22003,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22463,8 +22409,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22522,8 +22467,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22639,8 +22583,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22694,8 +22637,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22740,8 +22682,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22785,8 +22726,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22999,8 +22939,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23066,8 +23005,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23156,8 +23094,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -24619,8 +24556,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -24711,8 +24647,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -24762,8 +24697,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25229,8 +25163,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25284,8 +25217,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25506,8 +25438,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25567,8 +25498,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25628,8 +25558,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25688,8 +25617,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25750,8 +25678,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25812,8 +25739,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25886,8 +25812,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -25965,8 +25890,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -26044,8 +25968,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -26123,8 +26046,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -26209,8 +26131,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -26300,8 +26221,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -26369,8 +26289,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -26438,8 +26357,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -26508,8 +26426,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -26577,8 +26494,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -26700,8 +26616,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -26771,8 +26686,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -26835,8 +26749,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -26989,8 +26902,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -27067,8 +26979,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -27140,8 +27051,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -27450,8 +27360,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -27770,8 +27679,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -28085,8 +27993,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -28421,8 +28328,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -28536,8 +28442,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -28703,8 +28608,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -28849,8 +28753,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -29007,8 +28910,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -29157,8 +29059,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -29307,8 +29208,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -29457,8 +29357,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -29607,8 +29506,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -29759,8 +29657,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -29910,8 +29807,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -30060,8 +29956,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -30210,8 +30105,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -30402,8 +30296,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -30463,8 +30356,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -30537,8 +30429,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -30603,8 +30494,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -30676,8 +30566,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -30778,8 +30667,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -30876,8 +30764,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -31126,6 +31013,8 @@ + # Get explicit CUPS directories if possible + if test "x$CUPS_CONFIG" != x; then + cups_conf_datadir="`$CUPS_CONFIG --datadir`" ++ cups_conf_modeldir="`$CUPS_CONFIG --modeldir`" \ ++ || cups_conf_modeldir="/usr/share/ppd" + cups_conf_serverbin="`$CUPS_CONFIG --serverbin`" + cups_conf_serverroot="`$CUPS_CONFIG --serverroot`" + else +@@ -31273,12 +31162,12 @@ + + if test "${CUPS_PPDS_AT_TOP_LEVEL}" = yes ; then + cat >>confdefs.h <<_ACEOF +-#define CUPS_MODELDIR "${cups_conf_datadir}/model/" ++#define CUPS_MODELDIR "${cups_conf_modeldir}/" + _ACEOF + + else + cat >>confdefs.h <<_ACEOF +-#define CUPS_MODELDIR "${cups_conf_datadir}/model/${PACKAGE}/${GUTENPRINT_RELEASE_VERSION}/" ++#define CUPS_MODELDIR "${cups_conf_modeldir}/${PACKAGE}/${GUTENPRINT_RELEASE_VERSION}/" + _ACEOF + + fi +@@ -31340,6 +31229,7 @@ + + + ++ + gutenprint_libs="${GUTENPRINT_LIBS} ${gutenprint_libdeps}" + + +@@ -32436,6 +32326,7 @@ + s,@cups_bindir@,$cups_bindir,;t t + s,@cups_sbindir@,$cups_sbindir,;t t + s,@cups_conf_datadir@,$cups_conf_datadir,;t t ++s,@cups_conf_modeldir@,$cups_conf_modeldir,;t t + s,@cups_conf_serverbin@,$cups_conf_serverbin,;t t + s,@cups_conf_serverroot@,$cups_conf_serverroot,;t t + s,@CUPS_CFLAGS@,$CUPS_CFLAGS,;t t +@@ -32639,11 +32530,6 @@ + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + esac + +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" +- fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +@@ -32682,6 +32568,12 @@ + fi;; + esac + done` || { (exit 1); exit 1; } ++ ++ if test x"$ac_file" != x-; then ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ rm -f "$ac_file" ++ fi + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/configure.ac gutenprint-5.0.0~rc2/configure.ac +--- gutenprint-5.0.0~rc2.orig/configure.ac 2006-01-14 21:36:09.000000000 +0100 ++++ gutenprint-5.0.0~rc2/configure.ac 2006-04-07 14:04:56.478663456 +0200 +@@ -866,9 +866,9 @@ + + AH_TEMPLATE(CUPS_MODELDIR,, [CUPS PPD file directory]) + if test "${CUPS_PPDS_AT_TOP_LEVEL}" = yes ; then +- AC_DEFINE_UNQUOTED(CUPS_MODELDIR, "${cups_conf_datadir}/model/") ++ AC_DEFINE_UNQUOTED(CUPS_MODELDIR, "${cups_conf_modeldir}/") + else +- AC_DEFINE_UNQUOTED(CUPS_MODELDIR, "${cups_conf_datadir}/model/${PACKAGE}/${GUTENPRINT_RELEASE_VERSION}/") ++ AC_DEFINE_UNQUOTED(CUPS_MODELDIR, "${cups_conf_modeldir}/${PACKAGE}/${GUTENPRINT_RELEASE_VERSION}/") + fi + + AH_TEMPLATE(CUPS_PPD_NICKNAME_STRING,, [CUPS PPD Nickname string]) +@@ -887,6 +887,7 @@ + AC_SUBST(cups_bindir) + AC_SUBST(cups_sbindir) + AC_SUBST(cups_conf_datadir) ++AC_SUBST(cups_conf_modeldir) + AC_SUBST(cups_conf_serverbin) + AC_SUBST(cups_conf_serverroot) + AC_SUBST(CUPS_CFLAGS) +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/doc/developer/Makefile.in gutenprint-5.0.0~rc2/doc/developer/Makefile.in +--- gutenprint-5.0.0~rc2.orig/doc/developer/Makefile.in 2006-01-16 16:04:34.000000000 +0100 ++++ gutenprint-5.0.0~rc2/doc/developer/Makefile.in 2006-04-07 14:14:17.872318648 +0200 +@@ -261,6 +261,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/doc/Makefile.am gutenprint-5.0.0~rc2/doc/Makefile.am +--- gutenprint-5.0.0~rc2.orig/doc/Makefile.am 2006-01-14 21:36:10.000000000 +0100 ++++ gutenprint-5.0.0~rc2/doc/Makefile.am 2006-04-06 20:16:17.443238472 +0200 +@@ -65,9 +65,9 @@ + cd developer; $(MAKE) html + cd users_guide; $(MAKE) html + +-install-data-local: gutenprint-options ++install-data-local: $(srcdir)/gutenprint-options + $(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc +- $(INSTALL_DATA) gutenprint-options $(DESTDIR)$(datadir)/$(PACKAGE)/doc ++ $(INSTALL_DATA) $(srcdir)/gutenprint-options $(DESTDIR)$(datadir)/$(PACKAGE)/doc + + + ## Clean +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/doc/Makefile.in gutenprint-5.0.0~rc2/doc/Makefile.in +--- gutenprint-5.0.0~rc2.orig/doc/Makefile.in 2006-01-16 16:04:34.000000000 +0100 ++++ gutenprint-5.0.0~rc2/doc/Makefile.in 2006-04-07 14:14:17.730340232 +0200 +@@ -271,6 +271,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +@@ -689,9 +690,9 @@ + cd developer; $(MAKE) html + cd users_guide; $(MAKE) html + +-install-data-local: gutenprint-options ++install-data-local: $(srcdir)/gutenprint-options + $(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc +- $(INSTALL_DATA) gutenprint-options $(DESTDIR)$(datadir)/$(PACKAGE)/doc ++ $(INSTALL_DATA) $(srcdir)/gutenprint-options $(DESTDIR)$(datadir)/$(PACKAGE)/doc + + maintainer-clean-local: + $(RM) -r gutenprint +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/doc/users_guide/Makefile.in gutenprint-5.0.0~rc2/doc/users_guide/Makefile.in +--- gutenprint-5.0.0~rc2.orig/doc/users_guide/Makefile.in 2006-01-16 16:04:35.000000000 +0100 ++++ gutenprint-5.0.0~rc2/doc/users_guide/Makefile.in 2006-04-07 14:14:18.040293112 +0200 +@@ -261,6 +261,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/include/gutenprint/Makefile.in gutenprint-5.0.0~rc2/include/gutenprint/Makefile.in +--- gutenprint-5.0.0~rc2.orig/include/gutenprint/Makefile.in 2006-01-16 16:04:35.000000000 +0100 ++++ gutenprint-5.0.0~rc2/include/gutenprint/Makefile.in 2006-04-07 14:14:18.349246144 +0200 +@@ -278,6 +278,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/include/gutenprintui/Makefile.in gutenprint-5.0.0~rc2/include/gutenprintui/Makefile.in +--- gutenprint-5.0.0~rc2.orig/include/gutenprintui/Makefile.in 2006-01-16 16:04:35.000000000 +0100 ++++ gutenprint-5.0.0~rc2/include/gutenprintui/Makefile.in 2006-04-07 14:14:18.499223344 +0200 +@@ -274,6 +274,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/include/gutenprintui2/Makefile.in gutenprint-5.0.0~rc2/include/gutenprintui2/Makefile.in +--- gutenprint-5.0.0~rc2.orig/include/gutenprintui2/Makefile.in 2006-01-16 16:04:35.000000000 +0100 ++++ gutenprint-5.0.0~rc2/include/gutenprintui2/Makefile.in 2006-04-07 14:14:18.653199936 +0200 +@@ -275,6 +275,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/include/Makefile.in gutenprint-5.0.0~rc2/include/Makefile.in +--- gutenprint-5.0.0~rc2.orig/include/Makefile.in 2006-01-16 16:04:35.000000000 +0100 ++++ gutenprint-5.0.0~rc2/include/Makefile.in 2006-04-07 14:14:18.180271832 +0200 +@@ -270,6 +270,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/m4/stp_cups.m4 gutenprint-5.0.0~rc2/m4/stp_cups.m4 +--- gutenprint-5.0.0~rc2.orig/m4/stp_cups.m4 2004-09-18 20:24:32.000000000 +0200 ++++ gutenprint-5.0.0~rc2/m4/stp_cups.m4 2006-04-07 13:54:03.878873704 +0200 +@@ -152,6 +152,8 @@ + # Get explicit CUPS directories if possible + if test "x$CUPS_CONFIG" != x; then + cups_conf_datadir="`$CUPS_CONFIG --datadir`" ++ cups_conf_modeldir="`$CUPS_CONFIG --modeldir`" \ ++ || cups_conf_modeldir="/usr/share/ppd" + cups_conf_serverbin="`$CUPS_CONFIG --serverbin`" + cups_conf_serverroot="`$CUPS_CONFIG --serverroot`" + else +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/Makefile.in gutenprint-5.0.0~rc2/Makefile.in +--- gutenprint-5.0.0~rc2.orig/Makefile.in 2006-01-16 16:04:34.000000000 +0100 ++++ gutenprint-5.0.0~rc2/Makefile.in 2006-04-07 14:14:17.583362576 +0200 +@@ -285,6 +285,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/man/cups-genppdconfig.8.in gutenprint-5.0.0~rc2/man/cups-genppdconfig.8.in +--- gutenprint-5.0.0~rc2.orig/man/cups-genppdconfig.8.in 2004-09-18 20:24:32.000000000 +0200 ++++ gutenprint-5.0.0~rc2/man/cups-genppdconfig.8.in 2006-04-07 13:57:07.216002224 +0200 +@@ -41,7 +41,7 @@ + Use \fIppd-directory\fP as the base directory to create PPD files in. The + default printer and language selections will also be obtained from this + directory. By default, the base directory is +-\fP@cups_conf_datadir@/model/gutenprint\fP. ++\fP@cups_conf_modeldir@/gutenprint\fP. + .SH SEE ALSO + .BR cups\-genppd (8), + .BR cups\-genppdupdate (8), +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/man/cups-genppdupdate.8.in gutenprint-5.0.0~rc2/man/cups-genppdupdate.8.in +--- gutenprint-5.0.0~rc2.orig/man/cups-genppdupdate.8.in 2004-09-18 20:24:32.000000000 +0200 ++++ gutenprint-5.0.0~rc2/man/cups-genppdupdate.8.in 2006-04-07 13:57:33.915943216 +0200 +@@ -50,7 +50,7 @@ + .TP + .B \-s \fIppd-directory\fP + Use \fIppd-directory\fP as the base directory to read PPD files from. By +-default, the base directory is \fP@cups_conf_datadir@/model/gutenprint\fP. ++default, the base directory is \fP@cups_conf_modeldir@/gutenprint\fP. + Under this directory, the PPD files are located in subdirectories according to + language code and territory. + .SH SEE ALSO +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/man/Makefile.in gutenprint-5.0.0~rc2/man/Makefile.in +--- gutenprint-5.0.0~rc2.orig/man/Makefile.in 2006-01-16 16:04:35.000000000 +0100 ++++ gutenprint-5.0.0~rc2/man/Makefile.in 2006-04-07 14:14:18.825173792 +0200 +@@ -271,6 +271,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/samples/Makefile.in gutenprint-5.0.0~rc2/samples/Makefile.in +--- gutenprint-5.0.0~rc2.orig/samples/Makefile.in 2006-01-16 16:04:36.000000000 +0100 ++++ gutenprint-5.0.0~rc2/samples/Makefile.in 2006-04-07 14:14:18.970151752 +0200 +@@ -271,6 +271,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/scripts/Makefile.in gutenprint-5.0.0~rc2/scripts/Makefile.in +--- gutenprint-5.0.0~rc2.orig/scripts/Makefile.in 2006-01-16 16:04:39.000000000 +0100 ++++ gutenprint-5.0.0~rc2/scripts/Makefile.in 2006-04-07 14:14:21.684739072 +0200 +@@ -263,6 +263,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/src/cups/cups-genppdconfig.in gutenprint-5.0.0~rc2/src/cups/cups-genppdconfig.in +--- gutenprint-5.0.0~rc2.orig/src/cups/cups-genppdconfig.in 2005-08-13 01:26:02.000000000 +0200 ++++ gutenprint-5.0.0~rc2/src/cups/cups-genppdconfig.in 2006-04-07 14:00:09.685262680 +0200 +@@ -50,7 +50,7 @@ + my @chosen_printers = (); # chosen printers + my @chosen_languages = (); # chosen languages + my $version = "@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@"; +-my $chosen_location = "@cups_conf_datadir@/model/gutenprint/$version"; ++my $chosen_location = "@cups_conf_modeldir@/gutenprint/$version"; + # chosen PPD prefix + my $silent = 0; # no dialog + +@@ -256,7 +256,7 @@ + [0. Directory] + + The default base directory to create PPD files in is +-@cups_conf_datadir@/model/gutenprint, and this is displayed on the ++@cups_conf_modeldir@/gutenprint, and this is displayed on the + main menu. Choose the "Directory" option to change this, but in + almost every case the default should be used. Don\'t alter the default + unless you know what you are doing. +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/src/cups/cups-genppdupdate.in gutenprint-5.0.0~rc2/src/cups/cups-genppdupdate.in +--- gutenprint-5.0.0~rc2.orig/src/cups/cups-genppdupdate.in 2005-12-31 18:35:07.000000000 +0100 ++++ gutenprint-5.0.0~rc2/src/cups/cups-genppdupdate.in 2006-04-07 13:58:31.161240608 +0200 +@@ -48,7 +48,7 @@ + my $version = "@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@"; + + my $ppd_dir = "@cups_conf_serverroot@/ppd"; # Location of in-use CUPS PPDs +-my $ppd_root_dir = "@cups_conf_datadir@/model"; ++my $ppd_root_dir = "@cups_conf_modeldir@"; + my $ppd_base_dir = "$ppd_root_dir/gutenprint/$version"; # Available PPDs + my $gzext = ".gz"; + my $updated_ppd_count = 0; +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/src/cups/Makefile.am gutenprint-5.0.0~rc2/src/cups/Makefile.am +--- gutenprint-5.0.0~rc2.orig/src/cups/Makefile.am 2005-12-31 18:38:17.000000000 +0100 ++++ gutenprint-5.0.0~rc2/src/cups/Makefile.am 2006-04-07 14:01:38.795715832 +0200 +@@ -37,10 +37,10 @@ + cupsexec_backenddir = $(pkglibdir)/backend + cupsexec_filterdir = $(pkglibdir)/filter + if CUPS_PPDS_AT_TOP_LEVEL +-cups_modeldir = $(pkgdatadir)/model/ ++cups_modeldir = $(cups_conf_modeldir)/ + DONT_UNINSTALL_PPDS=true + else +-cups_modeldir = $(pkgdatadir)/model/gutenprint/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/ ++cups_modeldir = $(cups_conf_modeldir)/gutenprint/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/ + endif + + LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(CUPS_CFLAGS) +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/src/cups/Makefile.in gutenprint-5.0.0~rc2/src/cups/Makefile.in +--- gutenprint-5.0.0~rc2.orig/src/cups/Makefile.in 2006-01-16 16:04:36.000000000 +0100 ++++ gutenprint-5.0.0~rc2/src/cups/Makefile.in 2006-04-07 14:14:19.379089584 +0200 +@@ -341,6 +341,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +@@ -384,8 +385,8 @@ + pkgsysconfdir = $(cups_conf_serverroot) + cupsexec_backenddir = $(pkglibdir)/backend + cupsexec_filterdir = $(pkglibdir)/filter +-@CUPS_PPDS_AT_TOP_LEVEL_FALSE@cups_modeldir = $(pkgdatadir)/model/gutenprint/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/ +-@CUPS_PPDS_AT_TOP_LEVEL_TRUE@cups_modeldir = $(pkgdatadir)/model/ ++@CUPS_PPDS_AT_TOP_LEVEL_FALSE@cups_modeldir = $(cups_conf_modeldir)/gutenprint/@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@/ ++@CUPS_PPDS_AT_TOP_LEVEL_TRUE@cups_modeldir = $(cups_conf_modeldir)/ + @CUPS_PPDS_AT_TOP_LEVEL_TRUE@DONT_UNINSTALL_PPDS = true + LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(CUPS_CFLAGS) + @BUILD_CUPS_TRUE@sbin_SCRIPTS = cups-genppdconfig.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/src/escputil/Makefile.in gutenprint-5.0.0~rc2/src/escputil/Makefile.in +--- gutenprint-5.0.0~rc2.orig/src/escputil/Makefile.in 2006-01-16 16:04:36.000000000 +0100 ++++ gutenprint-5.0.0~rc2/src/escputil/Makefile.in 2006-04-07 14:14:19.555062832 +0200 +@@ -282,6 +282,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/src/foomatic/Makefile.in gutenprint-5.0.0~rc2/src/foomatic/Makefile.in +--- gutenprint-5.0.0~rc2.orig/src/foomatic/Makefile.in 2006-01-16 16:04:36.000000000 +0100 ++++ gutenprint-5.0.0~rc2/src/foomatic/Makefile.in 2006-04-07 14:14:19.759031824 +0200 +@@ -300,6 +300,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/src/ghost/Makefile.in gutenprint-5.0.0~rc2/src/ghost/Makefile.in +--- gutenprint-5.0.0~rc2.orig/src/ghost/Makefile.in 2006-01-16 16:04:37.000000000 +0100 ++++ gutenprint-5.0.0~rc2/src/ghost/Makefile.in 2006-04-07 14:14:19.980998080 +0200 +@@ -287,6 +287,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/src/gimp/Makefile.in gutenprint-5.0.0~rc2/src/gimp/Makefile.in +--- gutenprint-5.0.0~rc2.orig/src/gimp/Makefile.in 2006-01-16 16:04:37.000000000 +0100 ++++ gutenprint-5.0.0~rc2/src/gimp/Makefile.in 2006-04-07 14:14:20.152971936 +0200 +@@ -282,6 +282,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/src/gimp2/Makefile.in gutenprint-5.0.0~rc2/src/gimp2/Makefile.in +--- gutenprint-5.0.0~rc2.orig/src/gimp2/Makefile.in 2006-01-16 16:04:37.000000000 +0100 ++++ gutenprint-5.0.0~rc2/src/gimp2/Makefile.in 2006-04-07 14:14:20.325945640 +0200 +@@ -282,6 +282,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/src/gutenprintui/Makefile.in gutenprint-5.0.0~rc2/src/gutenprintui/Makefile.in +--- gutenprint-5.0.0~rc2.orig/src/gutenprintui/Makefile.in 2006-01-16 16:04:37.000000000 +0100 ++++ gutenprint-5.0.0~rc2/src/gutenprintui/Makefile.in 2006-04-07 14:14:20.572908096 +0200 +@@ -301,6 +301,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/src/gutenprintui2/Makefile.in gutenprint-5.0.0~rc2/src/gutenprintui2/Makefile.in +--- gutenprint-5.0.0~rc2.orig/src/gutenprintui2/Makefile.in 2006-01-16 16:04:38.000000000 +0100 ++++ gutenprint-5.0.0~rc2/src/gutenprintui2/Makefile.in 2006-04-07 14:14:20.839867512 +0200 +@@ -303,6 +303,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/src/main/Makefile.in gutenprint-5.0.0~rc2/src/main/Makefile.in +--- gutenprint-5.0.0~rc2.orig/src/main/Makefile.in 2006-01-16 16:04:38.000000000 +0100 ++++ gutenprint-5.0.0~rc2/src/main/Makefile.in 2006-04-07 14:14:21.123824344 +0200 +@@ -373,6 +373,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/src/Makefile.in gutenprint-5.0.0~rc2/src/Makefile.in +--- gutenprint-5.0.0~rc2.orig/src/Makefile.in 2006-01-16 16:04:36.000000000 +0100 ++++ gutenprint-5.0.0~rc2/src/Makefile.in 2006-04-07 14:14:19.112130168 +0200 +@@ -270,6 +270,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/src/testpattern/Makefile.in gutenprint-5.0.0~rc2/src/testpattern/Makefile.in +--- gutenprint-5.0.0~rc2.orig/src/testpattern/Makefile.in 2006-01-16 16:04:38.000000000 +0100 ++++ gutenprint-5.0.0~rc2/src/testpattern/Makefile.in 2006-04-07 14:14:21.339791512 +0200 +@@ -301,6 +301,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ +diff -ur --exclude=debian gutenprint-5.0.0~rc2.orig/test/Makefile.in gutenprint-5.0.0~rc2/test/Makefile.in +--- gutenprint-5.0.0~rc2.orig/test/Makefile.in 2006-01-16 16:04:39.000000000 +0100 ++++ gutenprint-5.0.0~rc2/test/Makefile.in 2006-04-07 14:14:21.548759744 +0200 +@@ -304,6 +304,7 @@ + build_vendor = @build_vendor@ + cups_bindir = @cups_bindir@ + cups_conf_datadir = @cups_conf_datadir@ ++cups_conf_modeldir = @cups_conf_modeldir@ + cups_conf_serverbin = @cups_conf_serverbin@ + cups_conf_serverroot = @cups_conf_serverroot@ + cups_exec_prefix = @cups_exec_prefix@ --- gutenprint-5.0.0~rc2.orig/debian/patches/00list +++ gutenprint-5.0.0~rc2/debian/patches/00list @@ -0,0 +1,2 @@ +05_genppdconfig_remove_perlmenu.dpatch +10_cups_modeldir.dpatch --- gutenprint-5.0.0~rc2.orig/debian/gimp-print.preinst +++ gutenprint-5.0.0~rc2/debian/gimp-print.preinst @@ -0,0 +1,39 @@ +#! /bin/sh +# preinst script for gimp-print +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' + +case "$1" in + install|upgrade) + if [ install = "$1" ]; then + dpkg-divert --package gimp-print --add --rename \ + --divert /usr/lib/gimp/2.0/print.orig \ + /usr/lib/gimp/2.0/plug-ins/print + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- gutenprint-5.0.0~rc2.orig/debian/ijsgutenprint.install +++ gutenprint-5.0.0~rc2/debian/ijsgutenprint.install @@ -0,0 +1,2 @@ +debian/install/usr/bin/ijsgutenprint.5.0 usr/bin +debian/install/usr/share/man/man1/ijsgutenprint.1 usr/share/man/man1 --- gutenprint-5.0.0~rc2.orig/debian/cupsys-driver-gutenprint.install +++ gutenprint-5.0.0~rc2/debian/cupsys-driver-gutenprint.install @@ -0,0 +1,12 @@ +debian/install/etc/cups etc +debian/install/usr/bin/cups-calibrate usr/bin +debian/install/usr/sbin/cups-genppd.5.0 usr/sbin +debian/install/usr/sbin/cups-genppdconfig.5.0 usr/sbin +debian/install/usr/sbin/cups-genppdupdate.5.0 usr/sbin +debian/install/usr/lib/cups usr/lib +debian/install/usr/share/cups/calibrate.ppm usr/share/cups +debian/install/usr/share/man/man8/cups-calibrate.8 usr/share/man/man8 +debian/install/usr/share/man/man8/cups-genppd.8 usr/share/man/man8 +debian/install/usr/share/man/man8/cups-genppdconfig.8 usr/share/man/man8 +debian/install/usr/share/man/man8/cups-genppdupdate.8 usr/share/man/man8 +samples/profile.jpg usr/share/doc/cupsys-driver-gutenprint/samples --- gutenprint-5.0.0~rc2.orig/debian/copyright +++ gutenprint-5.0.0~rc2/debian/copyright @@ -0,0 +1,23 @@ +This package was debianized by Roger Leigh on +Fri, 26 Jan 2001 17:42:06 +0000. + +It was downloaded from cvs.sourceforge.net:/cvsroot/gimp-print + +Upstream Authors: Michael Sweet (mike@easysw.com) + Robert Krawitz (rlk@alum.mit.edu) + and the rest of the Gutenprint development team. + +Copyright: + +This software is Copyright © 1997-2005 Michael Sweet and Robert Krawitz + +You are free to distribute this software under the terms of +the GNU General Public License. +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL file. + +This Debian release of Gutenprint has removed the GFDL-licensed User's +Guide. It will be added back to the release once a new version of the +GFDL, fully compatible with the DFSG, exists. + + -- Roger Leigh Tue, 22 Nov 2005 15:14:30 +0000 --- gutenprint-5.0.0~rc2.orig/debian/control.gfdl +++ gutenprint-5.0.0~rc2/debian/control.gfdl @@ -0,0 +1,23 @@ +Package: gutenprint-doc +Architecture: all +Section: doc +Suggests: cupsys-driver-gutenprint (>= ${Source-Version}), foomatic-db-gutenprint (>= ${Source-Version}), gimp-print (>= ${Source-Version}), ijsgutenprint (>= ${Source-Version}) +Description: users' guide for Gutenprint and CUPS + This package contains a user guide for programs using the + Gutenprint library for photographic quality printing. Currently + this covers using the Print plugin for the GIMP and the Common Unix + Printing System (CUPS). + . + The documentation is available in both HTML and PDF formats for + on-line viewing and hardcopy. + . + This is Gutenprint version #UPSTREAM_VERSION#, a beta release + in the 5.0 series. + . + Gutenprint is the print facility for the GIMP, and in addition a + suite of drivers that may be used with common UNIX spooling systems + using GhostScript or CUPS. These drivers provide printing quality + for UNIX/Linux on a par with proprietary vendor-supplied drivers in + many cases, and can be used for many of the most demanding printing + tasks. Gutenprint was formerly known as Gimp-Print. + --- gutenprint-5.0.0~rc2.orig/debian/libgutenprint-doc.install +++ gutenprint-5.0.0~rc2/debian/libgutenprint-doc.install @@ -0,0 +1,2 @@ +doc/developer/reference-html/* usr/share/doc/libgutenprint-doc/developer/html +doc/gutenprint/* usr/share/doc/libgutenprint-doc/reference --- gutenprint-5.0.0~rc2.orig/debian/cupsys-driver-gutenprint.postrm +++ gutenprint-5.0.0~rc2/debian/cupsys-driver-gutenprint.postrm @@ -0,0 +1,38 @@ +#! /bin/sh +# postrm script for cupsys-driver-gutenprint +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see /usr/doc/packaging-manual/ + +if [ "$1" = remove ]; then + # Remove generated PPDs + rm -rf /usr/share/cups/model/gutenprint/5.0 + rm -rf /usr/share/ppd/gutenprint/5.0 + [ -x /etc/init.d/cupsys ] && invoke-rc.d cupsys force-reload || true +fi + +if [ "$1" = purge ]; then + # Remove /etc/cups if it is empty + rmdir /etc/cups 2>/dev/null || true + rmdir /usr/share/cups/model/gutenprint 2>/dev/null || true + rmdir /usr/share/ppd/gutenprint 2>/dev/null || true +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +