From 8a97edc722c205b7d1f84b629cb0b11f2269235c Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Fri, 15 Feb 2019 09:48:41 +0100
Subject: [PATCH] Fixed the "missing" values to mention python3

---
 packaging/debian/debian/control | 4 +++-
 src/filters/rcl7z               | 2 +-
 src/filters/rclaudio            | 2 +-
 src/filters/rclchm              | 2 +-
 src/filters/rclepub             | 2 +-
 src/filters/rclepub1            | 2 +-
 src/filters/rclics              | 4 ++--
 src/filters/rclimg.py           | 2 +-
 src/filters/rclkar              | 2 +-
 src/filters/rclrar              | 2 +-
 src/filters/rcltar              | 2 +-
 src/filters/rcltxtlines.py      | 2 +-
 12 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control
index 28be05e7..c329de7b 100644
--- a/packaging/debian/debian/control
+++ b/packaging/debian/debian/control
@@ -13,12 +13,14 @@ Build-Depends: autotools-dev,
                libxslt1-dev,
                libz-dev,
                python-dev (>= 2.6.6-3~),
+               python-setuptools,
                python3-all-dev,
+               python3-setuptools,
                qt5-default,
                qt5-qmake,
                libqt5webkit5-dev,
                qtbase5-dev
-X-Python-Version: >= 3.4
+X-Python3-Version: >= 3.4
 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/recoll.git
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/recoll.git
 Homepage: http://www.lesbonscomptes.com/recoll
diff --git a/src/filters/rcl7z b/src/filters/rcl7z
index bfd4efac..9dc167ab 100755
--- a/src/filters/rcl7z
+++ b/src/filters/rcl7z
@@ -14,7 +14,7 @@ import rclexecm
 try:
     from py7zlib import Archive7z
 except:
-    print("RECFILTERROR HELPERNOTFOUND python:py7zlib")
+    print("RECFILTERROR HELPERNOTFOUND python3:py7zlib")
     sys.exit(1);
 
 try:
diff --git a/src/filters/rclaudio b/src/filters/rclaudio
index fa299673..2d86e2f7 100755
--- a/src/filters/rclaudio
+++ b/src/filters/rclaudio
@@ -15,7 +15,7 @@ try:
     from mutagen import File
     from mutagen.id3 import ID3TimeStamp
 except:
-    print("RECFILTERROR HELPERNOTFOUND python:mutagen")
+    print("RECFILTERROR HELPERNOTFOUND python3:mutagen")
     sys.exit(1);
 
 
diff --git a/src/filters/rclchm b/src/filters/rclchm
index 6d71b32e..e7164975 100755
--- a/src/filters/rclchm
+++ b/src/filters/rclchm
@@ -37,7 +37,7 @@ except:
     try:
         from recollchm import chm,chmlib
     except:
-        print("RECFILTERROR HELPERNOTFOUND python:chm")
+        print("RECFILTERROR HELPERNOTFOUND python3:chm")
         sys.exit(1);
 
 # Small helper routines
diff --git a/src/filters/rclepub b/src/filters/rclepub
index 3914f3d0..db1758e4 100755
--- a/src/filters/rclepub
+++ b/src/filters/rclepub
@@ -16,7 +16,7 @@ sys.path.append(sys.path[0]+"/recollepub.zip")
 try:
     import epub
 except:
-    print("RECFILTERROR HELPERNOTFOUND python:epub")
+    print("RECFILTERROR HELPERNOTFOUND python3:epub")
     sys.exit(1);
 
 class rclEPUB:
diff --git a/src/filters/rclepub1 b/src/filters/rclepub1
index 6ecb9c82..44931bff 100755
--- a/src/filters/rclepub1
+++ b/src/filters/rclepub1
@@ -13,7 +13,7 @@ sys.path.append(sys.path[0]+"/recollepub.zip")
 try:
     import epub
 except:
-    print("RECFILTERROR HELPERNOTFOUND python:epub")
+    print("RECFILTERROR HELPERNOTFOUND python3:epub")
     sys.exit(1);
 
 class EPUBConcatExtractor(RclBaseHandler):
diff --git a/src/filters/rclics b/src/filters/rclics
index 592b645d..b6c7386a 100755
--- a/src/filters/rclics
+++ b/src/filters/rclics
@@ -28,8 +28,8 @@ if usemodule != "internal":
             import vobject
             usemodule = "vobject"
         except:
-            print("RECFILTERROR HELPERNOTFOUND python:icalendar")
-            print("RECFILTERROR HELPERNOTFOUND python:vobject")
+            print("RECFILTERROR HELPERNOTFOUND python3:icalendar")
+            print("RECFILTERROR HELPERNOTFOUND python3:vobject")
             sys.exit(1);
 
 
diff --git a/src/filters/rclimg.py b/src/filters/rclimg.py
index ef633b22..99447e63 100755
--- a/src/filters/rclimg.py
+++ b/src/filters/rclimg.py
@@ -17,7 +17,7 @@ from rclbasehandler import RclBaseHandler
 try:
     import pyexiv2
 except:
-    print("RECFILTERROR HELPERNOTFOUND python:pyexiv2")
+    print("RECFILTERROR HELPERNOTFOUND python3:pyexiv2")
     sys.exit(1);
 
 khexre = re.compile('.*\.0[xX][0-9a-fA-F]+$')
diff --git a/src/filters/rclkar b/src/filters/rclkar
index e1981985..d7221de3 100755
--- a/src/filters/rclkar
+++ b/src/filters/rclkar
@@ -20,7 +20,7 @@ except:
 try:
     import rclmidi as midi
 except:
-    print("RECFILTERROR HELPERNOTFOUND python:midi")
+    print("RECFILTERROR HELPERNOTFOUND python3:midi")
     sys.exit(1);
 
 try:
diff --git a/src/filters/rclrar b/src/filters/rclrar
index 89b08749..8bfd38e2 100755
--- a/src/filters/rclrar
+++ b/src/filters/rclrar
@@ -25,7 +25,7 @@ import rclexecm
 try:
     from rarfile import RarFile
 except:
-    print("RECFILTERROR HELPERNOTFOUND python:rarfile")
+    print("RECFILTERROR HELPERNOTFOUND python3:rarfile")
     sys.exit(1);
 
 # Requires RarFile python module. Try "sudo pip install rarfile" or
diff --git a/src/filters/rcltar b/src/filters/rcltar
index 80f7bda9..1c678cd6 100755
--- a/src/filters/rcltar
+++ b/src/filters/rcltar
@@ -13,7 +13,7 @@ import rclexecm
 try:
     import tarfile
 except:
-    print("RECFILTERROR HELPERNOTFOUND python:tarfile")
+    print("RECFILTERROR HELPERNOTFOUND python3:tarfile")
     sys.exit(1);
 
 class TarExtractor:
diff --git a/src/filters/rcltxtlines.py b/src/filters/rcltxtlines.py
index 3a657e1a..982b675e 100755
--- a/src/filters/rcltxtlines.py
+++ b/src/filters/rcltxtlines.py
@@ -17,7 +17,7 @@ import rclexecm
 try:
     import sys
 except:
-    print("RECFILTERROR HELPERNOTFOUND python:sys")
+    print("RECFILTERROR HELPERNOTFOUND python3:sys")
     sys.exit(1);
 
 # Our class.