git-debrebase convert-from-dgit-view: drop upstream changes from breakwater

Drop upstream changes, and delete debian/patches, as part of converting
to git-debrebase format.  Upstream changes will appear as commits.

[git-debrebase convert-from-dgit-view drop-patches]

11 files changed, 266 insertions, 91 deletions

diff --git a/Makefile.am b/Makefile.am
index 5ccbb04..cf62595 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,6 +25,10 @@ DIST_SUBDIRS = $(SUBDIRS)
 
 ACLOCAL_AMFLAGS = -I m4
 
+noinst_DATA = \
+	debian/control \
+	debian/rules
+
 debian/control: $(srcdir)/Makefile $(srcdir)/debian/control.in
 	rm -f $@ $@.tmp; \
 	sed -e 's|[@]PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|' \
@@ -64,6 +68,14 @@ EXTRA_DIST = \
 	README \
 	README.ja \
 	bootstrap \
+	debian/changelog \
+	debian/compat \
+	debian/control.in \
+	debian/copyright \
+	debian/docs \
+	debian/postinst \
+	debian/postrm \
+	debian/rules.in \
 	epson-inkjet-printer-escpr.spec \
 	epson-inkjet-printer-escpr.spec.in \
 	lsb/lsb-rpm.spec \
diff --git a/debian/control.in b/debian/control.in
new file mode 100644
index 0000000..70fb0a9
--- /dev/null
+++ b/debian/control.in
@@ -0,0 +1,20 @@
+Source: @PACKAGE_TARNAME@
+Section: contrib/misc
+Priority: optional
+Maintainer: @PACKAGE_BUGREPORT@
+Build-Depends: debhelper (>= 5)
+Standards-Version: 3.7.2
+
+Package: @PACKAGE_TARNAME@
+Architecture: any
+Depends: ${shlibs:Depends}, cups
+Description: @PACKAGE_NAME@
+ This software is a filter program used with Common UNIX Printing
+ System (CUPS) from the Linux. This can supply the high quality print
+ with Seiko Epson Color Ink Jet Printers.
+ .
+ This product supports only EPSON ESC/P-R printers. This package can be
+ used for all EPSON ESC/P-R printers.
+ .
+ For detail list of supported printer, please refer to below site:
+ http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..0ce55d4
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,5 @@
+AUTHORS
+COPYING
+NEWS
+README
+README.ja
diff --git a/debian/patches/0001-The-upstream-buildsystem-touches-files-under-debian-.patch b/debian/patches/0001-The-upstream-buildsystem-touches-files-under-debian-.patch
deleted file mode 100644
index 4ce9cef..0000000
--- a/debian/patches/0001-The-upstream-buildsystem-touches-files-under-debian-.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From caa3ae31681269a4e7826502019f1831050953a6 Mon Sep 17 00:00:00 2001
-From: Didier Raboud <odyx@debian.org>
-Date: Tue, 27 Sep 2016 10:42:31 +0200
-Subject: The upstream buildsystem touches files under debian/, forbid him to
- do so.
-
-Last-Update: 2011-10-21
----
- Makefile.am | 12 ------------
- 1 file changed, 12 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index cf62595..5ccbb04 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -25,10 +25,6 @@ DIST_SUBDIRS = $(SUBDIRS)
- 
- ACLOCAL_AMFLAGS = -I m4
- 
--noinst_DATA = \
--	debian/control \
--	debian/rules
--
- debian/control: $(srcdir)/Makefile $(srcdir)/debian/control.in
- 	rm -f $@ $@.tmp; \
- 	sed -e 's|[@]PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|' \
-@@ -68,14 +64,6 @@ EXTRA_DIST = \
- 	README \
- 	README.ja \
- 	bootstrap \
--	debian/changelog \
--	debian/compat \
--	debian/control.in \
--	debian/copyright \
--	debian/docs \
--	debian/postinst \
--	debian/postrm \
--	debian/rules.in \
- 	epson-inkjet-printer-escpr.spec \
- 	epson-inkjet-printer-escpr.spec.in \
- 	lsb/lsb-rpm.spec \
diff --git a/debian/patches/0002-include-xfifo.h-to-avoid-implicit-pointer-conversion.patch b/debian/patches/0002-include-xfifo.h-to-avoid-implicit-pointer-conversion.patch
deleted file mode 100644
index fffe844..0000000
--- a/debian/patches/0002-include-xfifo.h-to-avoid-implicit-pointer-conversion.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3a9e9afd65f817a79af5a6024d8296b5c80be3a9 Mon Sep 17 00:00:00 2001
-From: Logan Rosen <logan@ubuntu.com>
-Date: Tue, 27 Sep 2016 10:42:32 +0200
-Subject: include xfifo.h to avoid implicit pointer conversion
-
-Forwarded: no
-Last-Update: 2016-02-19
----
- src/filter.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/filter.c b/src/filter.c
-index 330268e..42a6366 100644
---- a/src/filter.c
-+++ b/src/filter.c
-@@ -42,6 +42,7 @@
- #include "libprtX.h"
- #include "optBase.h"
- #include "linux_cmn.h"
-+#include "xfifo.h"
- 
- #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
- 
diff --git a/debian/patches/0003-Fix-suc-c-essful-typo-in-debug-message.patch b/debian/patches/0003-Fix-suc-c-essful-typo-in-debug-message.patch
deleted file mode 100644
index 5c10292..0000000
--- a/debian/patches/0003-Fix-suc-c-essful-typo-in-debug-message.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a2e97b14afc2647862d1584c8b468861b2c9e162 Mon Sep 17 00:00:00 2001
-From: Didier Raboud <odyx@debian.org>
-Date: Mon, 11 Jun 2018 20:08:46 +0200
-Subject: Fix suc{,c}essful typo in debug message
-
----
- src/filter.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/filter.c b/src/filter.c
-index 42a6366..e12e289 100644
---- a/src/filter.c
-+++ b/src/filter.c
-@@ -551,7 +551,7 @@ main (int argc, char *argv[])
- 				pagebuf = startpage;
- 				free (pagebuf);
- 			}
--			debug_msg("free page sucessfull\n");
-+			debug_msg("free page successfull\n");
- 			err = epsEndPage(FALSE);
- 
- 			if(err)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c2cecec..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-The-upstream-buildsystem-touches-files-under-debian-.patch
-0002-include-xfifo.h-to-avoid-implicit-pointer-conversion.patch
-0003-Fix-suc-c-essful-typo-in-debug-message.patch
diff --git a/debian/postinst b/debian/postinst
new file mode 100644
index 0000000..2329385
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,57 @@
+#!/bin/sh
+# postinst -- postinst script for epson-inkjet-printer-escpr
+# see: dh_installdeb(1)
+#
+# Epson Inkjet Printer Driver (ESC/P-R) for Linux
+# Copyright (C) Seiko Epson Corporation 2014.
+#  This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA.
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+        ln -s /opt/epson-inkjet-printer-escpr/share/cups/model/epson-inkjet-printer-escpr /usr/share/ppd/epson-inkjet-printer-escpr
+        ldconfig
+    ;;
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000..3d005fa
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,53 @@
+#!/bin/sh
+# postrm -- postrm script for epson-inkjet-printer-escpr
+# see: dh_installdeb(1)
+#
+# Epson Inkjet Printer Driver (ESC/P-R) for Linux
+# Copyright (C) Seiko Epson Corporation 2014.
+#  This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA.
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+        ldconfig
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules.in b/debian/rules.in
new file mode 100644
index 0000000..41625b6
--- /dev/null
+++ b/debian/rules.in
@@ -0,0 +1,118 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# rules.in -- templete file to create Debian package
+#
+# Epson Inkjet Printer Driver (ESC/P-R) for Linux
+# Copyright (C) Seiko Epson Corporation 2016.
+#  This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# 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)
+
+
+CFLAGS = -Wall
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+		--disable-lsb \
+		@INTERNAL_PPD_OPTION@ \
+		--prefix=/usr \
+		--with-cupsfilterdir=@CUPS_FILTER_DIR@ \
+		--with-cupsppddir=@CUPS_PPD_DIR@
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/@PACKAGE_TARNAME@.
+	$(MAKE) DESTDIR=$(CURDIR)/debian/@PACKAGE_TARNAME@ install
+
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+#	dh_installchangelogs ChangeLog
+	dh_installdocs
+#	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+#	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+	dh_makeshlibs
+	dh_installdeb
+#	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb -- -Z gzip
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/src/filter.c b/src/filter.c
index e12e289..330268e 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -42,7 +42,6 @@
 #include "libprtX.h"
 #include "optBase.h"
 #include "linux_cmn.h"
-#include "xfifo.h"
 
 #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
 
@@ -551,7 +550,7 @@ main (int argc, char *argv[])
 				pagebuf = startpage;
 				free (pagebuf);
 			}
-			debug_msg("free page successfull\n");
+			debug_msg("free page sucessfull\n");
 			err = epsEndPage(FALSE);
 
 			if(err)