Update patches

3 files changed, 2 insertions, 64 deletions

diff --git a/debian/patches/0001-Fix-quoting-when-generate-zsh-completion.patch b/debian/patches/0001-Fix-quoting-when-generate-zsh-completion.patch
deleted file mode 100644
index b077877..0000000
--- a/debian/patches/0001-Fix-quoting-when-generate-zsh-completion.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Agustin Henze <tin@sluc.org.ar>
-Date: Tue, 21 Oct 2014 10:44:45 -0300
-Subject: Fix quoting when generate zsh completion
-
----
- nikola/plugins/command/import_wordpress.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nikola/plugins/command/import_wordpress.py b/nikola/plugins/command/import_wordpress.py
-index 1af4083..6e8a13c 100644
---- a/nikola/plugins/command/import_wordpress.py
-+++ b/nikola/plugins/command/import_wordpress.py
-@@ -70,7 +70,7 @@ class CommandImportWordpress(Command, ImportMixin):
-             'short': 'd',
-             'default': False,
-             'type': bool,
--            'help': "Don't import drafts",
-+            'help': "Do not import drafts",
-         },
-         {
-             'name': 'squash_newlines',
diff --git a/debian/patches/0002-Replace-strict-dependency-on-dateutil-for-the-current-one-in-debian.patch b/debian/patches/0002-Replace-strict-dependency-on-dateutil-for-the-current-one-in-debian.patch
deleted file mode 100644
index 8c9d19d..0000000
--- a/debian/patches/0002-Replace-strict-dependency-on-dateutil-for-the-current-one-in-debian.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,7 +1,7 @@
- doit==0.28.0
- Pygments>=1.6
- Pillow>=2.4.0
--python-dateutil==2.4.2
-+python-dateutil>=2.2
- docutils>=0.12
- mako>=1.0.0
- unidecode>=0.04.16
---- a/nikola/plugins/command/init.py
-+++ b/nikola/plugins/command/init.py
-@@ -355,15 +355,13 @@
-                 tz = dateutil.tz.gettz(answer)
- 
-                 if tz is None:
--                    print("    WARNING: Time zone not found.  Searching list of time zones for a match.")
--                    zonesfile = tarfile.open(fileobj=dateutil.zoneinfo.getzoneinfofile_stream())
-+                    print("    WARNING: Time zone not found.  Searching most common timezones for a match.")
-+                    zonesfile = tarfile.TarFile.open(os.path.join(dateutil.zoneinfo.ZONEINFOFILE))
-                     zonenames = [zone for zone in zonesfile.getnames() if answer.lower() in zone.lower()]
-                     if len(zonenames) == 1:
-                         tz = dateutil.tz.gettz(zonenames[0])
--                        answer = zonenames[0]
--                        print("    Picking '{0}'.".format(answer))
-                     elif len(zonenames) > 1:
--                        print("    The following time zones match your query:")
-+                        print("    Could not pick one timezone. Choose one of the following:")
-                         print('        ' + '\n        '.join(zonenames))
-                         continue
- 
-@@ -372,7 +370,7 @@
-                     print("    Current time in {0}: {1}".format(answer, time))
-                     answered = ask_yesno("Use this time zone?", True)
-                 else:
--                    print("    ERROR: No matches found.  Please try again.")
-+                    print("    ERROR: Time zone not found.  Please try again.  Time zones are case-sensitive.")
- 
-             SAMPLE_CONF['TIMEZONE'] = answer
- 
diff --git a/debian/patches/series b/debian/patches/series
index dd51b34..4189085 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-0001-Fix-quoting-when-generate-zsh-completion.patch
-0002-Replace-strict-dependency-on-dateutil-for-the-current-one-in-debian.patch
+Fix-quoting-when-generate-zsh-completion.patch
+Replace-strict-dependency-on-dateutil-for-the-current-one-in-debian.patch