summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/.git-dpm14
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
-rw-r--r--debian/patches/0001-The-upstream-buildsystem-touches-files-under-debian-.patch2
-rw-r--r--debian/patches/0002-include-xfifo.h-to-avoid-implicit-pointer-conversion.patch4
-rw-r--r--debian/patches/0003-Fix-suc-c-essful-typo-in-debug-message.patch22
-rw-r--r--debian/patches/series1
7 files changed, 42 insertions, 11 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 19a7c48..9f85283 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,8 +1,8 @@
# see git-dpm(1) from git-dpm package
-0c54679e4586b1d8ac28f683e86c68bb5308d1a1
-0c54679e4586b1d8ac28f683e86c68bb5308d1a1
-4f69f04cc13b56d1ce02ed42cc7f06b243f0b747
-4f69f04cc13b56d1ce02ed42cc7f06b243f0b747
-epson-inkjet-printer-escpr_1.6.17.orig.tar.gz
-2040ebd82c4a095f86c1259b9f9de44108f60f6f
-3866776
+1b6d2bda68ba5cdb72260ccf44c3ae8de58f131f
+1b6d2bda68ba5cdb72260ccf44c3ae8de58f131f
+7077efe9ebf339e0a2f92d3223d50b970743d908
+7077efe9ebf339e0a2f92d3223d50b970743d908
+epson-inkjet-printer-escpr_1.6.21.orig.tar.gz
+d6e7862c9d931646a1a14b4675bb172d053bf7b2
+4096372
diff --git a/debian/changelog b/debian/changelog
index 08096da..bd43f23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+epson-inkjet-printer-escpr (1.6.21-1) unstable; urgency=medium
+
+ * New upstream version 1.6.21
+ * Bump S-V to 4.1.4 without changes needed
+ * Fix suc{,c}essful typo in debug message
+
+ -- Didier Raboud <odyx@debian.org> Mon, 11 Jun 2018 20:11:15 +0200
+
epson-inkjet-printer-escpr (1.6.17-2) unstable; urgency=medium
* Bump Standards-Version to 4.1.3 without changes needed
diff --git a/debian/control b/debian/control
index a7a8070..5d8ed69 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 10.2.5~),
libcups2-dev,
libcupsimage2-dev,
pyppd (>= 1.0.1-2~)
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
Vcs-Browser: https://salsa.debian.org/printing-team/epson-inkjet-printer-escpr
Vcs-Git: https://salsa.debian.org/printing-team/epson-inkjet-printer-escpr.git
Homepage: http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX&productName=B700
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
index e1909c5..b37b852 100644
--- a/debian/patches/0001-The-upstream-buildsystem-touches-files-under-debian-.patch
+++ b/debian/patches/0001-The-upstream-buildsystem-touches-files-under-debian-.patch
@@ -1,4 +1,4 @@
-From fb663699b71813f8e71cf918d01f04afaf5c932f Mon Sep 17 00:00:00 2001
+From e74b714456e0ec73c3dac82486ca0ec87f187cda 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
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
index cde3af8..99d4003 100644
--- 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
@@ -1,4 +1,4 @@
-From 0c54679e4586b1d8ac28f683e86c68bb5308d1a1 Mon Sep 17 00:00:00 2001
+From ce10aeb9138895385e210f99a09411e5872d9122 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
@@ -10,7 +10,7 @@ Last-Update: 2016-02-19
1 file changed, 1 insertion(+)
diff --git a/src/filter.c b/src/filter.c
-index 0e0abae..4b8d7c2 100755
+index 330268e..42a6366 100755
--- a/src/filter.c
+++ b/src/filter.c
@@ -42,6 +42,7 @@
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
new file mode 100644
index 0000000..43ce3e3
--- /dev/null
+++ b/debian/patches/0003-Fix-suc-c-essful-typo-in-debug-message.patch
@@ -0,0 +1,22 @@
+From 1b6d2bda68ba5cdb72260ccf44c3ae8de58f131f 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 100755
+--- 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
index 9e7e0c5..c2cecec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
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