summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAndrew Shadura <andrewsh@debian.org>2014-06-29 23:52:18 +0200
committerAndrew Shadura <andrew@shadura.me>2015-08-20 15:58:30 +0200
commite291e1eb02076fde5f2cfee4f1d01091a2319da3 (patch)
tree8fd2df78e635156aa667b15004c1db039bf747fa /debian
parentd24bbfcea1fd03e19045e458b82ed0d76bf2f413 (diff)
parentfec1da7e6ea8a3b3b03befa4ff8dd31d539f163d (diff)
Imported Debian patch 0.1.50+git20140603-1
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/control1
-rw-r--r--debian/patches/01-tests.patch39
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules13
5 files changed, 14 insertions, 48 deletions
diff --git a/debian/changelog b/debian/changelog
index 41b99e6..ec50b61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-reconfigure (0.1.50+git20140603-1) unstable; urgency=medium
+
+ * New upstream snapshot.
+ * Drop old patches.
+ * Use pybuild.
+
+ -- Andrew Shadura <andrewsh@debian.org> Sun, 29 Jun 2014 23:52:18 +0200
+
python-reconfigure (0.1.39-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 9de13f0..5c8b8b8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: python
Priority: optional
Maintainer: Andrew Shadura <andrewsh@debian.org>
Build-Depends:
+ dh-python,
python-setuptools (>= 0.6.24),
python-all (>= 2.6.6-3),
python-sphinx (>= 1.0.7+dfsg) | python3-sphinx,
diff --git a/debian/patches/01-tests.patch b/debian/patches/01-tests.patch
deleted file mode 100644
index 404b138..0000000
--- a/debian/patches/01-tests.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index 2fbc70e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-tests.patch
diff --git a/debian/rules b/debian/rules
index 956298c..4d1de0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,17 @@
#!/usr/bin/make -f
%:
- dh $@ --with python2,sphinxdoc
+ dh $@ --with python2,sphinxdoc --buildsystem=pybuild
override_dh_auto_build:
dh_auto_build
$(MAKE) doc
-override_dh_auto_install:
- dh_auto_install -- COMPILE=--install-layout=deb
+override_dh_auto_clean:
+ rm -rf docs/build/*
+ dh_auto_clean
override_dh_installchangelogs:
dh_installchangelogs -X docs
-override_dh_auto_clean:
- rm -rf build build-stamp configure-stamp build/ MANIFEST
- dh_auto_clean || true
-
-.PHONY: override_dh_auto_build override_dh_auto_install override_dh_installchangelogs override_dh_auto_clean
+.PHONY: override_dh_auto_build override_dh_auto_clean override_dh_installchangelogs