[Python-modules-commits] [django-pipeline] 05/11: 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-pipeline.

commit 9c2a327e28f795a6e800858ae30fa1766961ca0e
Merge: a2e0ed3 b429ac4
Author: Brian May <bam at debian.org>
Date:   Thu Mar 24 09:15:38 2016 +1100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../patches/0003-Change-default-compressors.patch  | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 pipeline/conf.py                                   |  4 ++--
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 93628ce,0000000..5e4a2d0
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
- ab939863f0d121e4571884fbc0163a240222266a
- ab939863f0d121e4571884fbc0163a240222266a
++b429ac4dbc38095262d2fddbbe8e8bf802583606
++b429ac4dbc38095262d2fddbbe8e8bf802583606
 +5df2e5effab5025dcdd8f9b53e05f7c4c3eff9d8
 +5df2e5effab5025dcdd8f9b53e05f7c4c3eff9d8
 +django-pipeline_1.6.7.orig.tar.gz
 +2bbee1c89eaea4cd7034eaf554c9b175e4b86493
 +52198
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Change-default-compressors.patch
index 0000000,0000000..7fd1114
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Change-default-compressors.patch
@@@ -1,0 -1,0 +1,25 @@@
++From b429ac4dbc38095262d2fddbbe8e8bf802583606 Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Thu, 24 Mar 2016 09:14:37 +1100
++Subject: Change default compressors
++
++Replace default compressors with compressors available in Debian main.
++---
++ pipeline/conf.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/pipeline/conf.py b/pipeline/conf.py
++index b6dd5b7..6d51b65 100644
++--- a/pipeline/conf.py
+++++ b/pipeline/conf.py
++@@ -25,8 +25,8 @@ DEFAULTS = {
++ 
++     'SHOW_ERRORS_INLINE': _settings.DEBUG,
++ 
++-    'CSS_COMPRESSOR': 'pipeline.compressors.yuglify.YuglifyCompressor',
++-    'JS_COMPRESSOR': 'pipeline.compressors.yuglify.YuglifyCompressor',
+++    'CSS_COMPRESSOR': 'pipeline.compressors.cssmin.CSSMinCompressor',
+++    'JS_COMPRESSOR': 'pipeline.compressors.jsmin.JSMinCompressor',
++     'COMPILERS': [],
++ 
++     'STYLESHEETS': {},
diff --cc debian/patches/series
index a356edb,0000000..fdae6d9
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +make_jsmin_optional
 +0002-Remove-slimit-test.patch
++0003-Change-default-compressors.patch

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