[Python-apps-commits] r9069 - in packages/alot/trunk/debian/patches (5 files)

[laarmen-guest at users.alioth.debian.org]

    Date: Tuesday, August 28, 2012 @ 13:30:45
  Author: laarmen-guest
Revision: 9069

Use consistent file extension in d/patches

Added:
  packages/alot/trunk/debian/patches/0004-enable-doc-sidebar.patch
    (from rev 9061, packages/alot/trunk/debian/patches/0004-enable-doc-sidebar)
  packages/alot/trunk/debian/patches/0006-fix-config-error-typo.patch
    (from rev 9068, packages/alot/trunk/debian/patches/0006-fix-config-error-typo)
Modified:
  packages/alot/trunk/debian/patches/series
Deleted:
  packages/alot/trunk/debian/patches/0004-enable-doc-sidebar
  packages/alot/trunk/debian/patches/0006-fix-config-error-typo

Deleted: packages/alot/trunk/debian/patches/0004-enable-doc-sidebar
===================================================================
--- packages/alot/trunk/debian/patches/0004-enable-doc-sidebar	2012-08-27 17:58:06 UTC (rev 9068)
+++ packages/alot/trunk/debian/patches/0004-enable-doc-sidebar	2012-08-28 13:30:45 UTC (rev 9069)
@@ -1,16 +0,0 @@
-Description: Enable documentation sidebar
-Author: Simon Chopin <chopin.simon at gmail.com>
-Bug: http://github.com/pazz/alot/issues/504
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/docs/source/conf.py
-+++ b/docs/source/conf.py
-@@ -126,7 +126,7 @@
- # Theme options are theme-specific and customize the look and feel of a theme
- # further.  For a list of options available for each theme, see the
- # documentation.
--html_theme_options = {'nosidebar': True}
-+html_theme_options = {}
- 
- # Add any paths that contain custom themes here, relative to this directory.
- #html_theme_path = []

Copied: packages/alot/trunk/debian/patches/0004-enable-doc-sidebar.patch (from rev 9061, packages/alot/trunk/debian/patches/0004-enable-doc-sidebar)
===================================================================
--- packages/alot/trunk/debian/patches/0004-enable-doc-sidebar.patch	                        (rev 0)
+++ packages/alot/trunk/debian/patches/0004-enable-doc-sidebar.patch	2012-08-28 13:30:45 UTC (rev 9069)
@@ -0,0 +1,16 @@
+Description: Enable documentation sidebar
+Author: Simon Chopin <chopin.simon at gmail.com>
+Bug: http://github.com/pazz/alot/issues/504
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -126,7 +126,7 @@
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further.  For a list of options available for each theme, see the
+ # documentation.
+-html_theme_options = {'nosidebar': True}
++html_theme_options = {}
+ 
+ # Add any paths that contain custom themes here, relative to this directory.
+ #html_theme_path = []

Deleted: packages/alot/trunk/debian/patches/0006-fix-config-error-typo
===================================================================
--- packages/alot/trunk/debian/patches/0006-fix-config-error-typo	2012-08-27 17:58:06 UTC (rev 9068)
+++ packages/alot/trunk/debian/patches/0006-fix-config-error-typo	2012-08-28 13:30:45 UTC (rev 9069)
@@ -1,17 +0,0 @@
-Description: Fix a typo in the error message for unreadble config file.
-Author: Simon Chopin <chopin.simon at gmail.com>
-Origin: vendor
-Applied-Upstream: f050a250526dfc38336150518819aa2d7bfadd72
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/alot/settings/utils.py
-+++ b/alot/settings/utils.py
-@@ -25,7 +25,7 @@
-         config = ConfigObj(infile=configpath, configspec=specpath,
-                            file_error=True, encoding='UTF8')
-     except (ConfigObjError, IOError):
--        raise ConfigError('Couls not read %s' % configpath)
-+        raise ConfigError('Could not read %s' % configpath)
-     except UnboundLocalError:
-         # this works around a bug in configobj
-         msg = '%s is malformed. Check for sections without parents..'

Copied: packages/alot/trunk/debian/patches/0006-fix-config-error-typo.patch (from rev 9068, packages/alot/trunk/debian/patches/0006-fix-config-error-typo)
===================================================================
--- packages/alot/trunk/debian/patches/0006-fix-config-error-typo.patch	                        (rev 0)
+++ packages/alot/trunk/debian/patches/0006-fix-config-error-typo.patch	2012-08-28 13:30:45 UTC (rev 9069)
@@ -0,0 +1,17 @@
+Description: Fix a typo in the error message for unreadble config file.
+Author: Simon Chopin <chopin.simon at gmail.com>
+Origin: vendor
+Applied-Upstream: f050a250526dfc38336150518819aa2d7bfadd72
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/alot/settings/utils.py
++++ b/alot/settings/utils.py
+@@ -25,7 +25,7 @@
+         config = ConfigObj(infile=configpath, configspec=specpath,
+                            file_error=True, encoding='UTF8')
+     except (ConfigObjError, IOError):
+-        raise ConfigError('Couls not read %s' % configpath)
++        raise ConfigError('Could not read %s' % configpath)
+     except UnboundLocalError:
+         # this works around a bug in configobj
+         msg = '%s is malformed. Check for sections without parents..'

Modified: packages/alot/trunk/debian/patches/series
===================================================================
--- packages/alot/trunk/debian/patches/series	2012-08-27 17:58:06 UTC (rev 9068)
+++ packages/alot/trunk/debian/patches/series	2012-08-28 13:30:45 UTC (rev 9069)
@@ -1,5 +1,5 @@
 0001-Add-a-hidden-TOC-for-the-manpage.patch
 0003-Replace-non-ascii-char.patch
-0004-enable-doc-sidebar
+0004-enable-doc-sidebar.patch
 0005-patch-out-_templates.patch
-0006-fix-config-error-typo
+0006-fix-config-error-typo.patch