[Python-modules-commits] r33064 - in packages/django-assets/tags (15 files)
fladi at users.alioth.debian.org
fladi at users.alioth.debian.org
Wed Jun 24 06:58:55 UTC 2015
Date: Wednesday, June 24, 2015 @ 06:58:54
Author: fladi
Revision: 33064
[svn-buildpackage] Tagging django-assets 0.10-3
Added:
packages/django-assets/tags/0.10-3/
packages/django-assets/tags/0.10-3/debian/changelog
(from rev 33063, packages/django-assets/trunk/debian/changelog)
packages/django-assets/tags/0.10-3/debian/control
(from rev 33062, packages/django-assets/trunk/debian/control)
packages/django-assets/tags/0.10-3/debian/copyright
(from rev 33062, packages/django-assets/trunk/debian/copyright)
packages/django-assets/tags/0.10-3/debian/patches/01-webassets_version.patch
(from rev 33062, packages/django-assets/trunk/debian/patches/01-webassets_version.patch)
packages/django-assets/tags/0.10-3/debian/patches/02-do_not_install_tests.patch
(from rev 33062, packages/django-assets/trunk/debian/patches/02-do_not_install_tests.patch)
packages/django-assets/tags/0.10-3/debian/patches/03-python3_pytest_plugin.patch
(from rev 33059, packages/django-assets/trunk/debian/patches/03-python3_pytest_plugin.patch)
packages/django-assets/tags/0.10-3/debian/patches/04-intersphinx.patch
(from rev 33060, packages/django-assets/trunk/debian/patches/04-intersphinx.patch)
packages/django-assets/tags/0.10-3/debian/patches/series
(from rev 33060, packages/django-assets/trunk/debian/patches/series)
Deleted:
packages/django-assets/tags/0.10-3/debian/changelog
packages/django-assets/tags/0.10-3/debian/control
packages/django-assets/tags/0.10-3/debian/copyright
packages/django-assets/tags/0.10-3/debian/patches/01-webassets_version.patch
packages/django-assets/tags/0.10-3/debian/patches/02-do_not_install_tests.patch
packages/django-assets/tags/0.10-3/debian/patches/series
Deleted: packages/django-assets/tags/0.10-3/debian/changelog
===================================================================
--- packages/django-assets/trunk/debian/changelog 2015-06-23 04:02:34 UTC (rev 33058)
+++ packages/django-assets/tags/0.10-3/debian/changelog 2015-06-24 06:58:54 UTC (rev 33064)
@@ -1,13 +0,0 @@
-django-assets (0.10-2) unstable; urgency=medium
-
- * Start enumerating patchs, starting with 01-webassets_version.patch.
- * Add 02-do_not_install_tests.patch to exclude upstream tests from
- getting installed (Closes: #767394).
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Sun, 02 Nov 2014 11:10:47 +0100
-
-django-assets (0.10-1) unstable; urgency=low
-
- * Initial release (Closes: #764931).
-
- -- Michael Fladischer <FladischerMichael at fladi.at> Sun, 12 Oct 2014 15:38:45 +0200
Copied: packages/django-assets/tags/0.10-3/debian/changelog (from rev 33063, packages/django-assets/trunk/debian/changelog)
===================================================================
--- packages/django-assets/tags/0.10-3/debian/changelog (rev 0)
+++ packages/django-assets/tags/0.10-3/debian/changelog 2015-06-24 06:58:54 UTC (rev 33064)
@@ -0,0 +1,25 @@
+django-assets (0.10-3) unstable; urgency=medium
+
+ * Add 03-python3_pytest_plugin.patch to fix Python3 compatibility
+ (Closes: #767826).
+ * Add 04-intersphinx.patch to use local Python objects.inv for
+ documentation.
+ * Add python-doc, python-webassets-doc and python3-doc to Build-
+ Depends so their objects.inv files can be used by sphinx.
+ * Change my email address to fladi at debian.org.
+
+ -- Michael Fladischer <fladi at debian.org> Wed, 24 Jun 2015 08:43:41 +0200
+
+django-assets (0.10-2) unstable; urgency=medium
+
+ * Start enumerating patchs, starting with 01-webassets_version.patch.
+ * Add 02-do_not_install_tests.patch to exclude upstream tests from
+ getting installed (Closes: #767394).
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Sun, 02 Nov 2014 11:10:47 +0100
+
+django-assets (0.10-1) unstable; urgency=low
+
+ * Initial release (Closes: #764931).
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Sun, 12 Oct 2014 15:38:45 +0200
Deleted: packages/django-assets/tags/0.10-3/debian/control
===================================================================
--- packages/django-assets/trunk/debian/control 2015-06-23 04:02:34 UTC (rev 33058)
+++ packages/django-assets/tags/0.10-3/debian/control 2015-06-24 06:58:54 UTC (rev 33064)
@@ -1,64 +0,0 @@
-Source: django-assets
-Section: python
-Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Michael Fladischer <FladischerMichael at fladi.at>,
-Build-Depends: debhelper (>= 9),
- dh-python,
- python-all,
- python-nose,
- python-django,
- python-webassets,
- python-setuptools,
- python-sphinx (>= 1.0.7+dfsg),
- python3-all,
- python3-nose,
- python3-django,
- python3-webassets,
- python3-setuptools
-Standards-Version: 3.9.6
-X-Python-Version: >= 2.6
-X-Python3-Version: >= 3.3
-Homepage: https://github.com/miracle2k/django-assets
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-assets/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/django-assets/trunk/
-
-Package: python-django-assets
-Architecture: all
-Depends: python-django,
- python-webassets,
- ${misc:Depends},
- ${python:Depends}
-Suggests: python-django-assets-doc
-Description: integrate webassets into Django applications
- django-assets will automatically merge and compress bundle’s source files the
- first time a template including them is rendered, and will automatically update
- the compressed file every time a source file changes. If debugging is enabled,
- each source file will be outputted individually instead.
-
-Package: python3-django-assets
-Architecture: all
-Depends: python3-django,
- python3-webassets,
- ${misc:Depends},
- ${python3:Depends}
-Suggests: python-django-assets-doc
-Description: integrate webassets into Django applications (Python3 version)
- django-assets will automatically merge and compress bundle’s source files the
- first time a template including them is rendered, and will automatically update
- the compressed file every time a source file changes. If debugging is enabled,
- each source file will be outputted individually instead.
- .
- This package contains the Python 3 version of the library.
-
-Package: python-django-assets-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Description: integrate webassets into Django applications (Documentation)
- django-assets will automatically merge and compress bundle’s source files the
- first time a template including them is rendered, and will automatically update
- the compressed file every time a source file changes. If debugging is enabled,
- each source file will be outputted individually instead.
- .
- This package contains the documentation.
Copied: packages/django-assets/tags/0.10-3/debian/control (from rev 33062, packages/django-assets/trunk/debian/control)
===================================================================
--- packages/django-assets/tags/0.10-3/debian/control (rev 0)
+++ packages/django-assets/tags/0.10-3/debian/control 2015-06-24 06:58:54 UTC (rev 33064)
@@ -0,0 +1,67 @@
+Source: django-assets
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Michael Fladischer <fladi at debian.org>,
+Build-Depends: debhelper (>= 9),
+ dh-python,
+ python-all,
+ python-doc,
+ python-nose,
+ python-django,
+ python-webassets,
+ python-webassets-doc,
+ python-setuptools,
+ python-sphinx (>= 1.0.7+dfsg),
+ python3-all,
+ python3-doc,
+ python3-nose,
+ python3-django,
+ python3-webassets,
+ python3-setuptools
+Standards-Version: 3.9.6
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.3
+Homepage: https://github.com/miracle2k/django-assets
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/django-assets/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/django-assets/trunk/
+
+Package: python-django-assets
+Architecture: all
+Depends: python-django,
+ python-webassets,
+ ${misc:Depends},
+ ${python:Depends}
+Suggests: python-django-assets-doc
+Description: integrate webassets into Django applications
+ django-assets will automatically merge and compress bundle’s source files the
+ first time a template including them is rendered, and will automatically update
+ the compressed file every time a source file changes. If debugging is enabled,
+ each source file will be outputted individually instead.
+
+Package: python3-django-assets
+Architecture: all
+Depends: python3-django,
+ python3-webassets,
+ ${misc:Depends},
+ ${python3:Depends}
+Suggests: python-django-assets-doc
+Description: integrate webassets into Django applications (Python3 version)
+ django-assets will automatically merge and compress bundle’s source files the
+ first time a template including them is rendered, and will automatically update
+ the compressed file every time a source file changes. If debugging is enabled,
+ each source file will be outputted individually instead.
+ .
+ This package contains the Python 3 version of the library.
+
+Package: python-django-assets-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: integrate webassets into Django applications (Documentation)
+ django-assets will automatically merge and compress bundle’s source files the
+ first time a template including them is rendered, and will automatically update
+ the compressed file every time a source file changes. If debugging is enabled,
+ each source file will be outputted individually instead.
+ .
+ This package contains the documentation.
Deleted: packages/django-assets/tags/0.10-3/debian/copyright
===================================================================
--- packages/django-assets/trunk/debian/copyright 2015-06-23 04:02:34 UTC (rev 33058)
+++ packages/django-assets/tags/0.10-3/debian/copyright 2015-06-24 06:58:54 UTC (rev 33064)
@@ -1,37 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: django-assets
-Upstream-Contact: Michael Elsdörfer <michael at elsdoerfer.com>
-Source: https://github.com/miracle2k/django-assets
-
-Files: *
-Copyright: 2008-2014, Michael Elsdörfer <michael at elsdoerfer.com>
-License: BSD-2-clause
-
-Files: debian/*
-Copyright: 2014, Fladischer Michael <FladischerMichael at fladi.at>
-License: BSD-2-clause
-
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials
- provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
Copied: packages/django-assets/tags/0.10-3/debian/copyright (from rev 33062, packages/django-assets/trunk/debian/copyright)
===================================================================
--- packages/django-assets/tags/0.10-3/debian/copyright (rev 0)
+++ packages/django-assets/tags/0.10-3/debian/copyright 2015-06-24 06:58:54 UTC (rev 33064)
@@ -0,0 +1,37 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: django-assets
+Upstream-Contact: Michael Elsdörfer <michael at elsdoerfer.com>
+Source: https://github.com/miracle2k/django-assets
+
+Files: *
+Copyright: 2008-2014, Michael Elsdörfer <michael at elsdoerfer.com>
+License: BSD-2-clause
+
+Files: debian/*
+Copyright: 2014-2015, Fladischer Michael <fladi at debian.org>
+License: BSD-2-clause
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials
+ provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
Deleted: packages/django-assets/tags/0.10-3/debian/patches/01-webassets_version.patch
===================================================================
--- packages/django-assets/trunk/debian/patches/01-webassets_version.patch 2015-06-23 04:02:34 UTC (rev 33058)
+++ packages/django-assets/tags/0.10-3/debian/patches/01-webassets_version.patch 2015-06-24 06:58:54 UTC (rev 33064)
@@ -1,19 +0,0 @@
-Description: loosen up dependency on webassets
- Upstream uses a strict versioned dependency on webassets-library which is
- unnecessary. This patch loosens up this dependency to also allow newer versions
- of webassets.
-Author: Mcihael Fladischer <FladischerMichael at fladi.at>
-Last-Update: 2014-09-09
-Forwarded: no
-
---- a/setup.py
-+++ b/setup.py
-@@ -42,7 +42,7 @@
- platforms='any',
- install_requires=[
- 'Django>=1.1',
-- 'webassets==%s' % webassets_version
-+ 'webassets>=%s' % webassets_version
- ],
- classifiers=[
- 'Environment :: Web Environment',
Copied: packages/django-assets/tags/0.10-3/debian/patches/01-webassets_version.patch (from rev 33062, packages/django-assets/trunk/debian/patches/01-webassets_version.patch)
===================================================================
--- packages/django-assets/tags/0.10-3/debian/patches/01-webassets_version.patch (rev 0)
+++ packages/django-assets/tags/0.10-3/debian/patches/01-webassets_version.patch 2015-06-24 06:58:54 UTC (rev 33064)
@@ -0,0 +1,19 @@
+Description: loosen up dependency on webassets
+ Upstream uses a strict versioned dependency on webassets-library which is
+ unnecessary. This patch loosens up this dependency to also allow newer versions
+ of webassets.
+Author: Mcihael Fladischer <fladi at debian.org>
+Last-Update: 2014-09-09
+Forwarded: no
+
+--- a/setup.py
++++ b/setup.py
+@@ -42,7 +42,7 @@
+ platforms='any',
+ install_requires=[
+ 'Django>=1.1',
+- 'webassets==%s' % webassets_version
++ 'webassets>=%s' % webassets_version
+ ],
+ classifiers=[
+ 'Environment :: Web Environment',
Deleted: packages/django-assets/tags/0.10-3/debian/patches/02-do_not_install_tests.patch
===================================================================
--- packages/django-assets/trunk/debian/patches/02-do_not_install_tests.patch 2015-06-23 04:02:34 UTC (rev 33058)
+++ packages/django-assets/tags/0.10-3/debian/patches/02-do_not_install_tests.patch 2015-06-24 06:58:54 UTC (rev 33064)
@@ -1,17 +0,0 @@
-Description: Do not install upstream tests.
-Author: Michael Fladischer <FladischerMichael at fladi.at>
-Last-Update: 2014-11-02
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/767394
-
---- a/setup.py
-+++ b/setup.py
-@@ -37,7 +37,7 @@
- description='Asset management for Django, to compress and merge '\
- 'CSS and Javascript files.',
- long_description=__doc__,
-- packages=find_packages(),
-+ packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
- zip_safe=False,
- platforms='any',
- install_requires=[
Copied: packages/django-assets/tags/0.10-3/debian/patches/02-do_not_install_tests.patch (from rev 33062, packages/django-assets/trunk/debian/patches/02-do_not_install_tests.patch)
===================================================================
--- packages/django-assets/tags/0.10-3/debian/patches/02-do_not_install_tests.patch (rev 0)
+++ packages/django-assets/tags/0.10-3/debian/patches/02-do_not_install_tests.patch 2015-06-24 06:58:54 UTC (rev 33064)
@@ -0,0 +1,17 @@
+Description: Do not install upstream tests.
+Author: Michael Fladischer <fladi at debian.org>
+Last-Update: 2014-11-02
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/767394
+
+--- a/setup.py
++++ b/setup.py
+@@ -37,7 +37,7 @@
+ description='Asset management for Django, to compress and merge '\
+ 'CSS and Javascript files.',
+ long_description=__doc__,
+- packages=find_packages(),
++ packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
+ zip_safe=False,
+ platforms='any',
+ install_requires=[
Copied: packages/django-assets/tags/0.10-3/debian/patches/03-python3_pytest_plugin.patch (from rev 33059, packages/django-assets/trunk/debian/patches/03-python3_pytest_plugin.patch)
===================================================================
--- packages/django-assets/tags/0.10-3/debian/patches/03-python3_pytest_plugin.patch (rev 0)
+++ packages/django-assets/tags/0.10-3/debian/patches/03-python3_pytest_plugin.patch 2015-06-24 06:58:54 UTC (rev 33064)
@@ -0,0 +1,14 @@
+Description: Use Python3 style print statement
+Author: Jason Pleau <jason at jpleau.ca>
+Last-Update: 2014-11-10
+Origin: https://github.com/miracle2k/django-assets/commit/9db6e5fdc40b4fc58dcf5b34eeb7cc9a60983f28
+
+--- a/django_assets/pytest_plugin.py
++++ b/django_assets/pytest_plugin.py
+@@ -3,5 +3,5 @@
+
+ @pytest.fixture(autouse=True)
+ def set_django_assets_env():
+- print "Set django assets environment"
++ print("Set django assets environment")
+ django_assets.env.get_env() # initialise django-assets settings
Copied: packages/django-assets/tags/0.10-3/debian/patches/04-intersphinx.patch (from rev 33060, packages/django-assets/trunk/debian/patches/04-intersphinx.patch)
===================================================================
--- packages/django-assets/tags/0.10-3/debian/patches/04-intersphinx.patch (rev 0)
+++ packages/django-assets/tags/0.10-3/debian/patches/04-intersphinx.patch 2015-06-24 06:58:54 UTC (rev 33064)
@@ -0,0 +1,38 @@
+Description: use local objects.inv where possible
+ Upstream uses intersphinx mappings that fetch the objects.inv for python
+ and webassets by HTTP from a remote host. Using the local objects.inv from
+ python and webassets enables the package to build without network connection.
+Author: Michael Fladischer <fladi at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-06-24
+
+Index: django-assets/docs/conf.py
+===================================================================
+--- django-assets.orig/docs/conf.py 2014-09-05 23:17:00.568771103 +0200
++++ django-assets/docs/conf.py 2015-06-24 08:30:39.481672702 +0200
+@@ -251,10 +251,21 @@
+
+ WEBASSETS_DOC_URL = 'http://elsdoerfer.name/docs/webassets/'
+
+-intersphinx_mapping = {
+- 'python': ('http://docs.python.org/', None),
+- 'webassets': (WEBASSETS_DOC_URL, None),
+-}
++def check_object_path(key, url, path):
++ if os.path.isfile(path):
++ return {key: (url, path)}
++ return {}
++
++intersphinx_mapping = {}
++intersphinx_mapping.update(check_object_path('python',
++ 'http://docs.python.org/',
++ '/usr/share/doc/python'
++ + '.'.join([str(x) for x in sys.version_info[0:2]])
++ + '/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('webassets',
++ WEBASSETS_DOC_URL,
++ '/usr/share/doc/python-webassets-doc/html/objects.inv'))
++
+
+ extlinks = {'webassets': (WEBASSETS_DOC_URL+'%s.html', None)}
+
Deleted: packages/django-assets/tags/0.10-3/debian/patches/series
===================================================================
--- packages/django-assets/trunk/debian/patches/series 2015-06-23 04:02:34 UTC (rev 33058)
+++ packages/django-assets/tags/0.10-3/debian/patches/series 2015-06-24 06:58:54 UTC (rev 33064)
@@ -1,2 +0,0 @@
-01-webassets_version.patch
-02-do_not_install_tests.patch
Copied: packages/django-assets/tags/0.10-3/debian/patches/series (from rev 33060, packages/django-assets/trunk/debian/patches/series)
===================================================================
--- packages/django-assets/tags/0.10-3/debian/patches/series (rev 0)
+++ packages/django-assets/tags/0.10-3/debian/patches/series 2015-06-24 06:58:54 UTC (rev 33064)
@@ -0,0 +1,4 @@
+01-webassets_version.patch
+02-do_not_install_tests.patch
+03-python3_pytest_plugin.patch
+04-intersphinx.patch
More information about the Python-modules-commits
mailing list