diff options
| author | Andrew Shadura <andrewsh@debian.org> | 2014-03-11 00:35:43 +0100 |
|---|---|---|
| committer | Andrew Shadura <andrew@shadura.me> | 2015-08-20 15:58:28 +0200 |
| commit | d24bbfcea1fd03e19045e458b82ed0d76bf2f413 (patch) | |
| tree | 8fb7f1e1e5082823934f3f79c1ac1efe5ca37de4 /debian | |
| parent | 37c65f4becd805c719ddb729436c149c586ffa2e (diff) | |
| parent | 25d6c405aff4167e801d0a4995083a56160b969e (diff) | |
Imported Debian patch 0.1.39-1
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/01-sphinx-config.patch | 11 | ||||
| -rw-r--r-- | debian/patches/01-tests.patch | 39 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
4 files changed, 46 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog index 745ac59..41b99e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-reconfigure (0.1.39-1) unstable; urgency=medium + + * New upstream release. + + -- Andrew Shadura <andrewsh@debian.org> Tue, 11 Mar 2014 00:35:43 +0100 + python-reconfigure (0.1.29-2) unstable; urgency=low * Upload to unstable. diff --git a/debian/patches/01-sphinx-config.patch b/debian/patches/01-sphinx-config.patch deleted file mode 100644 index e007a79..0000000 --- a/debian/patches/01-sphinx-config.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/docs/source/conf.py -+++ b/docs/source/conf.py -@@ -30,7 +30,7 @@ - - - # -- Options for HTML output --------------------------------------------------- --html_theme = 'air' -+#html_theme = 'air' - #html_theme_options = {} - html_theme_path = ['../../../sphinx-themes'] - diff --git a/debian/patches/01-tests.patch b/debian/patches/01-tests.patch new file mode 100644 index 0000000..404b138 --- /dev/null +++ b/debian/patches/01-tests.patch @@ -0,0 +1,39 @@ +From c874052721f1fc362f0363c11af33fe03a20d2f2 Mon Sep 17 00:00:00 2001 +From: Eugene Pankov <john.pankov@gmail.com> +Date: Mon, 10 Feb 2014 13:42:52 +0300 +Subject: [PATCH] tests fix + +--- + reconfigure/includers/auto.py | 2 +- + reconfigure/tests/configs/supervisor_tests.py | 1 + + reconfigure/tests/includers/nginx_tests.py | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/reconfigure/includers/auto.py b/reconfigure/includers/auto.py +index c220d88..b5ba35a 100644 +--- a/reconfigure/includers/auto.py ++++ b/reconfigure/includers/auto.py +@@ -52,7 +52,7 @@ def decompose_rec(self, node, result): + else: + if child.origin is None: + child.origin = node.origin +- elif child.origin != node.origin: ++ if child.origin != node.origin: + node.children.remove(child) + result.setdefault(child.origin, RootNode()).children.append(self.decompose_rec(child, result)) + else: +diff --git a/reconfigure/tests/configs/supervisor_tests.py b/reconfigure/tests/configs/supervisor_tests.py +index b304654..644f78a 100644 +--- a/reconfigure/tests/configs/supervisor_tests.py ++++ b/reconfigure/tests/configs/supervisor_tests.py +@@ -16,6 +16,7 @@ class SupervisorConfigTest (BaseConfigTest): + result = { + "programs": [ + { ++ "comment": None, + "autorestart": None, + "name": "test1", + "startsecs": None, +-- +1.8.5.5 + diff --git a/debian/patches/series b/debian/patches/series index 88f8645..2fbc70e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -01-sphinx-config.patch +01-tests.patch |