[Python-modules-commits] [django-fsm] 02/10: Initialize git-dpm

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository django-fsm.

commit 120faa890c5ba4be3ea9228a2bb7a6d8712bd4e4
Merge: fe043cf 996e6d4
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Oct 16 11:10:35 2015 +0200

    Initialize git-dpm

 debian/.git-dpm                            |  8 ++++++++
 debian/patches/remove_django_jenkins.patch | 22 +++++++++++++++-------
 tests/settings.py                          |  7 +------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --cc debian/.git-dpm
index 0000000,0000000..89f6255
new file mode 100644
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,0 -1,0 +1,8 @@@
++# see git-dpm(1) from git-dpm package
++996e6d42afa20778e7ce62f63dc56e56a880b429
++996e6d42afa20778e7ce62f63dc56e56a880b429
++5f5423d4d9b8b666bf3fb139c335ed6ad993def1
++5f5423d4d9b8b666bf3fb139c335ed6ad993def1
++django-fsm_2.2.1.orig.tar.gz
++ba33d561dd308e24b3b5854e1438bd257fb34fa8
++17669
diff --cc debian/patches/remove_django_jenkins.patch
index 723f3e7,0000000..1ab9eda
mode 100644,000000..100644
--- a/debian/patches/remove_django_jenkins.patch
+++ b/debian/patches/remove_django_jenkins.patch
@@@ -1,28 -1,0 +1,36 @@@
- Description: Remove django-jenkins from test dependencies
++From 996e6d42afa20778e7ce62f63dc56e56a880b429 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <fladi at debian.org>
++Date: Fri, 16 Oct 2015 11:10:35 +0200
++Subject: Remove django-jenkins from test dependencies
++
 + Upstream uses django-jenkins for test integration but it is optional in just
 + running the tests. This patch removes django-jenkins from the test
 + settings.py file.
- Author: Michael Fladischer <fladi at debian.org>
 +Last-Update: 2015-06-24
 +Forwarded: not-needed
 +
- Index: django-fsm/tests/settings.py
- ===================================================================
- --- django-fsm.orig/tests/settings.py	2015-06-22 16:34:03.000000000 +0200
- +++ django-fsm/tests/settings.py	2015-06-22 17:29:41.337936140 +0200
++Patch-Name: remove_django_jenkins.patch
++---
++ tests/settings.py | 7 +------
++ 1 file changed, 1 insertion(+), 6 deletions(-)
++
++diff --git a/tests/settings.py b/tests/settings.py
++index 4363d79..ce14802 100644
++--- a/tests/settings.py
+++++ b/tests/settings.py
 +@@ -1,5 +1,5 @@
 + PROJECT_APPS = ('django_fsm', 'testapp',)
 +-INSTALLED_APPS = ('django.contrib.contenttypes', 'django.contrib.auth', 'django_jenkins',) + PROJECT_APPS
 ++INSTALLED_APPS = ('django.contrib.contenttypes', 'django.contrib.auth') + PROJECT_APPS
 + DATABASE_ENGINE = 'sqlite3'
 + SECRET_KEY = 'nokey'
 + MIDDLEWARE_CLASSES = ()
- @@ -8,8 +8,3 @@
++@@ -8,8 +8,3 @@ DATABASES = {
 +         'ENGINE': 'django.db.backends.sqlite3',
 +         }
 + }
 +-
 +-JENKINS_TASKS = (
 +-    'django_jenkins.tasks.run_pep8',
 +-    'django_jenkins.tasks.run_pyflakes'
 +-)

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