[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 f845ac3d9b3aafcff037e9d9b2040999edd1ecf0
Merge: 6cae14a edd1fe7
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Feb 18 12:57:00 2016 +0100

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 .../0001-Don-t-install-LICENSE-as-a-data-file.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 setup.py                                            |  1 -
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index be6c588,0000000..1e9dbeb
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
- 46f0cd031a826b550db67c645beb2ee2579bc126
- 46f0cd031a826b550db67c645beb2ee2579bc126
++edd1fe7b22cd2b067b5e2045bf7a02764c2f92a7
++edd1fe7b22cd2b067b5e2045bf7a02764c2f92a7
 +46f0cd031a826b550db67c645beb2ee2579bc126
 +46f0cd031a826b550db67c645beb2ee2579bc126
 +django-webpack-loader_0.2.4.orig.tar.gz
 +5b8e376f6845bdf823345123a410d41404caf5ad
 +3922
diff --cc debian/patches/0001-Don-t-install-LICENSE-as-a-data-file.patch
index 0000000,0000000..4a3294f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Don-t-install-LICENSE-as-a-data-file.patch
@@@ -1,0 -1,0 +1,21 @@@
++From edd1fe7b22cd2b067b5e2045bf7a02764c2f92a7 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
++--- a/setup.py
+++++ b/setup.py
++@@ -12,7 +12,6 @@ setup(
++   download_url = 'https://github.com/owais/django-webpack-loader/tarball/{}'.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.7',
++     'Programming Language :: Python :: 3.3',
diff --cc debian/patches/series
index 0000000,0000000..cbbdc5f
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Don-t-install-LICENSE-as-a-data-file.patch

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