Merge branch 'release/debian/1.2.1-1'debian/1.2.1-1

1 files changed, 0 insertions, 36 deletions

diff --git a/debian/patches/0055-Fix_build_error.patch b/debian/patches/0055-Fix_build_error.patch
deleted file mode 100644
index b1b09b1..0000000
--- a/debian/patches/0055-Fix_build_error.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix build error
-Author: Jörg Frings-Fürst <debian@jff.email>
-Forwarded: not-needed
-Last-Update: 2020-08-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/po/POTFILES.in
-===================================================================
---- trunk.orig/po/POTFILES.in
-+++ trunk/po/POTFILES.in
-@@ -65,7 +65,7 @@ backend/p5.c
- backend/p5.h
- backend/p5_device.c
- backend/pixma/pixma.c
--backend/pixma/pixma_sane_options.c
-+backend/pixma/pixma_sane_options.c 
- backend/plustek.c
- backend/plustek_pp.c
- backend/pnm.c
-Index: trunk/backend/Makefile.am
-===================================================================
---- trunk.orig/backend/Makefile.am
-+++ trunk/backend/Makefile.am
-@@ -947,10 +947,10 @@ $(srcdir)/pixma/pixma.c: \
- 
- $(srcdir)/pixma/pixma_sane_options.h:
- 	@echo Generating $@ from $(@D)/pixma.c
--	@(cd $(@D); python scripts/pixma_gen_options.py h < pixma.c > $(@F))
-+	@(cd $(@D); python3 scripts/pixma_gen_options.py h < pixma.c > $(@F))
- $(srcdir)/pixma/pixma_sane_options.c:
- 	@echo Generating $@ from $(@D)/pixma.c
--	@(cd $(@D); python scripts/pixma_gen_options.py   < pixma.c > $(@F))
-+	@(cd $(@D); python3 scripts/pixma_gen_options.py   < pixma.c > $(@F))
- 
- EXTRA_DIST += pixma/pixma_sane_options.c
- EXTRA_DIST += pixma/pixma_sane_options.h