From 542b6738a68521c646641d678e92adeafcd9e9d9 Mon Sep 17 00:00:00 2001 From: Philipp Huebner Date: Tue, 6 Mar 2018 17:59:14 +0100 Subject: [PATCH] Debian: Package 1.10.0-1 --- packaging/debian/debian/changelog | 7 +++ .../debian/debian/patches/fix-makefile.patch | 44 ------------------- packaging/debian/debian/patches/series | 1 - packaging/debian/debian/rules | 1 + 4 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 packaging/debian/debian/patches/fix-makefile.patch delete mode 100644 packaging/debian/debian/patches/series diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog index 39e5ab4..bb6fd9d 100644 --- a/packaging/debian/debian/changelog +++ b/packaging/debian/debian/changelog @@ -1,3 +1,10 @@ +yamllint (1.10.0-1) unstable; urgency=medium + + * New upstream version 1.10.0 + * Drop patches (fixed upstream) + + -- Philipp Huebner Thu, 16 Nov 2017 19:18:18 +0100 + yamllint (1.9.0-1) unstable; urgency=medium * New upstream version 1.9.0 diff --git a/packaging/debian/debian/patches/fix-makefile.patch b/packaging/debian/debian/patches/fix-makefile.patch deleted file mode 100644 index c97a7a4..0000000 --- a/packaging/debian/debian/patches/fix-makefile.patch +++ /dev/null @@ -1,44 +0,0 @@ -Description: use python3 instead of python in tests - On Debian systems python is still python2, so use python3 explicitely instead -Author: Philipp Huebner - -Index: yamllint/tests/test_module.py -=================================================================== ---- yamllint.orig/tests/test_module.py -+++ yamllint/tests/test_module.py -@@ -46,7 +46,7 @@ class ModuleTestCase(unittest.TestCase): - - def test_run_module_no_args(self): - with self.assertRaises(subprocess.CalledProcessError) as ctx: -- subprocess.check_output(['python', '-m', 'yamllint'], -+ subprocess.check_output(['python3', '-m', 'yamllint'], - stderr=subprocess.STDOUT) - self.assertEqual(ctx.exception.returncode, 2) - self.assertRegexpMatches(ctx.exception.output.decode(), -@@ -54,7 +54,7 @@ class ModuleTestCase(unittest.TestCase): - - def test_run_module_on_bad_dir(self): - with self.assertRaises(subprocess.CalledProcessError) as ctx: -- subprocess.check_output(['python', '-m', 'yamllint', -+ subprocess.check_output(['python3', '-m', 'yamllint', - '/does/not/exist'], - stderr=subprocess.STDOUT) - self.assertRegexpMatches(ctx.exception.output.decode(), -@@ -62,7 +62,7 @@ class ModuleTestCase(unittest.TestCase): - - def test_run_module_on_file(self): - out = subprocess.check_output( -- ['python', '-m', 'yamllint', os.path.join(self.wd, 'warn.yaml')]) -+ ['python3', '-m', 'yamllint', os.path.join(self.wd, 'warn.yaml')]) - lines = out.decode().splitlines() - self.assertIn('/warn.yaml', lines[0]) - self.assertEqual('\n'.join(lines[1:]), -@@ -71,7 +71,7 @@ class ModuleTestCase(unittest.TestCase): - - def test_run_module_on_dir(self): - with self.assertRaises(subprocess.CalledProcessError) as ctx: -- subprocess.check_output(['python', '-m', 'yamllint', self.wd]) -+ subprocess.check_output(['python3', '-m', 'yamllint', self.wd]) - self.assertEqual(ctx.exception.returncode, 1) - - files = ctx.exception.output.decode().split('\n\n') diff --git a/packaging/debian/debian/patches/series b/packaging/debian/debian/patches/series deleted file mode 100644 index c6d2ef7..0000000 --- a/packaging/debian/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-makefile.patch diff --git a/packaging/debian/debian/rules b/packaging/debian/debian/rules index bee4631..ac8acde 100755 --- a/packaging/debian/debian/rules +++ b/packaging/debian/debian/rules @@ -1,4 +1,5 @@ #!/usr/bin/make -f +export DH_VERBOSE=1 %: NOSE_EXCLUDE=test_run_colored_output \