[Python-modules-commits] [django-environ] 06/09: merge patched into master

[Brian May]

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

bam pushed a commit to branch master
in repository django-environ.

commit a11ebb7ec8dd038beb993551ae82e8e56fefccd7
Merge: bb1f366 860209d
Author: Brian May <brian at linuxpenguins.xyz>
Date:   Wed Jan 6 19:03:03 2016 +1100

    merge patched into master

 debian/.git-dpm                             |  4 +--
 debian/patches/0001-Add-missing-files.patch | 46 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 environ/test_env.txt                        | 29 ++++++++++++++++++
 4 files changed, 78 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 6a3a30c,0000000..fe91ef3
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 9520c121f4db5a3d2bc32cde71ac10a4289d040f
- 9520c121f4db5a3d2bc32cde71ac10a4289d040f
++860209d6de299bd9cd2e0f0ac1cd50f944da502a
++860209d6de299bd9cd2e0f0ac1cd50f944da502a
 +9520c121f4db5a3d2bc32cde71ac10a4289d040f
 +9520c121f4db5a3d2bc32cde71ac10a4289d040f
 +python-django-environ_0.4.0.orig.tar.gz
 +9b20ce688bf7faf8a4e9e027ea73d8a4b629a846
 +16911
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Add-missing-files.patch
index 0000000,0000000..267d325
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Add-missing-files.patch
@@@ -1,0 -1,0 +1,46 @@@
++From 860209d6de299bd9cd2e0f0ac1cd50f944da502a Mon Sep 17 00:00:00 2001
++From: Brian May <brian at linuxpenguins.xyz>
++Date: Wed, 6 Jan 2016 19:02:36 +1100
++Subject: Add missing files
++
++Files missing from upstream PyPI release.
++---
++ environ/test_env.txt | 29 +++++++++++++++++++++++++++++
++ 1 file changed, 29 insertions(+)
++ create mode 100644 environ/test_env.txt
++
++diff --git a/environ/test_env.txt b/environ/test_env.txt
++new file mode 100644
++index 0000000..f4c39ca
++--- /dev/null
+++++ b/environ/test_env.txt
++@@ -0,0 +1,29 @@
+++DICT_VAR=foo=bar,test=on
+++BOOL_FALSE_VAR2=False
+++DATABASE_MYSQL_URL=mysql://bea6eb0:69772142@us-cdbr-east.cleardb.com/heroku_97681?reconnect=true
+++DATABASE_MYSQL_GIS_URL=mysqlgis://user:password@127.0.0.1/some_database
+++CACHE_URL=memcache://127.0.0.1:11211
+++CACHE_REDIS=rediscache://127.0.0.1:6379:1?client_class=django_redis.client.DefaultClient&password=secret
+++EMAIL_URL=smtps://user@domain.com:password@smtp.example.com:587
+++URL_VAR=http://www.google.com/
+++PATH_VAR=/home/dev
+++BOOL_FALSE_VAR=0
+++BOOL_TRUE_VAR2=True
+++DATABASE_SQLITE_URL=sqlite:////full/path/to/your/database/file.sqlite
+++JSON_VAR={"three": 33.44, "two": 2, "one": "bar"}
+++BOOL_TRUE_VAR=1
+++DATABASE_URL=postgres://uf07k1:wegauwhg@ec2-107-21-253-135.compute-1.amazonaws.com:5431/d8r82722
+++FLOAT_VAR=33.3
+++FLOAT_COMMA_VAR=33,3
+++FLOAT_STRANGE_VAR1=123,420,333.3
+++FLOAT_STRANGE_VAR2=123.420.333,3
+++PROXIED_VAR=$STR_VAR
+++EMPTY_LIST=
+++INT_VAR=42
+++STR_LIST_WITH_SPACES= foo,  bar
+++STR_VAR=bar
+++INT_LIST=42,33
+++CYRILLIC_VAR=фуубар
+++INT_TUPLE=(42,33)
+++DATABASE_ORACLE_TNS_URL=oracle://user:password@sid
+++DATABASE_ORACLE_URL=oracle://user:password@host:1521/sid
diff --cc debian/patches/series
index 0000000,0000000..1743073
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Add-missing-files.patch

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