[Python-modules-commits] [nose] 01/01: Convert patches to git-dpm format
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Mon Oct 30 20:27:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
mitya57 pushed a commit to branch debian/master
in repository nose.
commit 1f6cd019e7dbde284893ac179938c475ec7111ec
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Mon Oct 30 23:24:54 2017 +0300
Convert patches to git-dpm format
---
...ompatible-with-Coverage.py-4.1.patch => coverage4.1.diff} | 1 -
.../{disable-unstable-tests => disable-unstable-tests.diff} | 3 ---
.../{no-distribute_setup => no-distribute_setup.diff} | 3 ---
.../{no-google-analytics => no-google-analytics.diff} | 3 ---
debian/patches/{no-install-data => no-install-data.diff} | 8 +++-----
...ame__-on-derived-classe.patch => python3.5-qualname.diff} | 6 +-----
debian/patches/series | 12 ++++++------
7 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/debian/patches/0006-Make-coverage-plugin-compatible-with-Coverage.py-4.1.patch b/debian/patches/coverage4.1.diff
similarity index 96%
rename from debian/patches/0006-Make-coverage-plugin-compatible-with-Coverage.py-4.1.patch
rename to debian/patches/coverage4.1.diff
index a7a78df..15432a5 100644
--- a/debian/patches/0006-Make-coverage-plugin-compatible-with-Coverage.py-4.1.patch
+++ b/debian/patches/coverage4.1.diff
@@ -1,4 +1,3 @@
-From bec238f776c0121d7be097b4e8e6b965f90d9375 Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57 at gmail.com>
Date: Wed, 29 Jun 2016 13:15:16 +0300
Subject: Make coverage plugin compatible with Coverage.py 4.1
diff --git a/debian/patches/disable-unstable-tests b/debian/patches/disable-unstable-tests.diff
similarity index 95%
rename from debian/patches/disable-unstable-tests
rename to debian/patches/disable-unstable-tests.diff
index 110ee0b..deecf86 100644
--- a/debian/patches/disable-unstable-tests
+++ b/debian/patches/disable-unstable-tests.diff
@@ -1,12 +1,9 @@
-From f15c252c5e4e8b1ea9d6924b2a9bec4efbacbd00 Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57 at gmail.com>
Date: Thu, 8 Oct 2015 10:02:00 -0700
Subject: Disable some unstable tests in multiprocessing module
Forwarded: not-needed
Last-Update: 2014-05-04
-
-Patch-Name: disable-unstable-tests
---
functional_tests/test_multiprocessing/test_keyboardinterrupt.py | 2 ++
functional_tests/test_multiprocessing/test_process_timeout.py | 2 ++
diff --git a/debian/patches/no-distribute_setup b/debian/patches/no-distribute_setup.diff
similarity index 88%
rename from debian/patches/no-distribute_setup
rename to debian/patches/no-distribute_setup.diff
index 93654c6..a029700 100644
--- a/debian/patches/no-distribute_setup
+++ b/debian/patches/no-distribute_setup.diff
@@ -1,4 +1,3 @@
-From decd72017fb1400fd4afb4bfae2dabee1d81a333 Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor at debian.org>
Date: Thu, 8 Oct 2015 10:01:59 -0700
Subject: Don't even think about using distribute_setup to download things
@@ -6,8 +5,6 @@ Subject: Don't even think about using distribute_setup to download things
Forwarded: not-needed
Last-Update: 2012-02-03
-
-Patch-Name: no-distribute_setup
---
setup.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/debian/patches/no-google-analytics b/debian/patches/no-google-analytics.diff
similarity index 88%
rename from debian/patches/no-google-analytics
rename to debian/patches/no-google-analytics.diff
index 89f00e4..a209ffb 100644
--- a/debian/patches/no-google-analytics
+++ b/debian/patches/no-google-analytics.diff
@@ -1,12 +1,9 @@
-From 8de672fb0d7d512c95472d10e99b17e51890f79c Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor at debian.org>
Date: Thu, 8 Oct 2015 10:01:58 -0700
Subject: Remove Google Analytics tracking JS
Forwarded: not-needed
Last-Update: 2013-03-04
-
-Patch-Name: no-google-analytics
---
doc/.templates/layout.html | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/debian/patches/no-install-data b/debian/patches/no-install-data.diff
similarity index 78%
rename from debian/patches/no-install-data
rename to debian/patches/no-install-data.diff
index f2bb862..6f2f17a 100644
--- a/debian/patches/no-install-data
+++ b/debian/patches/no-install-data.diff
@@ -1,13 +1,11 @@
-From 5498e10a2aa0527b5ec9c0bc1c6deb0dae7508e2 Mon Sep 17 00:00:00 2001
From: Charlie Smotherman <cjsmo at cableone.net>
Date: Thu, 8 Oct 2015 10:01:57 -0700
Subject: Don't install manpage with setup.py.
- Use debhelper to install manpage so we can use update-alternatives to
- manage the manpages.
-Last-Update: 2013-03-04
+Use debhelper to install manpage so we can use update-alternatives to
+manage the manpages.
-Patch-Name: no-install-data
+Last-Update: 2013-03-04
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/0005-Set-__qualname__-equal-to-__name__-on-derived-classe.patch b/debian/patches/python3.5-qualname.diff
similarity index 87%
rename from debian/patches/0005-Set-__qualname__-equal-to-__name__-on-derived-classe.patch
rename to debian/patches/python3.5-qualname.diff
index 269bbff..6c19bb6 100644
--- a/debian/patches/0005-Set-__qualname__-equal-to-__name__-on-derived-classe.patch
+++ b/debian/patches/python3.5-qualname.diff
@@ -1,12 +1,8 @@
-From bbca2ea3f3b7e3dee0b7e2198b56196b1478c6ce Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57 at gmail.com>
Date: Mon, 1 Feb 2016 00:05:30 +0300
Subject: Set __qualname__ equal to __name__ on derived classes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-To make output on Python ≥ 3.5 the same as on previous Python versions.
+To make output on Python 3.5+ the same as on previous Python versions.
This fixes #928.
---
diff --git a/debian/patches/series b/debian/patches/series
index cb84ee5..d39fdc5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
-no-install-data
-no-google-analytics
-no-distribute_setup
-disable-unstable-tests
-0005-Set-__qualname__-equal-to-__name__-on-derived-classe.patch
-0006-Make-coverage-plugin-compatible-with-Coverage.py-4.1.patch
+no-install-data.diff
+no-google-analytics.diff
+no-distribute_setup.diff
+disable-unstable-tests.diff
+python3.5-qualname.diff
+coverage4.1.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/nose.git
More information about the Python-modules-commits
mailing list