Hello,

I discussed my wish also with wRAR at IRC #debian-mentors. He pointed
out to me that my versioning was wrong.

So I correct it a new build and a new patch file which i applied.


-- 
Mechtilde Stehmann
## Debian Developer
## Loook, calender-exchange-provider, libreoffice-canzeley-client
## PGP encryption welcome
## Key-ID 0x141AAD7F
diff -Nru loook-0.8.4/debian/changelog loook-0.8.4/debian/changelog
--- loook-0.8.4/debian/changelog	2016-02-13 17:06:14.000000000 +0100
+++ loook-0.8.4/debian/changelog	2017-12-26 17:43:48.000000000 +0100
@@ -1,3 +1,12 @@
+loook (0.8.4-1+deb9u1) UNRELEASED; urgency=medium
+
+  * now it is possible to search in directories which also contains password protected files.
+    + fix for bug #884582
+  * Change E-Mail address of Maintainer after becoming DD in control and
+    in changelog
+
+ -- Mechtilde Stehmann <mechti...@debian.org>  Tue, 26 Dec 2017 17:43:48 +0100
+
 loook (0.8.4-1) unstable; urgency=low
 
   * New Upstream release
diff -Nru loook-0.8.4/debian/control loook-0.8.4/debian/control
--- loook-0.8.4/debian/control	2016-02-13 17:04:49.000000000 +0100
+++ loook-0.8.4/debian/control	2017-12-26 17:41:40.000000000 +0100
@@ -1,7 +1,7 @@
 Source: loook
 Section: utils
 Priority: optional
-Maintainer: Mechtilde Stehmann <o...@mechtilde.de>
+Maintainer: Mechtilde Stehmann <mechti...@debian.org>
 Build-Depends: debhelper (>= 9), gettext
 Standards-Version: 3.9.7
 Homepage: http://mechtilde.de/Loook/
diff -Nru loook-0.8.4/debian/patches/fix884582.patch loook-0.8.4/debian/patches/fix884582.patch
--- loook-0.8.4/debian/patches/fix884582.patch	1970-01-01 01:00:00.000000000 +0100
+++ loook-0.8.4/debian/patches/fix884582.patch	2017-12-26 17:39:36.000000000 +0100
@@ -0,0 +1,80 @@
+Description: fix for bug #884582-now it is possible to search in directories which also contains password protected files.
+Forwarded: Yes
+Author: Mechtilde Stehmann <mechti...@debian.org>
+Last-Update: 2017-12-26
+Index: loook-0.8.4/loook.py
+===================================================================
+--- loook-0.8.4.orig/loook.py	2016-02-13 17:03:15.000000000 +0100
++++ loook-0.8.4/loook.py	2017-12-26 17:38:07.327473839 +0100
+@@ -213,7 +213,7 @@
+ 		"""Start OOo to view the file. This method lacks 
+ 		error handling (TODO)."""
+ 		items = event.widget.curselection()
+-		filename = "%s%s" % (self.search_path.get(), event.widget.get(items[0]))
++		filename = os.path.join(self.search_path.get(), event.widget.get(items[0]))
+ 		filename = os.path.normpath(filename)
+ 		prg = self.ooo_path.get()
+ 		if not prg:
+@@ -223,10 +223,7 @@
+ 			cmd = "\"%s\" \"%s\" &" % (prg, filename)
+ 			self.status.config(text=_("Starting viewer..."))
+ 			print(cmd)
+-			try:
+-				res = os.system(cmd)
+-			except UnicodeError:
+-				res = os.system(cmd)
++			res = os.system(cmd)
+ 			if res != 0:
+ 				# don't show a dialog, this check might not be system-indepenent:
+ 				print(_("Warning: Command returned code != 0: ") + cmd)
+@@ -273,6 +270,8 @@
+ 
+ 	def processFile(self, filename, query):
+ 		suffix = self.getSuffix(filename)
++		# needed for error messages
++		fsfilename =filename
+ 		try:
+ 			# Handle OpenOffice.org files:
+ 			if suffix in ('sxw', 'stw',		# OOo   1.x swriter
+@@ -299,7 +298,7 @@
+ 
+ 						if filename.endswith("document.xml"):
+ 							content += str(zip.read(filename), 'utf-8')
+-							
++
+ 					content = self.removeXMLMarkup(content, replace_with_space=0)
+ 					docinfo = str(zip.read("meta.xml"), 'utf-8')
+ 					docinfo = self.removeXMLMarkup(docinfo, replace_with_space=0)
+@@ -307,6 +306,10 @@
+ 				except KeyError as err:
+ 					print("Warning: %s not found in '%s'" % (err, filename))
+ 					return None
++				# Patch for encrypted files
++				except UnicodeDecodeError:
++					print("Warning: cannot open '%s'" % (fsfilename))
++					return None
+ 				title = ""
+ 				title_match = re.compile("<dc:title>(.*?)</dc:title>", re.DOTALL|re.IGNORECASE).search(docinfo)
+ 				if title_match:
+@@ -339,6 +342,10 @@
+ 				except KeyError as err:
+ 					print("Warning: %s not found in '%s'" % (err, filename))
+ 					return None
++				# Patch for encrypted files
++				except UnicodeDecodeError:
++					print("Warning: cannot open '%s'" % (fsfilename))
++					return None
+ 				title = ""
+ 				title_match = re.compile("<dc:title>(.*?)</dc:title>", re.DOTALL|re.IGNORECASE).search(docinfo)
+ 				if title_match:
+@@ -368,6 +375,10 @@
+ 				except KeyError as err:
+ 					print("Warning: %s not found in '%s'" % (err, filename))
+ 					return None
++				# Patch for encrypted files
++				except UnicodeDecodeError:
++					print("Warning: cannot open '%s'" % (fsfilename))
++					return None
+ 				title = ""
+ 				title_match = re.compile("<dc:title>(.*?)</dc:title>", re.DOTALL|re.IGNORECASE).search(docinfo)
+ 				if title_match:
diff -Nru loook-0.8.4/debian/patches/series loook-0.8.4/debian/patches/series
--- loook-0.8.4/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ loook-0.8.4/debian/patches/series	2017-12-26 17:36:52.000000000 +0100
@@ -0,0 +1 @@
+fix884582.patch

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to