[Python-modules-commits] [django-webpack-loader] 04/05: merge patched into master

[Michael Fladischer]

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

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

commit dcf4f335fcdbb6c8e8bed60d1d41a758947f826e
Merge: cce7864 3f38f3e
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sun Feb 21 12:23:59 2016 +0100

    merge patched into master

 PKG-INFO                                           | 340 +++++++++++++++++++-
 README.md                                          | 332 +++++++++++++++++++
 debian/.git-dpm                                    |   6 +-
 ...0001-Don-t-install-LICENSE-as-a-data-file.patch |  12 +-
 django_webpack_loader.egg-info/PKG-INFO            | 352 +++++++++++++++++++++
 django_webpack_loader.egg-info/SOURCES.txt         |  20 ++
 .../dependency_links.txt                           |   1 +
 django_webpack_loader.egg-info/top_level.txt       |   3 +
 setup.cfg                                          |   6 +
 setup.py                                           |  26 +-
 webpack_loader/__init__.py                         |   3 +
 webpack_loader/apps.py                             |   3 +-
 webpack_loader/config.py                           |  32 ++
 webpack_loader/exceptions.py                       |   9 +
 webpack_loader/loader.py                           |  79 +++++
 webpack_loader/templatetags/webpack_loader.py      |  21 +-
 webpack_loader/utils.py                            |  94 +-----
 17 files changed, 1226 insertions(+), 113 deletions(-)

diff --cc debian/.git-dpm
index b46c7d0,0000000..9113ae7
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- edd1fe7b22cd2b067b5e2045bf7a02764c2f92a7
- edd1fe7b22cd2b067b5e2045bf7a02764c2f92a7
- 46f0cd031a826b550db67c645beb2ee2579bc126
++3f38f3ea4015a25ea82ef075ad6ef9ca9c46b509
++3f38f3ea4015a25ea82ef075ad6ef9ca9c46b509
++c0f7804ffb03ae6bfc86dcfa7e3475f13e5d472b
 +c0f7804ffb03ae6bfc86dcfa7e3475f13e5d472b
 +django-webpack-loader_0.3.0.orig.tar.gz
 +7abd3e8477997b13526fc1b76f4d84ab4616c225
 +8963
diff --cc debian/patches/0001-Don-t-install-LICENSE-as-a-data-file.patch
index 50f5f79,0000000..da440e7
mode 100644,000000..100644
--- a/debian/patches/0001-Don-t-install-LICENSE-as-a-data-file.patch
+++ b/debian/patches/0001-Don-t-install-LICENSE-as-a-data-file.patch
@@@ -1,19 -1,0 +1,21 @@@
- Subject: Don't install LICENSE as a data file.
++From 3f38f3ea4015a25ea82ef075ad6ef9ca9c46b509 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <FladischerMichael at fladi.at>
 +Date: Thu, 18 Feb 2016 12:56:17 +0100
++Subject: Don't install LICENSE as a data file.
++
 +---
 + setup.py | 1 -
 + 1 file changed, 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
- index 8bf02ab..67ef0fa 100644
++index c1652e7..035a568 100644
 +--- a/setup.py
 ++++ b/setup.py
- @@ -12,7 +12,6 @@ setup(
-    download_url = 'https://github.com/owais/django-webpack-loader/tarball/{}'.format(version),
++@@ -28,7 +28,6 @@ setup(
++   download_url = 'https://github.com/owais/django-webpack-loader/tarball/{0}'.format(VERSION),
 +   url = 'https://github.com/owais/django-webpack-loader', # use the URL to the github repo
 +   keywords = ['django', 'webpack', 'assets'], # arbitrary keywords
 +-  data_files = [("", ["LICENSE"])],
 +   classifiers = [
++     'Programming Language :: Python :: 2.6',
 +     'Programming Language :: Python :: 2.7',
-      'Programming Language :: Python :: 3.3',

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