summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2016-09-20 11:56:08 +0200
committerDidier Raboud <odyx@debian.org>2016-09-20 11:56:08 +0200
commit7f5731038556e5b03d2a886163ca2c873c77333d (patch)
tree8f4194af3949a73accf44b2b0bd8ebfa990ac577 /include
parenta313257bdec71bc92a56598e74d9097c16cb6e48 (diff)
New upstream version 5.2.12~pre2
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am1
-rw-r--r--include/Makefile.in30
-rw-r--r--include/gutenprint/Makefile.am1
-rw-r--r--include/gutenprint/Makefile.in33
-rw-r--r--include/gutenprint/array.h1
-rw-r--r--include/gutenprint/bit-ops.h1
-rw-r--r--include/gutenprint/channel.h1
-rw-r--r--include/gutenprint/color.h5
-rw-r--r--include/gutenprint/curve-cache.h2
-rw-r--r--include/gutenprint/curve.h5
-rw-r--r--include/gutenprint/dither.h5
-rw-r--r--include/gutenprint/gutenprint-intl-internal.h1
-rw-r--r--include/gutenprint/gutenprint-intl.h1
-rw-r--r--include/gutenprint/gutenprint-module.h4
-rw-r--r--include/gutenprint/gutenprint-version.h.in1
-rw-r--r--include/gutenprint/gutenprint.h4
-rw-r--r--include/gutenprint/image.h5
-rw-r--r--include/gutenprint/list.h1
-rw-r--r--include/gutenprint/module.h1
-rw-r--r--include/gutenprint/mxml.h7
-rw-r--r--include/gutenprint/paper.h5
-rw-r--r--include/gutenprint/path.h5
-rw-r--r--include/gutenprint/printers.h5
-rw-r--r--include/gutenprint/sequence.h1
-rw-r--r--include/gutenprint/string-list.h5
-rw-r--r--include/gutenprint/util.h6
-rw-r--r--include/gutenprint/vars.h5
-rw-r--r--include/gutenprint/weave.h5
-rw-r--r--include/gutenprint/xml.h5
-rw-r--r--include/gutenprintui2/Makefile.am1
-rw-r--r--include/gutenprintui2/Makefile.in31
-rw-r--r--include/gutenprintui2/gutenprintui.h1
32 files changed, 38 insertions, 147 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 77e03c9..604dcd2 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,3 @@
-## $Id: Makefile.am,v 1.8 2006/09/22 13:29:50 faust3 Exp $
## Copyright (C) 2000,2004 Roger Leigh
##
## This program is free software; you can redistribute it and/or modify
diff --git a/include/Makefile.in b/include/Makefile.in
index da557b5..b505eef 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -83,23 +83,22 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(top_srcdir)/scripts/global.mk $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/scripts/mkinstalldirs
+ $(srcdir)/Makefile.am
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
- $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
- $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+ $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+ $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -226,9 +225,6 @@ ENABLE_STATIC = @ENABLE_STATIC@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIND = @FIND@
-FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
-FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
-FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
GENPPD_LIBS = @GENPPD_LIBS@
GIMP2_CFLAGS = @GIMP2_CFLAGS@
GIMP2_LIBS = @GIMP2_LIBS@
@@ -261,9 +257,6 @@ GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
GUTENPRINT_RELEASE_VERSION = @GUTENPRINT_RELEASE_VERSION@
GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
-IJS_CFLAGS = @IJS_CFLAGS@
-IJS_CONFIG = @IJS_CONFIG@
-IJS_LIBS = @IJS_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -284,6 +277,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
LIBS = $(INTLLIBS) @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIBUSB_BACKEND_LIBDEPS = @LIBUSB_BACKEND_LIBDEPS@
LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
LIBUSB_LIBS = @LIBUSB_LIBS@
LIPO = @LIPO@
diff --git a/include/gutenprint/Makefile.am b/include/gutenprint/Makefile.am
index 2558cd6..e9e3681 100644
--- a/include/gutenprint/Makefile.am
+++ b/include/gutenprint/Makefile.am
@@ -1,4 +1,3 @@
-## $Id: Makefile.am,v 1.4 2010/07/05 15:18:08 rlk Exp $
## Copyright (C) 2000 Roger Leigh
##
## This program is free software; you can redistribute it and/or modify
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in
index e095043..7a23588 100644
--- a/include/gutenprint/Makefile.in
+++ b/include/gutenprint/Makefile.in
@@ -84,25 +84,23 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(top_srcdir)/scripts/global.mk $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/scripts/mkinstalldirs \
- $(srcdir)/gutenprint-version.h.in $(noinst_HEADERS) \
- $(pkginclude_HEADERS)
+ $(srcdir)/Makefile.am $(srcdir)/gutenprint-version.h.in \
+ $(noinst_HEADERS) $(pkginclude_HEADERS)
subdir = include/gutenprint
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
- $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
- $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+ $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+ $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = gutenprint-version.h
CONFIG_CLEAN_VPATH_FILES =
@@ -218,9 +216,6 @@ ENABLE_STATIC = @ENABLE_STATIC@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIND = @FIND@
-FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
-FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
-FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
GENPPD_LIBS = @GENPPD_LIBS@
GIMP2_CFLAGS = @GIMP2_CFLAGS@
GIMP2_LIBS = @GIMP2_LIBS@
@@ -253,9 +248,6 @@ GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
GUTENPRINT_RELEASE_VERSION = @GUTENPRINT_RELEASE_VERSION@
GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
-IJS_CFLAGS = @IJS_CFLAGS@
-IJS_CONFIG = @IJS_CONFIG@
-IJS_LIBS = @IJS_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -276,6 +268,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
LIBS = $(INTLLIBS) @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIBUSB_BACKEND_LIBDEPS = @LIBUSB_BACKEND_LIBDEPS@
LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
LIBUSB_LIBS = @LIBUSB_LIBS@
LIPO = @LIPO@
diff --git a/include/gutenprint/array.h b/include/gutenprint/array.h
index 62c173b..c01b768 100644
--- a/include/gutenprint/array.h
+++ b/include/gutenprint/array.h
@@ -1,5 +1,4 @@
/*
- * "$Id: array.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $"
*
* Copyright 2003 Roger Leigh (rleigh@debian.org)
*
diff --git a/include/gutenprint/bit-ops.h b/include/gutenprint/bit-ops.h
index 6c6a42d..b23b2bf 100644
--- a/include/gutenprint/bit-ops.h
+++ b/include/gutenprint/bit-ops.h
@@ -1,5 +1,4 @@
/*
- * "$Id: bit-ops.h,v 1.5 2012/04/19 14:41:03 gernot2270 Exp $"
*
* Softweave calculator for gimp-print.
*
diff --git a/include/gutenprint/channel.h b/include/gutenprint/channel.h
index 51cf918..0886b69 100644
--- a/include/gutenprint/channel.h
+++ b/include/gutenprint/channel.h
@@ -1,5 +1,4 @@
/*
- * "$Id: channel.h,v 1.6 2005/07/03 22:13:36 rlk Exp $"
*
* libgimpprint header.
*
diff --git a/include/gutenprint/color.h b/include/gutenprint/color.h
index d0a6e0a..8c1f3cf 100644
--- a/include/gutenprint/color.h
+++ b/include/gutenprint/color.h
@@ -1,6 +1,4 @@
/*
- * "$Id: color.h,v 1.2 2005/10/18 02:08:16 rlk Exp $"
- *
* libgimpprint color functions.
*
* Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
@@ -138,6 +136,3 @@ stp_color_get_long_name(const stp_color_t *c);
#endif /* GUTENPRINT_COLOR_H */
-/*
- * End of "$Id: color.h,v 1.2 2005/10/18 02:08:16 rlk Exp $".
- */
diff --git a/include/gutenprint/curve-cache.h b/include/gutenprint/curve-cache.h
index e12c4e9..2a68831 100644
--- a/include/gutenprint/curve-cache.h
+++ b/include/gutenprint/curve-cache.h
@@ -1,6 +1,4 @@
/*
- * "$Id: curve-cache.h,v 1.2 2005/10/18 02:08:16 rlk Exp $"
- *
* Gimp-Print color management module - traditional Gimp-Print algorithm.
*
* Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
diff --git a/include/gutenprint/curve.h b/include/gutenprint/curve.h
index d763aa1..9bdc916 100644
--- a/include/gutenprint/curve.h
+++ b/include/gutenprint/curve.h
@@ -1,6 +1,4 @@
/*
- * "$Id: curve.h,v 1.2 2008/01/21 23:19:37 rlk Exp $"
- *
* libgimpprint curve functions.
*
* Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
@@ -700,6 +698,3 @@ extern int stp_curve_compose(stp_curve_t **retval,
#endif
#endif /* GUTENPRINT_CURVE_H */
-/*
- * End of "$Id: curve.h,v 1.2 2008/01/21 23:19:37 rlk Exp $".
- */
diff --git a/include/gutenprint/dither.h b/include/gutenprint/dither.h
index 55f1b1e..22ec34e 100644
--- a/include/gutenprint/dither.h
+++ b/include/gutenprint/dither.h
@@ -1,6 +1,4 @@
/*
- * "$Id: dither.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $"
- *
* libgimpprint dither header.
*
* Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
@@ -199,6 +197,3 @@ extern void stp_dither_internal(stp_vars_t *v, int row,
#endif
#endif /* GUTENPRINT_DITHER_H */
-/*
- * End of "$Id: dither.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $".
- */
diff --git a/include/gutenprint/gutenprint-intl-internal.h b/include/gutenprint/gutenprint-intl-internal.h
index ab8c674..dbffca8 100644
--- a/include/gutenprint/gutenprint-intl-internal.h
+++ b/include/gutenprint/gutenprint-intl-internal.h
@@ -1,5 +1,4 @@
/*
- * "$Id: gutenprint-intl-internal.h,v 1.4 2008/08/13 07:35:51 easysw Exp $"
*
* I18N header file for the gimp-print.
*
diff --git a/include/gutenprint/gutenprint-intl.h b/include/gutenprint/gutenprint-intl.h
index afab4a7..add28d1 100644
--- a/include/gutenprint/gutenprint-intl.h
+++ b/include/gutenprint/gutenprint-intl.h
@@ -1,5 +1,4 @@
/*
- * "$Id: gutenprint-intl.h,v 1.5 2008/08/13 07:35:51 easysw Exp $"
*
* I18N header file for Gimp-Print.
*
diff --git a/include/gutenprint/gutenprint-module.h b/include/gutenprint/gutenprint-module.h
index 9e59ecd..8717d03 100644
--- a/include/gutenprint/gutenprint-module.h
+++ b/include/gutenprint/gutenprint-module.h
@@ -1,5 +1,4 @@
/* -*- Mode: C -*-
- * $Id: gutenprint-module.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $
*
* Gimp-Print module header file
*
@@ -62,6 +61,3 @@ extern "C" {
#endif
#endif /* GUTENPRINT_MODULE_H */
-/*
- * End of $Id: gutenprint-module.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $
- */
diff --git a/include/gutenprint/gutenprint-version.h.in b/include/gutenprint/gutenprint-version.h.in
index e35cce4..62b25b8 100644
--- a/include/gutenprint/gutenprint-version.h.in
+++ b/include/gutenprint/gutenprint-version.h.in
@@ -1,5 +1,4 @@
/* -*- Mode: C -*-
- * $Id: gutenprint-version.h.in,v 1.1 2004/09/17 18:38:01 rleigh Exp $
*
* Version of Gimp-print
*
diff --git a/include/gutenprint/gutenprint.h b/include/gutenprint/gutenprint.h
index 449f172..9d99879 100644
--- a/include/gutenprint/gutenprint.h
+++ b/include/gutenprint/gutenprint.h
@@ -1,5 +1,4 @@
/* -*- Mode: C -*-
- * $Id: gutenprint.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $
*
* Gimp-Print header file
*
@@ -62,6 +61,3 @@ extern "C" {
#endif
#endif /* GUTENPRINT_H */
-/*
- * End of $Id: gutenprint.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $
- */
diff --git a/include/gutenprint/image.h b/include/gutenprint/image.h
index 293a1c9..31b9be7 100644
--- a/include/gutenprint/image.h
+++ b/include/gutenprint/image.h
@@ -1,6 +1,4 @@
/*
- * "$Id: image.h,v 1.3 2014/01/23 13:22:40 rlk Exp $"
- *
* libgimpprint image functions.
*
* Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
@@ -141,6 +139,3 @@ extern void stp_image_conclude(stp_image_t *image);
#endif
#endif /* GUTENPRINT_IMAGE_H */
-/*
- * End of "$Id: image.h,v 1.3 2014/01/23 13:22:40 rlk Exp $".
- */
diff --git a/include/gutenprint/list.h b/include/gutenprint/list.h
index 64f3beb..d352ace 100644
--- a/include/gutenprint/list.h
+++ b/include/gutenprint/list.h
@@ -1,5 +1,4 @@
/*
- * "$Id: list.h,v 1.2 2004/11/28 15:59:29 rleigh Exp $"
*
* libgimpprint generic list type
*
diff --git a/include/gutenprint/module.h b/include/gutenprint/module.h
index 3e54099..0554091 100644
--- a/include/gutenprint/module.h
+++ b/include/gutenprint/module.h
@@ -1,5 +1,4 @@
/*
- * "$Id: module.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $"
*
* libgimpprint module loader - load modules with libltdl/libdl.
*
diff --git a/include/gutenprint/mxml.h b/include/gutenprint/mxml.h
index 3e13f87..6fd30f3 100644
--- a/include/gutenprint/mxml.h
+++ b/include/gutenprint/mxml.h
@@ -1,6 +1,4 @@
/*
- * "$Id: mxml.h,v 1.2 2008/06/08 15:10:08 rlk Exp $"
- *
* Header file for mini-XML, a small XML-like file parsing library.
*
* Copyright 2003 by Michael Sweet.
@@ -175,8 +173,3 @@ extern stp_mxml_node_t *stp_mxmlWalkPrev(stp_mxml_node_t *node, stp_mxml_node_t
}
# endif /* __cplusplus */
#endif /* !GUTENPRINT_MXML_H */
-
-
-/*
- * End of "$Id: mxml.h,v 1.2 2008/06/08 15:10:08 rlk Exp $".
- */
diff --git a/include/gutenprint/paper.h b/include/gutenprint/paper.h
index 9bf504e..b79de5a 100644
--- a/include/gutenprint/paper.h
+++ b/include/gutenprint/paper.h
@@ -1,6 +1,4 @@
/*
- * "$Id: paper.h,v 1.5 2015/09/07 21:57:37 speachy Exp $"
- *
* libgimpprint paper functions.
*
* Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
@@ -156,6 +154,3 @@ extern void stp_default_media_size(const stp_vars_t *v,
#endif
#endif /* GUTENPRINT_PAPER_H */
-/*
- * End of "$Id: paper.h,v 1.5 2015/09/07 21:57:37 speachy Exp $".
- */
diff --git a/include/gutenprint/path.h b/include/gutenprint/path.h
index b7c4b44..ffa7f1b 100644
--- a/include/gutenprint/path.h
+++ b/include/gutenprint/path.h
@@ -1,6 +1,4 @@
/*
- * "$Id: path.h,v 1.2 2008/06/01 14:41:03 rlk Exp $"
- *
* libgimpprint path functions header
*
* Copyright 1997-2000 Michael Sweet (mike@easysw.com),
@@ -58,6 +56,3 @@ extern char *stpi_path_merge(const char *path, const char *file);
#endif
#endif /* GUTENPRINT_PATH_H */
-/*
- * End of "$Id: path.h,v 1.2 2008/06/01 14:41:03 rlk Exp $".
- */
diff --git a/include/gutenprint/printers.h b/include/gutenprint/printers.h
index 5f44c1e..e79f4da 100644
--- a/include/gutenprint/printers.h
+++ b/include/gutenprint/printers.h
@@ -1,6 +1,4 @@
/*
- * "$Id: printers.h,v 1.10 2015/07/13 02:18:20 speachy Exp $"
- *
* libgimpprint printer functions.
*
* Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
@@ -291,6 +289,3 @@ const char *stp_describe_output(const stp_vars_t *v);
#endif
#endif /* GUTENPRINT_PRINTERS_H */
-/*
- * End of "$Id: printers.h,v 1.10 2015/07/13 02:18:20 speachy Exp $".
- */
diff --git a/include/gutenprint/sequence.h b/include/gutenprint/sequence.h
index 0f8669d..2e0bf01 100644
--- a/include/gutenprint/sequence.h
+++ b/include/gutenprint/sequence.h
@@ -1,5 +1,4 @@
/*
- * "$Id: sequence.h,v 1.2 2008/01/21 23:19:38 rlk Exp $"
*
* libgimpprint sequence functions.
*
diff --git a/include/gutenprint/string-list.h b/include/gutenprint/string-list.h
index 1504e32..07a9ea9 100644
--- a/include/gutenprint/string-list.h
+++ b/include/gutenprint/string-list.h
@@ -1,6 +1,4 @@
/*
- * "$Id: string-list.h,v 1.4 2013/12/14 19:30:45 rlk Exp $"
- *
* libgimpprint string list functions.
*
* Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
@@ -100,6 +98,3 @@ stp_string_list_is_present(const stp_string_list_t *list,
#endif
#endif /* GUTENPRINT_STRING_LIST_H */
-/*
- * End of "$Id: string-list.h,v 1.4 2013/12/14 19:30:45 rlk Exp $".
- */
diff --git a/include/gutenprint/util.h b/include/gutenprint/util.h
index 352b40d..27c701d 100644
--- a/include/gutenprint/util.h
+++ b/include/gutenprint/util.h
@@ -1,6 +1,4 @@
/*
- * "$Id: util.h,v 1.9 2010/08/04 00:33:55 rlk Exp $"
- *
* libgimpprint utility and miscellaneous functions.
*
* Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
@@ -133,6 +131,7 @@ extern void stp_catprintf(char **strp, const char *format, ...)
#define STP_DBG_PPD 0x200000
#define STP_DBG_NO_COMPRESSION 0x400000
#define STP_DBG_ASSERTIONS 0x800000
+#define STP_DBG_DPL 0x1000000
extern unsigned long stp_get_debug_level(void);
extern void stp_dprintf(unsigned long level, const stp_vars_t *v,
@@ -182,6 +181,3 @@ extern const char *stp_get_release_version(void);
#endif
#endif /* GUTENPRINT_UTIL_H */
-/*
- * End of "$Id: util.h,v 1.9 2010/08/04 00:33:55 rlk Exp $".
- */
diff --git a/include/gutenprint/vars.h b/include/gutenprint/vars.h
index 796e796..32aed3c 100644
--- a/include/gutenprint/vars.h
+++ b/include/gutenprint/vars.h
@@ -1,6 +1,4 @@
/*
- * "$id: vars.h,v 1.3.4.4 2004/03/09 03:00:25 rlk Exp $"
- *
* libgimpprint stp_vars_t core functions.
*
* Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
@@ -1544,6 +1542,3 @@ stp_fill_parameter_settings(stp_parameter_t *desc,
#endif
#endif /* GUTENPRINT_VARS_H */
-/*
- * End of "$Id: vars.h,v 1.10 2011/06/12 00:47:15 rlk Exp $".
- */
diff --git a/include/gutenprint/weave.h b/include/gutenprint/weave.h
index 41d4e2c..6f7202e 100644
--- a/include/gutenprint/weave.h
+++ b/include/gutenprint/weave.h
@@ -1,6 +1,4 @@
/*
- * "$Id: weave.h,v 1.2 2005/06/29 01:42:34 rlk Exp $"
- *
* libgimpprint header.
*
* Copyright 1997-2000 Michael Sweet (mike@easysw.com) and
@@ -175,6 +173,3 @@ stp_weave_parameters_by_row(const stp_vars_t *v, int row,
#endif
#endif /* GUTENPRINT_WEAVE_H */
-/*
- * End of "$Id: weave.h,v 1.2 2005/06/29 01:42:34 rlk Exp $".
- */
diff --git a/include/gutenprint/xml.h b/include/gutenprint/xml.h
index 4b3f424..4f61821 100644
--- a/include/gutenprint/xml.h
+++ b/include/gutenprint/xml.h
@@ -1,6 +1,4 @@
/*
- * "$Id: xml.h,v 1.4 2008/07/06 02:17:42 rlk Exp $"
- *
* Gutenprint module loader header
*
* Copyright 1997-2002 Michael Sweet (mike@easysw.com),
@@ -88,6 +86,3 @@ extern void stp_xml_parse_file_named(const char *name);
#endif
#endif /* GUTENPRINT_XML_H */
-/*
- * End of "$Id: xml.h,v 1.4 2008/07/06 02:17:42 rlk Exp $".
- */
diff --git a/include/gutenprintui2/Makefile.am b/include/gutenprintui2/Makefile.am
index 23cc9ea..9e6692e 100644
--- a/include/gutenprintui2/Makefile.am
+++ b/include/gutenprintui2/Makefile.am
@@ -1,4 +1,3 @@
-## $Id: Makefile.am,v 1.4 2008/10/24 00:37:14 rleigh Exp $
## Copyright (C) 2000 Roger Leigh
##
## This program is free software; you can redistribute it and/or modify
diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in
index 58e74b5..7dbac9d 100644
--- a/include/gutenprintui2/Makefile.in
+++ b/include/gutenprintui2/Makefile.in
@@ -83,24 +83,22 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(top_srcdir)/scripts/global.mk $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/scripts/mkinstalldirs \
- $(am__pkginclude_HEADERS_DIST)
+ $(srcdir)/Makefile.am $(am__pkginclude_HEADERS_DIST)
subdir = include/gutenprintui2
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
- $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
- $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stp.m4 \
- $(top_srcdir)/m4/stp_cups.m4 $(top_srcdir)/m4/stp_gimp.m4 \
- $(top_srcdir)/m4/stp_option.m4 $(top_srcdir)/m4/stp_release.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+ $(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
+ $(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
+ $(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -217,9 +215,6 @@ ENABLE_STATIC = @ENABLE_STATIC@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FIND = @FIND@
-FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
-FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
-FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
GENPPD_LIBS = @GENPPD_LIBS@
GIMP2_CFLAGS = @GIMP2_CFLAGS@
GIMP2_LIBS = @GIMP2_LIBS@
@@ -252,9 +247,6 @@ GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
GUTENPRINT_RELEASE_VERSION = @GUTENPRINT_RELEASE_VERSION@
GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
-IJS_CFLAGS = @IJS_CFLAGS@
-IJS_CONFIG = @IJS_CONFIG@
-IJS_LIBS = @IJS_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -275,6 +267,7 @@ LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
LIBS = $(INTLLIBS) @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
+LIBUSB_BACKEND_LIBDEPS = @LIBUSB_BACKEND_LIBDEPS@
LIBUSB_CFLAGS = @LIBUSB_CFLAGS@
LIBUSB_LIBS = @LIBUSB_LIBS@
LIPO = @LIPO@
diff --git a/include/gutenprintui2/gutenprintui.h b/include/gutenprintui2/gutenprintui.h
index 5668b81..40fde3f 100644
--- a/include/gutenprintui2/gutenprintui.h
+++ b/include/gutenprintui2/gutenprintui.h
@@ -1,5 +1,4 @@
/*
- * "$Id: gutenprintui.h,v 1.4 2016/01/14 02:42:13 rlk Exp $"
*
* Print plug-in for the GIMP.
*