New upstream version 5.3.1

author: Didier Raboud <odyx@debian.org> 2018-09-25 08:33:05 +0200
committer: Didier Raboud <odyx@debian.org> 2018-09-25 08:33:05 +0200
commit: e50542121e724e851fc5d6c68bb773f80c0bc12c (patch)
tree: 655c3f6331a6e8fd8b09ceb4da8f5896484ae16a /src/gutenprintui2
parent: 9dd97a029bf391c42b1dc76f2f7c5e386bb8f466 (diff)
15 files changed, 217 insertions, 185 deletions
diff --git a/src/gutenprintui2/Makefile.am b/src/gutenprintui2/Makefile.am
index bedd468..77431ff 100644
--- a/src/gutenprintui2/Makefile.am
+++ b/src/gutenprintui2/Makefile.am
@@ -11,8 +11,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+## along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in.
 
diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in
index f0cf463..bbdb036 100644
--- a/src/gutenprintui2/Makefile.in
+++ b/src/gutenprintui2/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -21,7 +21,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -84,24 +94,21 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/scripts/global.mk $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(srcdir)/gutenprintui2.pc.in printrcy.h \
-	printrcy.c printrcl.c $(top_srcdir)/scripts/depcomp \
-	$(top_srcdir)/scripts/ylwrap
 subdir = src/gutenprintui2
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(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/iconv.m4 $(top_srcdir)/m4/intlmacosx.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_option.m4 \
 	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = gutenprintui2.pc
@@ -169,7 +176,16 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/libgutenprintui2_la-curve.Plo \
+	./$(DEPDIR)/libgutenprintui2_la-gammacurve.Plo \
+	./$(DEPDIR)/libgutenprintui2_la-panel.Plo \
+	./$(DEPDIR)/libgutenprintui2_la-plist.Plo \
+	./$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Plo \
+	./$(DEPDIR)/libgutenprintui2_la-printrcl.Plo \
+	./$(DEPDIR)/libgutenprintui2_la-printrcy.Plo \
+	./$(DEPDIR)/libgutenprintui2_la-typebuiltins.Plo \
+	./$(DEPDIR)/libgutenprintui2_la-ui-utils.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -235,6 +251,9 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/gutenprintui2.pc.in \
+	$(top_srcdir)/scripts/depcomp $(top_srcdir)/scripts/global.mk \
+	$(top_srcdir)/scripts/ylwrap printrcl.c printrcy.c printrcy.h
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -245,6 +264,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BASH = @BASH@
+BASHREAL = @BASHREAL@
 BUILD_CUPS_PPDS = @BUILD_CUPS_PPDS@
 BZIP2 = @BZIP2@
 CC = @CC@
@@ -265,7 +286,6 @@ DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DIALOG = @DIALOG@
 DLLTOOL = @DLLTOOL@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
@@ -282,6 +302,7 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FIND = @FIND@
 GENPPD_LIBS = @GENPPD_LIBS@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GIMP2_CFLAGS = @GIMP2_CFLAGS@
 GIMP2_LIBS = @GIMP2_LIBS@
 GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
@@ -344,10 +365,12 @@ LTALLOCA = @LTALLOCA@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAINT = @MAINT@
 MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
+MINIMAL_PRINTERS_TO_TEST = @MINIMAL_PRINTERS_TO_TEST@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -371,7 +394,6 @@ PKGROOT = @PKGROOT@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PLUG_IN_PATH = @PLUG_IN_PATH@
 POSUB = @POSUB@
 RANLIB = @RANLIB@
 RELEASE_DATE = @RELEASE_DATE@
@@ -389,9 +411,11 @@ VERSION = @VERSION@
 WHICH_PPDS = @WHICH_PPDS@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 XZ = @XZ@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
+ZPAQ = @ZPAQ@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -459,7 +483,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
-GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
 m4datadir = $(datadir)/aclocal
 pkgconfigdatadir = $(libdir)/pkgconfig
 @BUILD_LIBGUTENPRINTUI2_TRUE@lib_LTLIBRARIES = libgutenprintui2.la
@@ -515,16 +538,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/gutenprintui2/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu src/gutenprintui2/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
-$(top_srcdir)/scripts/global.mk:
+$(top_srcdir)/scripts/global.mk $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -584,29 +606,35 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-curve.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-gammacurve.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-panel.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-plist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-printrcl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-printrcy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-typebuiltins.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-ui-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-curve.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-gammacurve.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-panel.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-plist.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-printrcl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-printrcy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-typebuiltins.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-ui-utils.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -763,7 +791,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -840,7 +871,15 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/libgutenprintui2_la-curve.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-gammacurve.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-panel.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-plist.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-printrcl.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-printrcy.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-typebuiltins.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-ui-utils.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -886,7 +925,15 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/libgutenprintui2_la-curve.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-gammacurve.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-panel.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-plist.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-printrcl.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-printrcy.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-typebuiltins.Plo
+	-rm -f ./$(DEPDIR)/libgutenprintui2_la-ui-utils.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -907,9 +954,9 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigdataDATA
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
@@ -923,6 +970,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigdataDATA
 	uninstall-am uninstall-libLTLIBRARIES \
 	uninstall-pkgconfigdataDATA
 
+.PRECIOUS: Makefile
+
 
 @SET_MAKE@
 
@@ -932,10 +981,6 @@ $(top_builddir)/src/main/libgutenprint.la:
 	cd $(top_builddir)/src/main; \
 	$(MAKE)
 
-$(top_builddir)/src/gutenprintui/libgutenprintui.la:
-	cd $(top_builddir)/src/gutenprintui; \
-	$(MAKE)
-
 $(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
 	cd $(top_builddir)/src/gutenprintui2; \
 	$(MAKE)
diff --git a/src/gutenprintui2/curve.c b/src/gutenprintui2/curve.c
index dc9f3f9..d3af653 100644
--- a/src/gutenprintui2/curve.c
+++ b/src/gutenprintui2/curve.c
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <https://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/src/gutenprintui2/gammacurve.c b/src/gutenprintui2/gammacurve.c
index ffff1ba..2dd6523 100644
--- a/src/gutenprintui2/gammacurve.c
+++ b/src/gutenprintui2/gammacurve.c
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <https://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/src/gutenprintui2/gutenprintui-internal.h b/src/gutenprintui2/gutenprintui-internal.h
index 15970b8..667e15e 100644
--- a/src/gutenprintui2/gutenprintui-internal.h
+++ b/src/gutenprintui2/gutenprintui-internal.h
@@ -16,8 +16,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  *
  * Revision History:
@@ -29,8 +28,10 @@
 #define GUTENPRINTUI_INTERNAL_H
 
 #ifdef __GNUC__
+#ifndef inline
 #define inline __inline__
 #endif
+#endif
 
 #include <sys/types.h>
 
diff --git a/src/gutenprintui2/panel.c b/src/gutenprintui2/panel.c
index fa2df8b..e673eea 100644
--- a/src/gutenprintui2/panel.c
+++ b/src/gutenprintui2/panel.c
@@ -17,8 +17,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -37,6 +36,7 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <math.h>
 
 #define MAXIMUM_PARAMETER_LEVEL STP_PARAMETER_LEVEL_ADVANCED4
 
@@ -784,12 +784,10 @@ build_printer_combo(void)
 static int
 check_page_size(const char *paper_size)
 {
-  const stp_papersize_t *ps = stp_get_papersize_by_name(paper_size);
-  if (ps && (ps->paper_unit == PAPERSIZE_ENGLISH_STANDARD ||
-	     ps->paper_unit == PAPERSIZE_METRIC_STANDARD))
-    return 1;
-  else
-    return 0;
+  const stp_papersize_t *ps = stp_describe_papersize(pv->v, paper_size);
+  int page_size_ok = (ps && (ps->paper_unit == PAPERSIZE_ENGLISH_STANDARD ||
+			     ps->paper_unit == PAPERSIZE_METRIC_STANDARD));
+  return page_size_ok;
 }
 
 static void
@@ -2031,8 +2029,7 @@ create_about_dialog (void)
        "GNU General Public License for more details.\n"
        "\n"
        "You should have received a copy of the GNU General Public License\n"
-       "along with this program; if not, write to the Free Software\n"
-       "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
+       "along with this program.  If not, see <https://www.gnu.org/licenses/>.\n"
        "USA\n"));
 
   gtk_misc_set_padding (GTK_MISC (label), 12, 4);
@@ -3330,7 +3327,7 @@ static void
 setup_auto_paper_size(void)
 {
   const stp_papersize_t *ps =
-    stp_get_papersize_by_name(stp_get_string_parameter(pv->v, "PageSize"));
+    stp_describe_papersize(pv->v, stp_get_string_parameter(pv->v, "PageSize"));
   if (ps->height == 0 && ps->width != 0)		/* Implies roll feed */
     {
       g_signal_handlers_block_matched (G_OBJECT(auto_paper_size_button),
@@ -3516,7 +3513,7 @@ static void
 set_media_size(const gchar *new_media_size)
 {
   static int setting_media_size = 0;
-  const stp_papersize_t *pap = stp_get_papersize_by_name (new_media_size);
+  const stp_papersize_t *pap = stp_describe_papersize (pv->v, new_media_size);
 
   if (setting_media_size)
     return;
@@ -3537,7 +3534,7 @@ set_media_size(const gchar *new_media_size)
 	  stp_parameter_t desc;
 	  stp_describe_parameter(pv->v, "PageSize", &desc);
 	  stp_set_string_parameter(pv->v, "PageSize", desc.deflt.str);
-	  pap = stp_get_papersize_by_name(desc.deflt.str);
+	  pap = stp_describe_papersize(pv->v, desc.deflt.str);
 	  stp_parameter_description_destroy(&desc);
 	  for (i = 0; i < current_option_count; i++)
 	    {
@@ -4587,7 +4584,7 @@ compute_thumbnail(const stp_vars_t *v)
   priv.offset = 0;
   priv.limit = thumbnail_bpp * thumbnail_h * thumbnail_w;
 
-  if (stp_verify(nv) != 1 || stp_print(nv, im) != 1)
+  if (stp_print(nv, im) != 1)
     {
       answer = 0;
       fprintf(stderr, "Could not print thumbnail!\n");
@@ -5125,8 +5122,8 @@ preview_motion_callback (GtkWidget      *widget,
     return;
   if (move_constraint == MOVE_CONSTRAIN)
     {
-      int dx = abs(event->x - mouse_x);
-      int dy = abs(event->y - mouse_y);
+      int dx = STP_DABS(event->x - mouse_x);
+      int dy = STP_DABS(event->y - mouse_y);
       if (dx > dy && dx > 3)
 	move_constraint = MOVE_HORIZONTAL;
       else if (dy > dx && dy > 3)
diff --git a/src/gutenprintui2/plist.c b/src/gutenprintui2/plist.c
index a52d7bd..ee7d028 100644
--- a/src/gutenprintui2/plist.c
+++ b/src/gutenprintui2/plist.c
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -1792,8 +1791,9 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image)
       stp_set_errfunc(np->v, stpui_get_errfunc());
       stp_set_outdata(np->v, prn);
       stp_set_errdata(np->v, stpui_get_errdata());
+      stp_start_job(np->v, &(image->im));
       print_status = stp_print(np->v, &(image->im));
-
+      stp_end_job(np->v, &(image->im));
       /*
        * Note that we do not use popen() to create the output, therefore
        * we do not use pclose() to close it.  See bug 1013565.
diff --git a/src/gutenprintui2/print-image-thumbnail.c b/src/gutenprintui2/print-image-thumbnail.c
index adca256..c5ccf80 100644
--- a/src/gutenprintui2/print-image-thumbnail.c
+++ b/src/gutenprintui2/print-image-thumbnail.c
@@ -16,8 +16,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/gutenprintui2/printrc.h b/src/gutenprintui2/printrc.h
index 2aff9d9..151a7e6 100644
--- a/src/gutenprintui2/printrc.h
+++ b/src/gutenprintui2/printrc.h
@@ -16,8 +16,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  *
  * Revision History:
diff --git a/src/gutenprintui2/printrcl.c b/src/gutenprintui2/printrcl.c
index e9ad5d5..c545b12 100644
--- a/src/gutenprintui2/printrcl.c
+++ b/src/gutenprintui2/printrcl.c
@@ -734,10 +734,9 @@ char *yytext;
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-#line 23 "printrcl.l"
+#line 22 "printrcl.l"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -780,7 +779,7 @@ q_strdup(const char *s)
     return g_strndup(s + 1, strlen(s) - 2);
 }
 
-#line 784 "printrcl.c"
+#line 783 "printrcl.c"
 
 #define INITIAL 0
 
@@ -962,10 +961,10 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 77 "printrcl.l"
+#line 76 "printrcl.l"
 
 
-#line 969 "printrcl.c"
+#line 968 "printrcl.c"
 
 	if ( !(yy_init) )
 		{
@@ -1050,203 +1049,203 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 79 "printrcl.l"
+#line 78 "printrcl.l"
 DBG(CURRENT_PRINTER); return CURRENT_PRINTER;
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 80 "printrcl.l"
+#line 79 "printrcl.l"
 DBG(SHOW_ALL_PAPER_SIZES); return SHOW_ALL_PAPER_SIZES;
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 81 "printrcl.l"
+#line 80 "printrcl.l"
 DBG(PRINTER); return PRINTER;
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 82 "printrcl.l"
+#line 81 "printrcl.l"
 DBG(DESTINATION); return DESTINATION;
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 83 "printrcl.l"
+#line 82 "printrcl.l"
 DBG(SCALING); return SCALING;
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 84 "printrcl.l"
+#line 83 "printrcl.l"
 DBG(ORIENTATION); return ORIENTATION;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 85 "printrcl.l"
+#line 84 "printrcl.l"
 DBG(AUTOSIZE_ROLL_PAPER); return AUTOSIZE_ROLL_PAPER;
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 86 "printrcl.l"
+#line 85 "printrcl.l"
 DBG(UNIT); return UNIT;
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 87 "printrcl.l"
+#line 86 "printrcl.l"
 DBG(DRIVER); return DRIVER;
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 88 "printrcl.l"
+#line 87 "printrcl.l"
 DBG(LEFT); return LEFT;
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 89 "printrcl.l"
+#line 88 "printrcl.l"
 DBG(TOP); return TOP;
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 90 "printrcl.l"
+#line 89 "printrcl.l"
 DBG(CUSTOM_PAGE_WIDTH); return CUSTOM_PAGE_WIDTH;
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 91 "printrcl.l"
+#line 90 "printrcl.l"
 DBG(CUSTOM_PAGE_HEIGHT); return CUSTOM_PAGE_HEIGHT;
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 92 "printrcl.l"
+#line 91 "printrcl.l"
 DBG(OUTPUT_TYPE); return OUTPUT_TYPE;
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 93 "printrcl.l"
+#line 92 "printrcl.l"
 DBG(PARAMETER); return PARAMETER;
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 94 "printrcl.l"
+#line 93 "printrcl.l"
 DBG(QUEUE_NAME); return QUEUE_NAME;
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 95 "printrcl.l"
+#line 94 "printrcl.l"
 DBG(OUTPUT_FILENAME); return OUTPUT_FILENAME;
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 96 "printrcl.l"
+#line 95 "printrcl.l"
 DBG(EXTRA_PRINTER_OPTIONS); return EXTRA_PRINTER_OPTIONS;
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 97 "printrcl.l"
+#line 96 "printrcl.l"
 DBG(CUSTOM_COMMAND); return CUSTOM_COMMAND;
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 98 "printrcl.l"
+#line 97 "printrcl.l"
 DBG(COMMAND_TYPE); return COMMAND_TYPE;
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 99 "printrcl.l"
+#line 98 "printrcl.l"
 DBG(GLOBAL_SETTINGS); return GLOBAL_SETTINGS;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 100 "printrcl.l"
+#line 99 "printrcl.l"
 DBG(END_GLOBAL_SETTINGS); return END_GLOBAL_SETTINGS;
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 101 "printrcl.l"
+#line 100 "printrcl.l"
 DBG(GLOBAL); return GLOBAL;
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 103 "printrcl.l"
+#line 102 "printrcl.l"
 DBG(pINT); return pINT;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 104 "printrcl.l"
+#line 103 "printrcl.l"
 DBG(pSTRING_LIST); return pSTRING_LIST;
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 105 "printrcl.l"
+#line 104 "printrcl.l"
 DBG(pFILE); return pFILE;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 106 "printrcl.l"
+#line 105 "printrcl.l"
 DBG(pDOUBLE); return pDOUBLE;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 107 "printrcl.l"
+#line 106 "printrcl.l"
 DBG(pDIMENSION); return pDIMENSION;
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 108 "printrcl.l"
+#line 107 "printrcl.l"
 DBG(pBOOLEAN); return pBOOLEAN;
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 109 "printrcl.l"
+#line 108 "printrcl.l"
 DBG(pCURVE); return pCURVE;
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 111 "printrcl.l"
+#line 110 "printrcl.l"
 yylval.dval = strtod(yytext, NULL); DBG(tNUMBER); return tNUMBER;
 	YY_BREAK
 case 32:
 /* rule 32 can match eol */
 YY_RULE_SETUP
-#line 112 "printrcl.l"
+#line 111 "printrcl.l"
 yylval.sval = q_strdup(yytext); DBG(tSTRING); return tSTRING;
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 113 "printrcl.l"
+#line 112 "printrcl.l"
 yylval.sval = g_strdup(yytext); DBG(tBOOLEAN); return tBOOLEAN;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 114 "printrcl.l"
+#line 113 "printrcl.l"
 yylval.sval = g_strdup(yytext); DBG(tWORD); return tWORD;
 	YY_BREAK
 case 35:
 /* rule 35 can match eol */
 YY_RULE_SETUP
-#line 115 "printrcl.l"
+#line 114 "printrcl.l"
 DBG(PRINTRC_HDR); return PRINTRC_HDR;
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 116 "printrcl.l"
+#line 115 "printrcl.l"
 DBG(whitespace1); 	/* Skip blanks/tabs */
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 117 "printrcl.l"
+#line 116 "printrcl.l"
 DBG(comment1); 	/* Skip comments */
 	YY_BREAK
 case 38:
 /* rule 38 can match eol */
 YY_RULE_SETUP
-#line 118 "printrcl.l"
+#line 117 "printrcl.l"
 DBG(newline); mylineno++;
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 119 "printrcl.l"
+#line 118 "printrcl.l"
 ECHO;
 	YY_BREAK
-#line 1250 "printrcl.c"
+#line 1249 "printrcl.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -2240,4 +2239,4 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 119 "printrcl.l"
+#line 118 "printrcl.l"
diff --git a/src/gutenprintui2/printrcl.l b/src/gutenprintui2/printrcl.l
index 578227c..9434793 100644
--- a/src/gutenprintui2/printrcl.l
+++ b/src/gutenprintui2/printrcl.l
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 %{
diff --git a/src/gutenprintui2/printrcy.c b/src/gutenprintui2/printrcy.c
index 7e81f19..4a4e3ef 100644
--- a/src/gutenprintui2/printrcy.c
+++ b/src/gutenprintui2/printrcy.c
@@ -63,7 +63,7 @@
 
 /* Copy the first part of user declarations.  */
 /* Line 371 of yacc.c  */
-#line 22 "printrcy.y"
+#line 21 "printrcy.y"
 
 
 #ifdef HAVE_CONFIG_H
@@ -554,14 +554,14 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,    97,    97,   108,   115,   125,   135,   145,   155,   162,
-     169,   176,   183,   190,   197,   204,   225,   232,   239,   242,
-     259,   277,   295,   312,   329,   350,   373,   373,   373,   373,
-     374,   374,   374,   377,   380,   380,   383,   383,   383,   383,
-     384,   384,   384,   384,   384,   385,   385,   385,   385,   386,
-     386,   389,   389,   392,   395,   395,   398,   402,   412,   412,
-     415,   418,   429,   429,   432,   432,   435,   438,   438,   438,
-     441
+       0,    96,    96,   107,   114,   124,   134,   144,   154,   161,
+     168,   175,   182,   189,   196,   203,   224,   231,   238,   241,
+     258,   276,   294,   311,   328,   349,   372,   372,   372,   372,
+     373,   373,   373,   376,   379,   379,   382,   382,   382,   382,
+     383,   383,   383,   383,   383,   384,   384,   384,   384,   385,
+     385,   388,   388,   391,   394,   394,   397,   401,   411,   411,
+     414,   417,   428,   428,   431,   431,   434,   437,   437,   437,
+     440
 };
 #endif
 
@@ -1538,7 +1538,7 @@ yyreduce:
     {
         case 2:
 /* Line 1792 of yacc.c  */
-#line 98 "printrcy.y"
+#line 97 "printrcy.y"
     {
 	  current_printer = stpui_plist_create((yyvsp[(2) - (3)].sval), (yyvsp[(3) - (3)].sval));
 	  g_free((yyvsp[(2) - (3)].sval));
@@ -1548,7 +1548,7 @@ yyreduce:
 
   case 3:
 /* Line 1792 of yacc.c  */
-#line 109 "printrcy.y"
+#line 108 "printrcy.y"
     {
 	  if ((yyvsp[(2) - (2)].sval))
 	    g_free((yyvsp[(2) - (2)].sval));
@@ -1557,7 +1557,7 @@ yyreduce:
 
   case 4:
 /* Line 1792 of yacc.c  */
-#line 116 "printrcy.y"
+#line 115 "printrcy.y"
     {
 	  if (current_printer && (yyvsp[(2) - (2)].sval))
 	    {
@@ -1569,7 +1569,7 @@ yyreduce:
 
   case 5:
 /* Line 1792 of yacc.c  */
-#line 126 "printrcy.y"
+#line 125 "printrcy.y"
     {
 	  if (current_printer && (yyvsp[(2) - (2)].sval))
 	    {
@@ -1581,7 +1581,7 @@ yyreduce:
 
   case 6:
 /* Line 1792 of yacc.c  */
-#line 136 "printrcy.y"
+#line 135 "printrcy.y"
     {
 	  if (current_printer && (yyvsp[(2) - (2)].sval))
 	    {
@@ -1593,7 +1593,7 @@ yyreduce:
 
   case 7:
 /* Line 1792 of yacc.c  */
-#line 146 "printrcy.y"
+#line 145 "printrcy.y"
     {
 	  if (current_printer && (yyvsp[(2) - (2)].sval))
 	    {
@@ -1605,7 +1605,7 @@ yyreduce:
 
   case 8:
 /* Line 1792 of yacc.c  */
-#line 156 "printrcy.y"
+#line 155 "printrcy.y"
     {
 	  if (current_printer)
 	    stpui_plist_set_command_type(current_printer, (int) (yyvsp[(2) - (2)].dval));
@@ -1614,7 +1614,7 @@ yyreduce:
 
   case 9:
 /* Line 1792 of yacc.c  */
-#line 163 "printrcy.y"
+#line 162 "printrcy.y"
     {
 	  if (current_printer)
 	    current_printer->scaling = (yyvsp[(2) - (2)].dval);
@@ -1623,7 +1623,7 @@ yyreduce:
 
   case 10:
 /* Line 1792 of yacc.c  */
-#line 170 "printrcy.y"
+#line 169 "printrcy.y"
     {
 	  if (current_printer)
 	    current_printer->orientation = (int) (yyvsp[(2) - (2)].dval);
@@ -1632,7 +1632,7 @@ yyreduce:
 
   case 11:
 /* Line 1792 of yacc.c  */
-#line 177 "printrcy.y"
+#line 176 "printrcy.y"
     {
 	  if (current_printer)
 	    current_printer->auto_size_roll_feed_paper = (int) (yyvsp[(2) - (2)].dval);
@@ -1641,7 +1641,7 @@ yyreduce:
 
   case 12:
 /* Line 1792 of yacc.c  */
-#line 184 "printrcy.y"
+#line 183 "printrcy.y"
     {
 	  if (current_printer)
 	    current_printer->unit = (int) (yyvsp[(2) - (2)].dval);
@@ -1650,7 +1650,7 @@ yyreduce:
 
   case 13:
 /* Line 1792 of yacc.c  */
-#line 191 "printrcy.y"
+#line 190 "printrcy.y"
     {
 	  if (current_printer)
 	    stp_set_left(current_printer->v, (yyvsp[(2) - (2)].dval));
@@ -1659,7 +1659,7 @@ yyreduce:
 
   case 14:
 /* Line 1792 of yacc.c  */
-#line 198 "printrcy.y"
+#line 197 "printrcy.y"
     {
 	  if (current_printer)
 	    stp_set_top(current_printer->v, (yyvsp[(2) - (2)].dval));
@@ -1668,7 +1668,7 @@ yyreduce:
 
   case 15:
 /* Line 1792 of yacc.c  */
-#line 205 "printrcy.y"
+#line 204 "printrcy.y"
     {
 	  if (current_printer)
 	    {
@@ -1691,7 +1691,7 @@ yyreduce:
 
   case 16:
 /* Line 1792 of yacc.c  */
-#line 226 "printrcy.y"
+#line 225 "printrcy.y"
     {
 	  if (current_printer)
 	    stp_set_page_width(current_printer->v, (yyvsp[(2) - (2)].dval));
@@ -1700,7 +1700,7 @@ yyreduce:
 
   case 17:
 /* Line 1792 of yacc.c  */
-#line 233 "printrcy.y"
+#line 232 "printrcy.y"
     {
 	  if (current_printer)
 	    stp_set_page_height(current_printer->v, (yyvsp[(2) - (2)].dval));
@@ -1709,7 +1709,7 @@ yyreduce:
 
   case 19:
 /* Line 1792 of yacc.c  */
-#line 243 "printrcy.y"
+#line 242 "printrcy.y"
     {
 	  if (current_printer)
 	    {
@@ -1728,7 +1728,7 @@ yyreduce:
 
   case 20:
 /* Line 1792 of yacc.c  */
-#line 260 "printrcy.y"
+#line 259 "printrcy.y"
     {
 	  if (current_printer)
 	    {
@@ -1748,7 +1748,7 @@ yyreduce:
 
   case 21:
 /* Line 1792 of yacc.c  */
-#line 278 "printrcy.y"
+#line 277 "printrcy.y"
     {
 	  if (current_printer)
 	    {
@@ -1768,7 +1768,7 @@ yyreduce:
 
   case 22:
 /* Line 1792 of yacc.c  */
-#line 296 "printrcy.y"
+#line 295 "printrcy.y"
     {
 	  if (current_printer)
 	    {
@@ -1787,7 +1787,7 @@ yyreduce:
 
   case 23:
 /* Line 1792 of yacc.c  */
-#line 313 "printrcy.y"
+#line 312 "printrcy.y"
     {
 	  if (current_printer)
 	    {
@@ -1806,7 +1806,7 @@ yyreduce:
 
   case 24:
 /* Line 1792 of yacc.c  */
-#line 330 "printrcy.y"
+#line 329 "printrcy.y"
     {
 	  if (current_printer)
 	    {
@@ -1829,7 +1829,7 @@ yyreduce:
 
   case 25:
 /* Line 1792 of yacc.c  */
-#line 351 "printrcy.y"
+#line 350 "printrcy.y"
     {
 	  if (current_printer)
 	    {
@@ -1854,13 +1854,13 @@ yyreduce:
 
   case 56:
 /* Line 1792 of yacc.c  */
-#line 399 "printrcy.y"
+#line 398 "printrcy.y"
     { stpui_printrc_current_printer = (yyvsp[(2) - (2)].sval); }
     break;
 
   case 57:
 /* Line 1792 of yacc.c  */
-#line 403 "printrcy.y"
+#line 402 "printrcy.y"
     {
 	  if (strcmp((yyvsp[(2) - (2)].sval), "True") == 0)
 	    stpui_show_all_paper_sizes = 1;
@@ -1872,7 +1872,7 @@ yyreduce:
 
   case 61:
 /* Line 1792 of yacc.c  */
-#line 419 "printrcy.y"
+#line 418 "printrcy.y"
     {
 	  if ((yyvsp[(2) - (2)].sval))
 	    {
@@ -2117,5 +2117,5 @@ yyreturn:
 
 
 /* Line 2055 of yacc.c  */
-#line 444 "printrcy.y"
+#line 443 "printrcy.y"
 
diff --git a/src/gutenprintui2/printrcy.y b/src/gutenprintui2/printrcy.y
index 6832634..14388ab 100644
--- a/src/gutenprintui2/printrcy.y
+++ b/src/gutenprintui2/printrcy.y
@@ -15,8 +15,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 %{
diff --git a/src/gutenprintui2/typebuiltins.c b/src/gutenprintui2/typebuiltins.c
index 4822675..3c5d39f 100644
--- a/src/gutenprintui2/typebuiltins.c
+++ b/src/gutenprintui2/typebuiltins.c
@@ -1,8 +1,25 @@
 
-
+/* This file is generated by glib-mkenums, do not modify it. This code is licensed under the same license as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */
 
 #include <gutenprintui2/gutenprintui.h>
 
+/* enumerations from "../../include/gutenprintui2/curve.h" */
+GType
+stpui_curve_type_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { STPUI_CURVE_TYPE_LINEAR, "STPUI_CURVE_TYPE_LINEAR", "linear" },
+      { STPUI_CURVE_TYPE_SPLINE, "STPUI_CURVE_TYPE_SPLINE", "spline" },
+      { STPUI_CURVE_TYPE_FREE, "STPUI_CURVE_TYPE_FREE", "free" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("StpuiCurveType", values);
+  }
+  return etype;
+}
+
 /* enumerations from "../../include/gutenprintui2/gutenprintui.h" */
 GType
 orient_t_orient_t_get_type (void)
@@ -37,22 +54,5 @@ command_t_command_t_get_type (void)
   return etype;
 }
 
-/* enumerations from "../../include/gutenprintui2/curve.h" */
-GType
-stpui_curve_type_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GEnumValue values[] = {
-      { STPUI_CURVE_TYPE_LINEAR, "STPUI_CURVE_TYPE_LINEAR", "linear" },
-      { STPUI_CURVE_TYPE_SPLINE, "STPUI_CURVE_TYPE_SPLINE", "spline" },
-      { STPUI_CURVE_TYPE_FREE, "STPUI_CURVE_TYPE_FREE", "free" },
-      { 0, NULL, NULL }
-    };
-    etype = g_enum_register_static ("StpuiCurveType", values);
-  }
-  return etype;
-}
-
-
+/* Generated data ends here */
 
diff --git a/src/gutenprintui2/ui-utils.c b/src/gutenprintui2/ui-utils.c
index baf5865..7175d24 100644
--- a/src/gutenprintui2/ui-utils.c
+++ b/src/gutenprintui2/ui-utils.c
@@ -17,8 +17,7 @@
  *   for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
author	Didier Raboud <odyx@debian.org>	2018-09-25 08:33:05 +0200
committer	Didier Raboud <odyx@debian.org>	2018-09-25 08:33:05 +0200
commit	e50542121e724e851fc5d6c68bb773f80c0bc12c (patch)
tree	655c3f6331a6e8fd8b09ceb4da8f5896484ae16a /src/gutenprintui2
parent	9dd97a029bf391c42b1dc76f2f7c5e386bb8f466 (diff)