diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | USAGE | 2 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | VERSION.full | 2 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | foomaticrip.c | 2 |
8 files changed, 30 insertions, 16 deletions
@@ -1,4 +1,16 @@ -2011-02-18 Till Kamppeter <till.kamppeter@gmail.com> +2011-07-25 Till Kamppeter <till.kamppeter@gmail.com> + + * Tagged branch for release 4.0.9. + + * VERSION, README, USAGE, configure.ac: Updated for release 4.0.9. + +2011-07-25 Till Kamppeter <till.kamppeter@gmail.com> + + * foomaticrip.c: Fixed build of foomatic-rip on systems without + D-Bus. Thanks to Richard Hughes (hughsient at gmail dot com) for + the quick fix. + +2011-07-25 Till Kamppeter <till.kamppeter@gmail.com> * Tagged branch for release 4.0.8. @@ -1,5 +1,5 @@ -Foomatic 4.0.8 +Foomatic 4.0.9 ============== @@ -1,5 +1,5 @@ -Foomatic 4.0.8 +Foomatic 4.0.9 ============== foomatic-filters @@ -1 +1 @@ -4.0.8 +4.0.9 diff --git a/VERSION.full b/VERSION.full index 5c27782..5a8db6a 100644 --- a/VERSION.full +++ b/VERSION.full @@ -1 +1 @@ -4.0.8.239 +4.0.9.241 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for foomatic-rip 4.0.8. +# Generated by GNU Autoconf 2.61 for foomatic-rip 4.0.9. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='foomatic-rip' PACKAGE_TARNAME='foomatic-rip' -PACKAGE_VERSION='4.0.8' -PACKAGE_STRING='foomatic-rip 4.0.8' +PACKAGE_VERSION='4.0.9' +PACKAGE_STRING='foomatic-rip 4.0.9' PACKAGE_BUGREPORT='' ac_unique_file="options.c" @@ -1240,7 +1240,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures foomatic-rip 4.0.8 to adapt to many kinds of systems. +\`configure' configures foomatic-rip 4.0.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1306,7 +1306,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of foomatic-rip 4.0.8:";; + short | recursive ) echo "Configuration of foomatic-rip 4.0.9:";; esac cat <<\_ACEOF @@ -1406,7 +1406,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -foomatic-rip configure 4.0.8 +foomatic-rip configure 4.0.9 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1420,7 +1420,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by foomatic-rip $as_me 4.0.8, which was +It was created by foomatic-rip $as_me 4.0.9, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2110,7 +2110,7 @@ fi # Define the identity of the package. PACKAGE='foomatic-rip' - VERSION='4.0.8' + VERSION='4.0.9' # Some tools Automake needs. @@ -8250,7 +8250,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by foomatic-rip $as_me 4.0.8, which was +This file was extended by foomatic-rip $as_me 4.0.9, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8303,7 +8303,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -foomatic-rip config.status 4.0.8 +foomatic-rip config.status 4.0.9 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 3bbb89f..2352068 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.61]) -AC_INIT(foomatic-rip, [4.0.8]) +AC_INIT(foomatic-rip, [4.0.9]) AM_INIT_AUTOMAKE([no-define]) AC_CONFIG_SRCDIR([options.c]) diff --git a/foomaticrip.c b/foomaticrip.c index 1970c7c..e9ae0f7 100644 --- a/foomaticrip.c +++ b/foomaticrip.c @@ -1514,9 +1514,11 @@ int main(int argc, char** argv) _log("INFO: Using qualifer: '%s.%s.%s'\n", qualifier[0], qualifier[1], qualifier[2]); +#ifdef HAVE_DBUS /* ask colord for the profile */ icc_profile = colord_get_profile_for_device_id ((const char *) getenv("PRINTER"), qualifier); +#endif /* fall back to PPD */ if (icc_profile == NULL) { |