v1.8.4

vmartins · Feb 9, 2024 · b88ac45 · b88ac45
1 parent 1bf2836
commit b88ac45
Show file tree

Hide file tree

Showing 14 changed files with 6,965 additions and 72 deletions.
diff --git a/NEWS b/NEWS
@@ -1,5 +1,10 @@
 NEWS -- an overview of user-visible changes with each release
 
+----------------------------------------------------------------------
+epson-inkjet-printer-escpr-1.8.4                          (2024-02-01)
+----------------------------------------------------------------------
+* Supported new models.
+
 ----------------------------------------------------------------------
 epson-inkjet-printer-escpr-1.8.3                          (2023-12-20)
 ----------------------------------------------------------------------

diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Epson Inkjet Printer Driver (ESC/P-R) for Linux 1.8.3.
+# Generated by GNU Autoconf 2.69 for Epson Inkjet Printer Driver (ESC/P-R) for Linux 1.8.4.
 #
 # Report bugs to <Seiko Epson Corporation <[email protected]>>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Epson Inkjet Printer Driver (ESC/P-R) for Linux'
 PACKAGE_TARNAME='epson-inkjet-printer-escpr'
-PACKAGE_VERSION='1.8.3'
-PACKAGE_STRING='Epson Inkjet Printer Driver (ESC/P-R) for Linux 1.8.3'
+PACKAGE_VERSION='1.8.4'
+PACKAGE_STRING='Epson Inkjet Printer Driver (ESC/P-R) for Linux 1.8.4'
 PACKAGE_BUGREPORT='Seiko Epson Corporation <[email protected]>'
 PACKAGE_URL=''
 
@@ -1338,7 +1338,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 Epson Inkjet Printer Driver (ESC/P-R) for Linux 1.8.3 to adapt to many kinds of systems.
+\`configure' configures Epson Inkjet Printer Driver (ESC/P-R) for Linux 1.8.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1410,7 +1410,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Epson Inkjet Printer Driver (ESC/P-R) for Linux 1.8.3:";;
+     short | recursive ) echo "Configuration of Epson Inkjet Printer Driver (ESC/P-R) for Linux 1.8.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1525,7 +1525,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Epson Inkjet Printer Driver (ESC/P-R) for Linux configure 1.8.3
+Epson Inkjet Printer Driver (ESC/P-R) for Linux configure 1.8.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1948,7 +1948,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 Epson Inkjet Printer Driver (ESC/P-R) for Linux $as_me 1.8.3, which was
+It was created by Epson Inkjet Printer Driver (ESC/P-R) for Linux $as_me 1.8.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2823,7 +2823,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='epson-inkjet-printer-escpr'
- VERSION='1.8.3'
+ VERSION='1.8.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13281,7 +13281,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Epson Inkjet Printer Driver (ESC/P-R) for Linux $as_me 1.8.3, which was
+This file was extended by Epson Inkjet Printer Driver (ESC/P-R) for Linux $as_me 1.8.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13347,7 +13347,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Epson Inkjet Printer Driver (ESC/P-R) for Linux config.status 1.8.3
+Epson Inkjet Printer Driver (ESC/P-R) for Linux config.status 1.8.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
@@ -17,7 +17,7 @@
 
 AC_PREREQ(2.53)
 AC_INIT([Epson Inkjet Printer Driver (ESC/P-R) for Linux],
-	[1.8.3],
+	[1.8.4],
 	[Seiko Epson Corporation <[email protected]>],
 	[epson-inkjet-printer-escpr])
 dnl  keep ALL versioning info in one location

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+epson-inkjet-printer-escpr (1.8.4) stable; urgency=low
+
+  * Please refer to ./NEWS
+
+ -- Seiko Epson Corporation <[email protected]>  Thu, 1 Feb 2024 13:30:00 +0900
+
 epson-inkjet-printer-escpr (1.8.3) stable; urgency=low
 
   * Please refer to ./NEWS

diff --git a/epson-inkjet-printer-escpr.spec b/epson-inkjet-printer-escpr.spec
@@ -1,6 +1,6 @@
 
 %define pkg     epson-inkjet-printer-escpr
-%define ver     1.8.3
+%define ver     1.8.4
 %define rel     1
 
 %define cupsfilterdir   /opt/epson-inkjet-printer-escpr/lib/cups/filter

diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -26,14 +26,14 @@ DEFINES 		+=	-DGCOMSW_PRT_USE_RAW
 ################################################################
 # Extend function
 ################################################################
-DEFINES 		+=	-DGCOMSW_CMD_ESCPAGE
+#DEFINES 		+=	-DGCOMSW_CMD_ESCPAGE
 DEFINES 		+=	-DGCOMSW_EL_CDLABEL
 DEFINES 		+=	-DGCOMSW_EF_MAINTE
 
 ################################################################
 # Language
 ################################################################
-DEFINES 		+=	-DGCOMSW_CMD_ESCPAGE
+#DEFINES 		+=	-DGCOMSW_CMD_ESCPAGE
 DEFINES 		+= 	-DEPS_FILTER
 
 ################################################################
@@ -49,10 +49,6 @@ libescpr_la_CFLAGS = -Wall $(DEFINES)
 CLEANFILES = libescpr.la
 libescpr_la_SOURCES = \
 	epson-cbt.c epson-cbt.h \
-	epson-escpage.c epson-escpage.h \
-	epson-escpage-color.c epson-escpage-color.h \
-	epson-escpage-comp.c epson-escpage-comp.h \
-	epson-escpage-mono.c epson-escpage-mono.h \
 	epson-escpr-api.c epson-escpr-api.h \
 	epson-escpr-dbg.c epson-escpr-dbg.h \
 	epson-escpr-def.h \

diff --git a/lib/Makefile.in b/lib/Makefile.in
@@ -132,10 +132,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libescpr_la_LIBADD =
 am_libescpr_la_OBJECTS = libescpr_la-epson-cbt.lo \
-	libescpr_la-epson-escpage.lo \
-	libescpr_la-epson-escpage-color.lo \
-	libescpr_la-epson-escpage-comp.lo \
-	libescpr_la-epson-escpage-mono.lo \
 	libescpr_la-epson-escpr-api.lo libescpr_la-epson-escpr-dbg.lo \
 	libescpr_la-epson-escpr-mem.lo libescpr_la-epson-escpr-pm.lo \
 	libescpr_la-epson-escpr-services.lo \
@@ -344,27 +340,25 @@ top_srcdir = @top_srcdir@
 ################################################################
 # Extend function
 ################################################################
+#DEFINES 		+=	-DGCOMSW_CMD_ESCPAGE
 
 ################################################################
 # Language
 ################################################################
+#DEFINES 		+=	-DGCOMSW_CMD_ESCPAGE
 
 ################################################################
 # Use Async job process
 # Use raw file print
 DEFINES = -DGCOMSW_PRT_USE_USB -DGCOMSW_PRT_USE_LPR \
-	-DGCOMSW_PRT_USE_RAW -DGCOMSW_CMD_ESCPAGE -DGCOMSW_EL_CDLABEL \
-	-DGCOMSW_EF_MAINTE -DGCOMSW_CMD_ESCPAGE -DEPS_FILTER \
-	-DGCOMSW_ASYNCJOB_SUPPORT -DGCOMSW_RAWFILE_SUPPORT
+	-DGCOMSW_PRT_USE_RAW -DGCOMSW_EL_CDLABEL -DGCOMSW_EF_MAINTE \
+	-DEPS_FILTER -DGCOMSW_ASYNCJOB_SUPPORT \
+	-DGCOMSW_RAWFILE_SUPPORT
 lib_LTLIBRARIES = libescpr.la
 libescpr_la_CFLAGS = -Wall $(DEFINES)
 CLEANFILES = libescpr.la
 libescpr_la_SOURCES = \
 	epson-cbt.c epson-cbt.h \
-	epson-escpage.c epson-escpage.h \
-	epson-escpage-color.c epson-escpage-color.h \
-	epson-escpage-comp.c epson-escpage-comp.h \
-	epson-escpage-mono.c epson-escpage-mono.h \
 	epson-escpr-api.c epson-escpr-api.h \
 	epson-escpr-dbg.c epson-escpr-dbg.h \
 	epson-escpr-def.h \
@@ -462,10 +456,6 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libescpr_la-epson-cbt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libescpr_la-epson-escpage-color.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libescpr_la-epson-escpage-comp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libescpr_la-epson-escpage-mono.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libescpr_la-epson-escpage.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libescpr_la-epson-escpr-api.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libescpr_la-epson-escpr-dbg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libescpr_la-epson-escpr-mem.Plo@am__quote@
@@ -506,34 +496,6 @@ libescpr_la-epson-cbt.lo: epson-cbt.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libescpr_la_CFLAGS) $(CFLAGS) -c -o libescpr_la-epson-cbt.lo `test -f 'epson-cbt.c' || echo '$(srcdir)/'`epson-cbt.c
 
-libescpr_la-epson-escpage.lo: epson-escpage.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libescpr_la_CFLAGS) $(CFLAGS) -MT libescpr_la-epson-escpage.lo -MD -MP -MF $(DEPDIR)/libescpr_la-epson-escpage.Tpo -c -o libescpr_la-epson-escpage.lo `test -f 'epson-escpage.c' || echo '$(srcdir)/'`epson-escpage.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libescpr_la-epson-escpage.Tpo $(DEPDIR)/libescpr_la-epson-escpage.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='epson-escpage.c' object='libescpr_la-epson-escpage.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libescpr_la_CFLAGS) $(CFLAGS) -c -o libescpr_la-epson-escpage.lo `test -f 'epson-escpage.c' || echo '$(srcdir)/'`epson-escpage.c
-
-libescpr_la-epson-escpage-color.lo: epson-escpage-color.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libescpr_la_CFLAGS) $(CFLAGS) -MT libescpr_la-epson-escpage-color.lo -MD -MP -MF $(DEPDIR)/libescpr_la-epson-escpage-color.Tpo -c -o libescpr_la-epson-escpage-color.lo `test -f 'epson-escpage-color.c' || echo '$(srcdir)/'`epson-escpage-color.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libescpr_la-epson-escpage-color.Tpo $(DEPDIR)/libescpr_la-epson-escpage-color.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='epson-escpage-color.c' object='libescpr_la-epson-escpage-color.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libescpr_la_CFLAGS) $(CFLAGS) -c -o libescpr_la-epson-escpage-color.lo `test -f 'epson-escpage-color.c' || echo '$(srcdir)/'`epson-escpage-color.c
-
-libescpr_la-epson-escpage-comp.lo: epson-escpage-comp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libescpr_la_CFLAGS) $(CFLAGS) -MT libescpr_la-epson-escpage-comp.lo -MD -MP -MF $(DEPDIR)/libescpr_la-epson-escpage-comp.Tpo -c -o libescpr_la-epson-escpage-comp.lo `test -f 'epson-escpage-comp.c' || echo '$(srcdir)/'`epson-escpage-comp.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libescpr_la-epson-escpage-comp.Tpo $(DEPDIR)/libescpr_la-epson-escpage-comp.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='epson-escpage-comp.c' object='libescpr_la-epson-escpage-comp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libescpr_la_CFLAGS) $(CFLAGS) -c -o libescpr_la-epson-escpage-comp.lo `test -f 'epson-escpage-comp.c' || echo '$(srcdir)/'`epson-escpage-comp.c
-
-libescpr_la-epson-escpage-mono.lo: epson-escpage-mono.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libescpr_la_CFLAGS) $(CFLAGS) -MT libescpr_la-epson-escpage-mono.lo -MD -MP -MF $(DEPDIR)/libescpr_la-epson-escpage-mono.Tpo -c -o libescpr_la-epson-escpage-mono.lo `test -f 'epson-escpage-mono.c' || echo '$(srcdir)/'`epson-escpage-mono.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libescpr_la-epson-escpage-mono.Tpo $(DEPDIR)/libescpr_la-epson-escpage-mono.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='epson-escpage-mono.c' object='libescpr_la-epson-escpage-mono.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libescpr_la_CFLAGS) $(CFLAGS) -c -o libescpr_la-epson-escpage-mono.lo `test -f 'epson-escpage-mono.c' || echo '$(srcdir)/'`epson-escpage-mono.c
-
 libescpr_la-epson-escpr-api.lo: epson-escpr-api.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libescpr_la_CFLAGS) $(CFLAGS) -MT libescpr_la-epson-escpr-api.lo -MD -MP -MF $(DEPDIR)/libescpr_la-epson-escpr-api.Tpo -c -o libescpr_la-epson-escpr-api.lo `test -f 'epson-escpr-api.c' || echo '$(srcdir)/'`epson-escpr-api.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libescpr_la-epson-escpr-api.Tpo $(DEPDIR)/libescpr_la-epson-escpr-api.Plo

diff --git a/lsb/lsb-rpm.spec b/lsb/lsb-rpm.spec
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA.
 
 %define pkg     epson-inkjet-printer-escpr
-%define ver     1.8.3
+%define ver     1.8.4
 %define rel     1
 
 # used in RPM macro set for the LSB Driver Development Kit