[Python-modules-commits] [django-pipeline] 09/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 a4193f509e7b515fddf9407f6b2b162d9553ac62
Merge: 3efa89b 827d360
Author: Brian May <bam at debian.org>
Date:   Thu Mar 24 09:44:07 2016 +1100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...it-test.patch => 0001-Remove-slimit-test.patch} |  2 +-
 ...patch => 0002-Change-default-compressors.patch} |  2 +-
 debian/patches/make_jsmin_optional                 | 33 ----------------------
 debian/patches/series                              |  5 ++--
 pipeline/compressors/jsmin.py                      |  8 ++----
 6 files changed, 8 insertions(+), 46 deletions(-)

diff --cc debian/.git-dpm
index 5e4a2d0,0000000..38b6a2b
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
- b429ac4dbc38095262d2fddbbe8e8bf802583606
- b429ac4dbc38095262d2fddbbe8e8bf802583606
++827d360434ee55dd6d151a478a301e1fe4c133c5
++827d360434ee55dd6d151a478a301e1fe4c133c5
 +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/0001-Remove-slimit-test.patch
index 82d112c,0000000..eec1b27
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-slimit-test.patch
+++ b/debian/patches/0001-Remove-slimit-test.patch
@@@ -1,26 -1,0 +1,26 @@@
- From ab939863f0d121e4571884fbc0163a240222266a Mon Sep 17 00:00:00 2001
++From b1574b94ca397c39de337fdb970d893f9c4f28f5 Mon Sep 17 00:00:00 2001
 +From: Brian May <bam at debian.org>
 +Date: Thu, 24 Mar 2016 09:03:33 +1100
 +Subject: Remove slimit test
 +
 +slimit is not Python 3 compatible and not maintained upstream
 +any more. Use jsmin instead.
 +---
 + tests/tests/test_compressor.py | 4 ----
 + 1 file changed, 4 deletions(-)
 +
 +diff --git a/tests/tests/test_compressor.py b/tests/tests/test_compressor.py
 +index 4291b51..bd75504 100644
 +--- a/tests/tests/test_compressor.py
 ++++ b/tests/tests/test_compressor.py
 +@@ -225,10 +225,6 @@ class CompressorImplementationTest(TestCase):
 +         self._test_compressor('pipeline.compressors.jsmin.JSMinCompressor',
 +             'js', 'pipeline/compressors/jsmin.js')
 + 
 +-    def test_slimit(self):
 +-        self._test_compressor('pipeline.compressors.slimit.SlimItCompressor',
 +-            'js', 'pipeline/compressors/slimit.js')
 +-
 +     @skipUnless(settings.HAS_NODE, "requires node")
 +     def test_uglifyjs(self):
 +         self._test_compressor('pipeline.compressors.uglifyjs.UglifyJSCompressor',
diff --cc debian/patches/0002-Change-default-compressors.patch
index 7fd1114,0000000..4406145
mode 100644,000000..100644
--- a/debian/patches/0002-Change-default-compressors.patch
+++ b/debian/patches/0002-Change-default-compressors.patch
@@@ -1,25 -1,0 +1,25 @@@
- From b429ac4dbc38095262d2fddbbe8e8bf802583606 Mon Sep 17 00:00:00 2001
++From 827d360434ee55dd6d151a478a301e1fe4c133c5 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 fdae6d9,0000000..05ec2ff
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
- make_jsmin_optional
- 0002-Remove-slimit-test.patch
- 0003-Change-default-compressors.patch
++0001-Remove-slimit-test.patch
++0002-Change-default-compressors.patch

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