[Python-modules-commits] r32227 - in packages/django-pipeline/trunk (18 files)
bam at users.alioth.debian.org
bam at users.alioth.debian.org
Fri Apr 10 01:16:00 UTC 2015
Date: Friday, April 10, 2015 @ 01:15:59
Author: bam
Revision: 32227
[svn-inject] Applying Debian modifications (1.3.24-0.1) to trunk
Added:
packages/django-pipeline/trunk/debian/
packages/django-pipeline/trunk/debian/README.Debian
packages/django-pipeline/trunk/debian/changelog
packages/django-pipeline/trunk/debian/compat
packages/django-pipeline/trunk/debian/control
packages/django-pipeline/trunk/debian/copyright
packages/django-pipeline/trunk/debian/docs
packages/django-pipeline/trunk/debian/patches/
packages/django-pipeline/trunk/debian/patches/exclude_tests
packages/django-pipeline/trunk/debian/patches/make_jsmin_optional
packages/django-pipeline/trunk/debian/patches/series
packages/django-pipeline/trunk/debian/pydist-overrides
packages/django-pipeline/trunk/debian/python-django-pipeline-doc.doc-base.django-pipeline
packages/django-pipeline/trunk/debian/rules
packages/django-pipeline/trunk/debian/source.lintian-overrides
packages/django-pipeline/trunk/debian/source/
packages/django-pipeline/trunk/debian/source/format
packages/django-pipeline/trunk/debian/watch
Property changes on: packages/django-pipeline/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages/django-pipeline/trunk/debian/README.Debian
===================================================================
--- packages/django-pipeline/trunk/debian/README.Debian (rev 0)
+++ packages/django-pipeline/trunk/debian/README.Debian 2015-04-10 01:15:59 UTC (rev 32227)
@@ -0,0 +1,16 @@
+django-pipeline for Debian
+--------------------------
+
+Django-pipeline provides a way to choose which JS compressor to use.
+Unfortunately JSMin one requires special python library:
+
+ http://pypi.python.org/pypi/jsmin
+
+Unfortunately it's non-free due to licensing issue:
+
+ http://wonko.com/post/jsmin-isnt-welcome-on-google-code
+
+As a workaround and to maintain API compatibility with upstream, Debian
+package is shipped with "stubbed out" JSMin wrapper
+
+ -- Dmitry Nezhevenko <dion at dion.org.ua> Thu, 26 Apr 2012 13:54:47 +0300
Added: packages/django-pipeline/trunk/debian/changelog
===================================================================
--- packages/django-pipeline/trunk/debian/changelog (rev 0)
+++ packages/django-pipeline/trunk/debian/changelog 2015-04-10 01:15:59 UTC (rev 32227)
@@ -0,0 +1,16 @@
+django-pipeline (1.3.24-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release, closes: #749829.
+ * Update standard version to 3.9.5.
+ * Override lintian warning license-problem-json-evil, this is a false
+ positive due to debian/patches/make_jsmin_optional. We do not include
+ jsmin.
+
+ -- Brian May <bam at debian.org> Wed, 18 Jun 2014 15:42:27 +1000
+
+django-pipeline (1.2.2.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #670508)
+
+ -- Dmitry Nezhevenko <dion at dion.org.ua> Thu, 26 Apr 2012 12:18:18 +0300
Added: packages/django-pipeline/trunk/debian/compat
===================================================================
--- packages/django-pipeline/trunk/debian/compat (rev 0)
+++ packages/django-pipeline/trunk/debian/compat 2015-04-10 01:15:59 UTC (rev 32227)
@@ -0,0 +1 @@
+8
Added: packages/django-pipeline/trunk/debian/control
===================================================================
--- packages/django-pipeline/trunk/debian/control (rev 0)
+++ packages/django-pipeline/trunk/debian/control 2015-04-10 01:15:59 UTC (rev 32227)
@@ -0,0 +1,29 @@
+Source: django-pipeline
+Section: python
+Priority: optional
+Maintainer: Dmitry Nezhevenko <dion at dion.org.ua>
+Build-Depends: debhelper (>= 8), python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3),
+ python-django (>= 1.4), python-sphinx (>= 1.0.7+dfsg)
+Standards-Version: 3.9.5
+X-Python-Version: >= 2.6
+Homepage: https://github.com/cyberdelia/django-pipeline
+
+Package: python-django-pipeline
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+Description: Asset packaging library for Django
+ Pipeline is an asset packaging library for Django, providing both CSS and
+ JavaScript concatenation and compression, built-in JavaScript template support,
+ and optional data-URI image and font embedding.
+
+Package: python-django-pipeline-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Recommends: doc-base
+Description: Documentation for Django Pipeline library
+ Pipeline is an asset packaging library for Django, providing both CSS and
+ JavaScript concatenation and compression, built-in JavaScript template support,
+ and optional data-URI image and font embedding.
+ .
+ This package contains documentation in HTML format
Added: packages/django-pipeline/trunk/debian/copyright
===================================================================
--- packages/django-pipeline/trunk/debian/copyright (rev 0)
+++ packages/django-pipeline/trunk/debian/copyright 2015-04-10 01:15:59 UTC (rev 32227)
@@ -0,0 +1,31 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: django-pipeline
+Source: <https://github.com/cyberdelia/django-pipeline>
+
+Files: *
+Copyright: 2008 Andreas Pelme <andreas at pelme.se>
+ 2011-2012 Timothée Peignier <timothee.peignier at tryphon.org>
+License: Expat
+
+Files: debian/*
+Copyright: 2012 Dmitry Nezhevenko <dion at dion.org.ua>
+License: Expat
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
Added: packages/django-pipeline/trunk/debian/docs
===================================================================
Added: packages/django-pipeline/trunk/debian/patches/exclude_tests
===================================================================
--- packages/django-pipeline/trunk/debian/patches/exclude_tests (rev 0)
+++ packages/django-pipeline/trunk/debian/patches/exclude_tests 2015-04-10 01:15:59 UTC (rev 32227)
@@ -0,0 +1,16 @@
+Description: exclude tests
+Author: Dmitry Nezhevenko <dion at dion.org.ua>
+
+Index: django-pipeline-1.2.2.1/setup.py
+===================================================================
+--- django-pipeline-1.2.2.1.orig/setup.py 2012-05-17 19:51:39.000000000 +0300
++++ django-pipeline-1.2.2.1/setup.py 2012-05-17 20:02:29.000000000 +0300
+@@ -12,7 +12,7 @@
+ author='Timothée Peignier',
+ author_email='timothee.peignier at tryphon.org',
+ url='https://github.com/cyberdelia/django-pipeline',
+- packages=find_packages(),
++ packages=find_packages(exclude=('tests', 'tests.tests.*', 'tests.*',)),
+ zip_safe=False,
+ include_package_data=True,
+ classifiers=[
Added: packages/django-pipeline/trunk/debian/patches/make_jsmin_optional
===================================================================
--- packages/django-pipeline/trunk/debian/patches/make_jsmin_optional (rev 0)
+++ packages/django-pipeline/trunk/debian/patches/make_jsmin_optional 2015-04-10 01:15:59 UTC (rev 32227)
@@ -0,0 +1,24 @@
+Description: Make JSMin dependency optional
+ JSMin is a JavaScript compressor. It's known to be non-free due to
+ additional statement to MIT license (The Software shall be used for Good,
+ not Evil.)
+ .
+ This patchs stubs out JSMin usage. Instead uncompressed JS will be
+ returned. This should be ok since it is not default compressor at all.
+Author: Dmitry Nezhevenko <dion at dion.org.ua>
+Bug: https://github.com/cyberdelia/django-pipeline/issues/99
+
+--- django-pipeline-1.2.2.orig/pipeline/compressors/jsmin.py
++++ django-pipeline-1.2.2/pipeline/compressors/jsmin.py
+@@ -7,5 +7,9 @@ class JSMinCompressor(CompressorBase):
+ (http://pypi.python.org/pypi/jsmin/).
+ """
+ def compress_js(self, js):
+- from jsmin import jsmin
+- return jsmin(js)
++ try:
++ from jsmin import jsmin
++ return jsmin(js)
++ except ImportError:
++ # JSMin is not available
++ return js
Added: packages/django-pipeline/trunk/debian/patches/series
===================================================================
--- packages/django-pipeline/trunk/debian/patches/series (rev 0)
+++ packages/django-pipeline/trunk/debian/patches/series 2015-04-10 01:15:59 UTC (rev 32227)
@@ -0,0 +1 @@
+make_jsmin_optional
Added: packages/django-pipeline/trunk/debian/pydist-overrides
===================================================================
--- packages/django-pipeline/trunk/debian/pydist-overrides (rev 0)
+++ packages/django-pipeline/trunk/debian/pydist-overrides 2015-04-10 01:15:59 UTC (rev 32227)
@@ -0,0 +1 @@
+futures python-concurrent.futures
Added: packages/django-pipeline/trunk/debian/python-django-pipeline-doc.doc-base.django-pipeline
===================================================================
--- packages/django-pipeline/trunk/debian/python-django-pipeline-doc.doc-base.django-pipeline (rev 0)
+++ packages/django-pipeline/trunk/debian/python-django-pipeline-doc.doc-base.django-pipeline 2015-04-10 01:15:59 UTC (rev 32227)
@@ -0,0 +1,10 @@
+Document: django-pipeline
+Title: Django-Pipeline library documentation
+Abstract: Pipeline is an asset packaging library for Django, providing
+ both CSS and JavaScript concatenation and compression, built-in JavaScript
+ template support, and optional data-URI image and font embedding.
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-django-pipeline-doc/html/index.html
+Files: /usr/share/doc/python-django-pipeline-doc/html/*
Added: packages/django-pipeline/trunk/debian/rules
===================================================================
--- packages/django-pipeline/trunk/debian/rules (rev 0)
+++ packages/django-pipeline/trunk/debian/rules 2015-04-10 01:15:59 UTC (rev 32227)
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh $@ --with python2,sphinxdoc
+
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf django_pipeline.egg-info docs/_build
+
+override_dh_auto_build:
+ dh_auto_build
+ make -C docs html text
+
+override_dh_auto_install:
+ dh_auto_install --destdir=debian/python-django-pipeline
+ dh_installdocs -ppython-django-pipeline-doc docs/_build/html
Property changes on: packages/django-pipeline/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/django-pipeline/trunk/debian/source/format
===================================================================
--- packages/django-pipeline/trunk/debian/source/format (rev 0)
+++ packages/django-pipeline/trunk/debian/source/format 2015-04-10 01:15:59 UTC (rev 32227)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: packages/django-pipeline/trunk/debian/source.lintian-overrides
===================================================================
--- packages/django-pipeline/trunk/debian/source.lintian-overrides (rev 0)
+++ packages/django-pipeline/trunk/debian/source.lintian-overrides 2015-04-10 01:15:59 UTC (rev 32227)
@@ -0,0 +1,2 @@
+# this is a false positive
+django-pipeline source: license-problem-json-evil
Added: packages/django-pipeline/trunk/debian/watch
===================================================================
--- packages/django-pipeline/trunk/debian/watch (rev 0)
+++ packages/django-pipeline/trunk/debian/watch 2015-04-10 01:15:59 UTC (rev 32227)
@@ -0,0 +1,5 @@
+# Compulsory line, this is a version 3 file
+version=3
+
+# Unfortunately upstream currently don't provide any releases on homepage
+http://pypi.python.org/pypi/django-pipeline/ .*django-pipeline-(.*)\.tar\.gz.*
More information about the Python-modules-commits
mailing list