diff -Nru dirspec-13.10/debian/changelog dirspec-13.10/debian/changelog --- dirspec-13.10/debian/changelog 2015-07-22 06:37:16.000000000 +0000 +++ dirspec-13.10/debian/changelog 2015-10-02 13:04:34.000000000 +0000 @@ -1,47 +1,25 @@ -dirspec (13.10-0ubuntu4) wily; urgency=medium +dirspec (13.10-1ubuntu1) wily; urgency=medium - * No-change rebuild for python3.5 transition - - -- Steve Langasek Wed, 22 Jul 2015 06:37:16 +0000 - -dirspec (13.10-0ubuntu3) utopic; urgency=medium - - * Add 01_fix_pep8.patch: Fix PEP-8 errors, causing FTBFS/test failure. - - -- Martin Pitt Thu, 09 Oct 2014 14:50:09 +0200 - -dirspec (13.10-0ubuntu2) trusty; urgency=medium - - * Rebuild to drop files installed into /usr/share/pyshared. - - -- Matthias Klose Sun, 23 Feb 2014 13:47:05 +0000 - -dirspec (13.10-0ubuntu1) saucy; urgency=low - - * New upstream release. - - -- Rodney Dawes Tue, 08 Oct 2013 13:26:03 -0400 - -dirspec (13.08-0ubuntu1) saucy; urgency=low - - * New upstream release. - * debian/watch: - - Update to new series. + * Resynchronize with Debian, fix build/pep8 issues + * Remaining changes + * debian/control, debian/tests/control: + - Add autopkgtest tests. - -- Rodney Dawes Tue, 06 Aug 2013 15:05:02 -0400 + -- Sebastien Bacher Fri, 02 Oct 2015 15:02:28 +0200 -dirspec (4.2.0-1ubuntu2) saucy; urgency=low +dirspec (13.10-1) unstable; urgency=medium - * debian/control: Expect stderr output. + * Sync version number with ubuntu (no changes) + * Patch for pep8 warnings and E731 (Closes: #798666) + * Add dh-python to Build-deps - -- Martin Pitt Thu, 25 Jul 2013 17:40:03 +0200 + -- Micah Anderson Sun, 20 Sep 2015 17:13:49 -0400 -dirspec (4.2.0-1ubuntu1) saucy; urgency=low +dirspec (4.2.0-2) unstable; urgency=medium - * debian/control, debian/tests: - - Add autopkgtest tests. + * Fix for PEP8 E128 causing FTBFS (Closes: #759958) - -- Rodney Dawes Tue, 09 Jul 2013 17:12:50 -0400 + -- Micah Anderson Mon, 15 Sep 2014 13:15:41 -0400 dirspec (4.2.0-1) unstable; urgency=low diff -Nru dirspec-13.10/debian/control dirspec-13.10/debian/control --- dirspec-13.10/debian/control 2013-10-08 17:25:16.000000000 +0000 +++ dirspec-13.10/debian/control 2015-10-02 13:05:29.000000000 +0000 @@ -2,6 +2,7 @@ Section: python Priority: extra Build-Depends: + dh-python, debhelper (>= 7.0.50), pep8, pyflakes, diff -Nru dirspec-13.10/debian/patches/00_ignore_pc.patch dirspec-13.10/debian/patches/00_ignore_pc.patch --- dirspec-13.10/debian/patches/00_ignore_pc.patch 2013-10-08 17:25:16.000000000 +0000 +++ dirspec-13.10/debian/patches/00_ignore_pc.patch 2015-09-20 21:34:09.000000000 +0000 @@ -1,11 +1,12 @@ === modified file 'run-tests' ---- old/run-tests 2012-07-19 17:14:19 +0000 -+++ new/run-tests 2012-07-19 17:16:08 +0000 -@@ -28,5 +28,5 @@ fi +Index: dirspec-13.10/run-tests +=================================================================== +--- dirspec-13.10.orig/run-tests 2013-08-05 12:52:40.000000000 -0400 ++++ dirspec-13.10/run-tests 2015-09-20 17:33:59.000000000 -0400 +@@ -28,5 +28,5 @@ # Run the style checks pyflakes dirspec setup.py -pep8 --repeat . setup.py +pep8 --exclude=.pc --repeat . setup.py - diff -Nru dirspec-13.10/debian/patches/01_fix_pep8.patch dirspec-13.10/debian/patches/01_fix_pep8.patch --- dirspec-13.10/debian/patches/01_fix_pep8.patch 2014-10-09 12:50:04.000000000 +0000 +++ dirspec-13.10/debian/patches/01_fix_pep8.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -Description: Fix PEP-8 errors, causing FTBFS/test failure -Author: Martin Pitt -Forwarded: https://code.launchpad.net/~pitti/dirspec/pep8/+merge/237776 - -=== modified file 'dirspec/utils.py' ---- old/dirspec/utils.py 2012-07-18 23:20:25 +0000 -+++ new/dirspec/utils.py 2014-10-09 12:46:32 +0000 -@@ -171,8 +171,8 @@ - default_config_path = b'/Library/Preferences:/etc/xdg' - default_config_home = os.path.join(user_home, b'Library', b'Preferences') - default_data_path = b':'.join([b'/Library/Application Support', -- b'/usr/local/share', -- b'/usr/share']) -+ b'/usr/local/share', -+ b'/usr/share']) - default_data_home = os.path.join(user_home, b'Library', - b'Application Support') - else: - diff -Nru dirspec-13.10/debian/patches/fix_PEP8-E128 dirspec-13.10/debian/patches/fix_PEP8-E128 --- dirspec-13.10/debian/patches/fix_PEP8-E128 1970-01-01 00:00:00.000000000 +0000 +++ dirspec-13.10/debian/patches/fix_PEP8-E128 2014-09-15 17:13:52.000000000 +0000 @@ -0,0 +1,15 @@ +Index: dirspec-4.2.0/dirspec/utils.py +=================================================================== +--- dirspec-4.2.0.orig/dirspec/utils.py 2013-03-26 13:33:45.000000000 -0400 ++++ dirspec-4.2.0/dirspec/utils.py 2014-09-15 13:13:45.863011270 -0400 +@@ -171,8 +171,8 @@ + default_config_path = b'/Library/Preferences:/etc/xdg' + default_config_home = os.path.join(user_home, b'Library', b'Preferences') + default_data_path = b':'.join([b'/Library/Application Support', +- b'/usr/local/share', +- b'/usr/share']) ++ b'/usr/local/share', ++ b'/usr/share']) + default_data_home = os.path.join(user_home, b'Library', + b'Application Support') + else: diff -Nru dirspec-13.10/debian/patches/pep8_problems dirspec-13.10/debian/patches/pep8_problems --- dirspec-13.10/debian/patches/pep8_problems 1970-01-01 00:00:00.000000000 +0000 +++ dirspec-13.10/debian/patches/pep8_problems 2015-09-20 21:40:12.000000000 +0000 @@ -0,0 +1,16 @@ +Index: dirspec-13.10/dirspec/utils.py +=================================================================== +--- dirspec-13.10.orig/dirspec/utils.py 2015-09-20 17:39:09.583750158 -0400 ++++ dirspec-13.10/dirspec/utils.py 2015-09-20 17:40:10.171648942 -0400 +@@ -145,8 +145,9 @@ + # per http://msdn.microsoft.com/en-us/library/windows/desktop/bb762181, + # SHGetFolderPath is deprecated, replaced by SHGetKnownFolderPath + # (http://msdn.microsoft.com/en-us/library/windows/desktop/bb762188) +- get_path = lambda name: shell.SHGetFolderPath( +- 0, getattr(shellcon, name), None, 0).encode('utf8') ++ def get_path(name): ++ return shell.SHGetFolderPath(0, getattr(shellcon, name), ++ None, 0).encode('utf8') + special_folders['Personal'] = get_path("CSIDL_PROFILE") + special_folders['Local AppData'] = get_path("CSIDL_LOCAL_APPDATA") + special_folders['AppData'] = os.path.dirname( diff -Nru dirspec-13.10/debian/patches/pep-8_warnings dirspec-13.10/debian/patches/pep-8_warnings --- dirspec-13.10/debian/patches/pep-8_warnings 1970-01-01 00:00:00.000000000 +0000 +++ dirspec-13.10/debian/patches/pep-8_warnings 2015-09-20 21:37:37.000000000 +0000 @@ -0,0 +1,27 @@ +Index: dirspec-13.10/dirspec/utils.py +=================================================================== +--- dirspec-13.10.orig/dirspec/utils.py 2013-08-05 12:52:40.000000000 -0400 ++++ dirspec-13.10/dirspec/utils.py 2015-09-20 17:32:52.764379283 -0400 +@@ -145,8 +145,9 @@ + # per http://msdn.microsoft.com/en-us/library/windows/desktop/bb762181, + # SHGetFolderPath is deprecated, replaced by SHGetKnownFolderPath + # (http://msdn.microsoft.com/en-us/library/windows/desktop/bb762188) +- get_path = lambda name: shell.SHGetFolderPath( +- 0, getattr(shellcon, name), None, 0).encode('utf8') ++ def get_path(name): ++ return shell.SHGetFolderPath(0, getattr(shellcon, name), ++ None, 0).encode('utf8') + special_folders['Personal'] = get_path("CSIDL_PROFILE") + special_folders['Local AppData'] = get_path("CSIDL_LOCAL_APPDATA") + special_folders['AppData'] = os.path.dirname( +@@ -171,8 +172,8 @@ + default_config_path = b'/Library/Preferences:/etc/xdg' + default_config_home = os.path.join(user_home, b'Library', b'Preferences') + default_data_path = b':'.join([b'/Library/Application Support', +- b'/usr/local/share', +- b'/usr/share']) ++ b'/usr/local/share', ++ b'/usr/share']) + default_data_home = os.path.join(user_home, b'Library', + b'Application Support') + else: diff -Nru dirspec-13.10/debian/patches/series dirspec-13.10/debian/patches/series --- dirspec-13.10/debian/patches/series 2014-10-09 12:49:28.000000000 +0000 +++ dirspec-13.10/debian/patches/series 2015-09-20 21:33:20.000000000 +0000 @@ -1,2 +1,3 @@ -01_fix_pep8.patch +pep8_problems 00_ignore_pc.patch +fix_PEP8-E128 diff -Nru dirspec-13.10/debian/watch dirspec-13.10/debian/watch --- dirspec-13.10/debian/watch 2013-10-08 17:25:16.000000000 +0000 +++ dirspec-13.10/debian/watch 2013-03-26 18:02:56.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -http://launchpad.net/dirspec/stable-13-10 .*/dirspec-([0-9.]+)\.tar\.gz +http://launchpad.net/dirspec/stable-4-2 .*/dirspec-([0-9.]+)\.tar\.gz