[Python-modules-commits] [django-nose] 07/12: Refresh patches for 1.4.5.

Michael Fladischer fladi at moszumanska.debian.org
Tue Oct 17 13:34:38 UTC 2017


This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch debian/master
in repository django-nose.

commit 1037db1f120f29df59e220ad5722c7bd6e8248b1
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Tue Oct 17 13:55:15 2017 +0200

    Refresh patches for 1.4.5.
---
 debian/changelog                                          |  4 ++++
 ...Remove-unnecessary-dependency-on-dj_database_url.patch | 15 ++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a0a255..3c1ab9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 django-nose (1.4.4-2) UNRELEASED; urgency=medium
 
+  [ Thomas Goirand ]
   * Refresh patches after git-dpm to gbp pq conversion
 
+  [ Michael Fladischer ]
+  * Refresh patches for 1.4.5.
+
  -- Thomas Goirand <zigo at debian.org>  Tue, 17 Oct 2017 13:51:10 +0200
 
 django-nose (1.4.4-1) unstable; urgency=medium
diff --git a/debian/patches/0002-Remove-unnecessary-dependency-on-dj_database_url.patch b/debian/patches/0002-Remove-unnecessary-dependency-on-dj_database_url.patch
index a1a589d..be9de44 100644
--- a/debian/patches/0002-Remove-unnecessary-dependency-on-dj_database_url.patch
+++ b/debian/patches/0002-Remove-unnecessary-dependency-on-dj_database_url.patch
@@ -5,14 +5,14 @@ Subject: Remove unnecessary dependency on dj_database_url.
 Importing dj_database_url for a simple test application is not necessary,
 replace the static database configuration with a defautl one from Django.
 ---
- testapp/settings.py | 14 ++++----------
- 1 file changed, 4 insertions(+), 10 deletions(-)
+ testapp/settings.py | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
 
 diff --git a/testapp/settings.py b/testapp/settings.py
-index 51a157f..1f23cdd 100644
+index a803307..0e42345 100644
 --- a/testapp/settings.py
 +++ b/testapp/settings.py
-@@ -11,19 +11,13 @@ NOSE_PLUGINS - Comma-separated list of plugins to add
+@@ -11,20 +11,17 @@ NOSE_PLUGINS - Comma-separated list of plugins to add
  from __future__ import print_function
  from os import environ, path
  
@@ -21,9 +21,10 @@ index 51a157f..1f23cdd 100644
  BASE_DIR = path.dirname(path.dirname(__file__))
  
 -
--def rel_path(*subpaths):
--    """Construct the full path given a relative path."""
--    return path.join(BASE_DIR, *subpaths)
+ def rel_path(*subpaths):
+     """Construct the full path given a relative path."""
+     return path.join(BASE_DIR, *subpaths)
+ 
 -
  DATABASES = {
 -    'default':

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-nose.git



More information about the Python-modules-commits mailing list