[Python-modules-commits] r33029 - in packages/python-django-braces/trunk/debian (13 files)

fladi at users.alioth.debian.org fladi at users.alioth.debian.org
Fri Jun 19 20:39:25 UTC 2015


    Date: Friday, June 19, 2015 @ 20:39:24
  Author: fladi
Revision: 33029

Team upload: New upstream release and Python3 support.

Added:
  packages/python-django-braces/trunk/debian/patches/
  packages/python-django-braces/trunk/debian/patches/alabaster-path.patch
  packages/python-django-braces/trunk/debian/patches/series
  packages/python-django-braces/trunk/debian/python-django-braces-doc.doc-base
    (from rev 32491, packages/python-django-braces/trunk/debian/python-django-braces.doc-base)
  packages/python-django-braces/trunk/debian/python-django-braces-doc.docs
    (from rev 33028, packages/python-django-braces/trunk/debian/docs)
  packages/python-django-braces/trunk/debian/python-django-braces.docs
  packages/python-django-braces/trunk/debian/python3-django-braces.docs
Modified:
  packages/python-django-braces/trunk/debian/changelog
  packages/python-django-braces/trunk/debian/control
  packages/python-django-braces/trunk/debian/copyright
  packages/python-django-braces/trunk/debian/rules
Deleted:
  packages/python-django-braces/trunk/debian/docs
  packages/python-django-braces/trunk/debian/python-django-braces.doc-base

Modified: packages/python-django-braces/trunk/debian/changelog
===================================================================
--- packages/python-django-braces/trunk/debian/changelog	2015-06-19 19:43:42 UTC (rev 33028)
+++ packages/python-django-braces/trunk/debian/changelog	2015-06-19 20:39:24 UTC (rev 33029)
@@ -1,3 +1,26 @@
+python-django-braces (1.8.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release.
+  * Add Python3 support through a separate package (Closes: #763076).
+  * Move documentation to a separate package.
+  * Bump Standards-Version to 3.9.6.
+  * Add alabaster-path.patch to detect theme path for sphinx.
+  * Update years in d/copyright.
+  * Rename BSD-3-clause to BSD-3-clause-Brack3t in d/copyright.
+  * Format d/copyright to fully conform to DEP5.
+  * Directly call sphinx-build in d/rules instead of using the upstream
+    Makefile.
+  * Add override in d/rules to disable compression of changelog.html.
+  * Add python-all and python3-all to Build-Depends, replacing python.
+  * Add python-alabaster, python3-setuptools and python3-django to Build-
+    Depends-Indep.
+  * Add python-django-braces-doc to Suggests for both python-django-
+    braces and python3-django-braces.
+  * Install upstream changelog directly from source.
+
+ -- Michael Fladischer <fladi at debian.org>  Fri, 19 Jun 2015 22:38:22 +0200
+
 python-django-braces (1.4.0-1) unstable; urgency=medium
 
   * New upstream version

Modified: packages/python-django-braces/trunk/debian/control
===================================================================
--- packages/python-django-braces/trunk/debian/control	2015-06-19 19:43:42 UTC (rev 33028)
+++ packages/python-django-braces/trunk/debian/control	2015-06-19 20:39:24 UTC (rev 33029)
@@ -3,25 +3,56 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Jan Dittberner <jandd at debian.org>
-Build-Depends: debhelper (>= 9), python
+Build-Depends: debhelper (>= 9),
+               python-all,
+               python3-all
 Build-Depends-Indep: dh-python,
                      python-django,
-                     python-releases | python3-releases,
+                     python-alabaster,
+                     python-releases,
                      python-setuptools,
-                     python-sphinx | python3-sphinx
+                     python-sphinx,
+                     python3-setuptools,
+                     python3-django
 Standards-Version: 3.9.6
 Homepage: https://github.com/brack3t/django-braces
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-django-braces/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-django-braces/trunk/
 X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.3
 
 Package: python-django-braces
 Architecture: all
 Depends: python-django,
          ${misc:Depends},
-         ${python:Depends},
-         ${sphinxdoc:Depends}
+         ${python:Depends}
+Suggests: python-django-braces-doc
 Description: set of reusable, generic mixins for Django class based views
  Django-braces provides a set of reusable, generic mixins for the Django
  class based views system. The mixins can be used for access control, form
  handling and other purposes.
+
+Package: python3-django-braces
+Architecture: all
+Depends: python3-django,
+         ${misc:Depends},
+         ${python3:Depends}
+Suggests: python-django-braces-doc
+Description: set of reusable, generic mixins for Django class based views (Python3 version)
+ Django-braces provides a set of reusable, generic mixins for the Django
+ class based views system. The mixins can be used for access control, form
+ handling and other purposes.
+ .
+ This package contains the Python 3 version of the library.
+
+Package: python-django-braces-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends},
+         ${sphinxdoc:Depends}
+Description: set of reusable, generic mixins for Django class based views (Documentation)
+ Django-braces provides a set of reusable, generic mixins for the Django
+ class based views system. The mixins can be used for access control, form
+ handling and other purposes.
+ .
+ This package contains the documentation.

Modified: packages/python-django-braces/trunk/debian/copyright
===================================================================
--- packages/python-django-braces/trunk/debian/copyright	2015-06-19 19:43:42 UTC (rev 33028)
+++ packages/python-django-braces/trunk/debian/copyright	2015-06-19 20:39:24 UTC (rev 33029)
@@ -1,54 +1,28 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: python-django-braces
+Upstream-Contact: Kenneth Love <kenneth at brack3t.com>, Chris Jones <chris at brack3t.com>
 Source: https://github.com/brack3t/django-braces
 
 Files: *
-Copyright: 2012-2013 Kenneth Love <kenneth at gigantuan.net>
-           2012-2013 Chris Jones <chris at brack3t.com>
-           2012 Daniel Greenfeld
-           2012 Drew Tempelmeyer
-           2012 Baptiste Mispelon
-           2013 Derek Payton
-           2013 Rafal Stozek
-           2013 Ethan Soergel
-           2013 Piotr Kilczuk
-           2013 Rodney Folz
-           2013 Markus Zapke-Gründemann
-License: BSD-3-clause
- Copyright (c) Brack3t and individual contributors.
- All rights reserved.
- .
- 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.
- .
- 3. Neither the name of Brack3t nor the names of its contributors may be used
-    to endorse or promote products derived from this software without
-    specific prior written permission.
- .
- 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.
+Copyright: 2012-2015, Kenneth Love <kenneth at gigantuan.net>
+           2012-2015, Chris Jones <chris at brack3t.com>
+           2012, Daniel Greenfeld
+           2012, Drew Tempelmeyer
+           2012, Baptiste Mispelon
+           2013, Derek Payton
+           2013, Rafal Stozek
+           2013, Ethan Soergel
+           2013, Piotr Kilczuk
+           2013, Rodney Folz
+           2013, Markus Zapke-Gründemann
+License: BSD-3-clause-Brack3t
 
 Files: debian/*
-Copyright: 2013 Jan Dittberner <jandd at debian.org>
-License: BSD-3-clause
- Copyright (c) 2013, Jan Dittberner
- All rights reserved.
- .
+Copyright: 2013, Jan Dittberner <jandd at debian.org>
+           2015, Michael Fladischer <fladi at debian.org>
+License: BSD-3-clause-Brack3t
+
+License: BSD-3-clause-Brack3t
  Redistribution and use in source and binary forms, with or without modification,
  are permitted provided that the following conditions are met:
  .
@@ -73,3 +47,4 @@
  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/python-django-braces/trunk/debian/docs
===================================================================
--- packages/python-django-braces/trunk/debian/docs	2015-06-19 19:43:42 UTC (rev 33028)
+++ packages/python-django-braces/trunk/debian/docs	2015-06-19 20:39:24 UTC (rev 33029)
@@ -1,3 +0,0 @@
-CONTRIBUTORS.txt
-README.md
-docs/_build/html

Added: packages/python-django-braces/trunk/debian/patches/alabaster-path.patch
===================================================================
--- packages/python-django-braces/trunk/debian/patches/alabaster-path.patch	                        (rev 0)
+++ packages/python-django-braces/trunk/debian/patches/alabaster-path.patch	2015-06-19 20:39:24 UTC (rev 33029)
@@ -0,0 +1,33 @@
+Description: Set path and extension for alabaster theme
+Author: Michael Fladischer <fladi at debian.org>
+Last-Update: 2015-05-05
+Forwarded: no
+
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -15,6 +15,7 @@
+ 
+ sys.path.insert(0, os.path.abspath('..'))
+ import braces
++import alabaster
+ from braces import __version__
+ 
+ # If extensions (or modules to document with autodoc) are in another directory,
+@@ -29,7 +30,7 @@
+ 
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['releases']
++extensions = ['releases', 'alabaster']
+ 
+ releases_issue_uri = "https://github.com/brack3t/django-braces/issues/%s"
+ releases_release_uri = "https://github.com/brack3t/django-braces/tree/%s"
+@@ -106,7 +107,7 @@
+ #html_theme_options = {}
+ 
+ # Add any paths that contain custom themes here, relative to this directory.
+-#html_theme_path = []
++html_theme_path = [alabaster.get_path()]
+ 
+ # The name for this set of Sphinx documents.  If None, it defaults to
+ # "<project> v<release> documentation".

Added: packages/python-django-braces/trunk/debian/patches/series
===================================================================
--- packages/python-django-braces/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-django-braces/trunk/debian/patches/series	2015-06-19 20:39:24 UTC (rev 33029)
@@ -0,0 +1 @@
+alabaster-path.patch

Copied: packages/python-django-braces/trunk/debian/python-django-braces-doc.doc-base (from rev 32491, packages/python-django-braces/trunk/debian/python-django-braces.doc-base)
===================================================================
--- packages/python-django-braces/trunk/debian/python-django-braces-doc.doc-base	                        (rev 0)
+++ packages/python-django-braces/trunk/debian/python-django-braces-doc.doc-base	2015-06-19 20:39:24 UTC (rev 33029)
@@ -0,0 +1,9 @@
+Document: python-django-braces-doc
+Title: Debian python-django-braces Manual
+Abstract: This manual describes what python-django-braces is
+ and how its mixins can help to write powerful Django views.
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-django-braces-doc/html/index.html
+Files: /usr/share/doc/python-django-braces-doc/html/*.html

Copied: packages/python-django-braces/trunk/debian/python-django-braces-doc.docs (from rev 33028, packages/python-django-braces/trunk/debian/docs)
===================================================================
--- packages/python-django-braces/trunk/debian/python-django-braces-doc.docs	                        (rev 0)
+++ packages/python-django-braces/trunk/debian/python-django-braces-doc.docs	2015-06-19 20:39:24 UTC (rev 33029)
@@ -0,0 +1 @@
+docs/_build/html

Deleted: packages/python-django-braces/trunk/debian/python-django-braces.doc-base
===================================================================
--- packages/python-django-braces/trunk/debian/python-django-braces.doc-base	2015-06-19 19:43:42 UTC (rev 33028)
+++ packages/python-django-braces/trunk/debian/python-django-braces.doc-base	2015-06-19 20:39:24 UTC (rev 33029)
@@ -1,9 +0,0 @@
-Document: python-django-braces
-Title: Debian python-django-braces Manual
-Abstract: This manual describes what python-django-braces is
- and how its mixins can help to write powerful Django views.
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-django-braces/html/index.html
-Files: /usr/share/doc/python-django-braces/html/*.html

Added: packages/python-django-braces/trunk/debian/python-django-braces.docs
===================================================================
--- packages/python-django-braces/trunk/debian/python-django-braces.docs	                        (rev 0)
+++ packages/python-django-braces/trunk/debian/python-django-braces.docs	2015-06-19 20:39:24 UTC (rev 33029)
@@ -0,0 +1,2 @@
+CONTRIBUTORS.txt
+README.md

Added: packages/python-django-braces/trunk/debian/python3-django-braces.docs
===================================================================
--- packages/python-django-braces/trunk/debian/python3-django-braces.docs	                        (rev 0)
+++ packages/python-django-braces/trunk/debian/python3-django-braces.docs	2015-06-19 20:39:24 UTC (rev 33029)
@@ -0,0 +1,2 @@
+CONTRIBUTORS.txt
+README.md

Modified: packages/python-django-braces/trunk/debian/rules
===================================================================
--- packages/python-django-braces/trunk/debian/rules	2015-06-19 19:43:42 UTC (rev 33028)
+++ packages/python-django-braces/trunk/debian/rules	2015-06-19 20:39:24 UTC (rev 33029)
@@ -5,16 +5,19 @@
 #export DH_VERBOSE=1
 export PYBUILD_NAME=django-braces
 
+%:
+	dh $@ --with=python2,python3,sphinxdoc --buildsystem=pybuild
+
 override_dh_auto_clean:
 	rm -rf docs/_build
 	dh_auto_clean
 
 override_dh_auto_build:
-	cd docs && $(MAKE) html
+	PYTHONPATH=. sphinx-build -b html -d docs/_build/.doctrees -N docs docs/_build/html
 	dh_auto_build
 
 override_dh_installchangelogs:
-	dh_installchangelogs -k debian/python-django-braces/usr/share/doc/python-django-braces/html/_sources/changelog.txt
+	dh_installchangelogs -- docs/changelog.rst
 
-%:
-	dh $@ --with=python2,sphinxdoc --buildsystem=pybuild
+override_dh_compress:
+	dh_compress -X changelog.html




More information about the Python-modules-commits mailing list