[Python-modules-commits] r27481 - in packages/flask-openid/trunk/debian (8 files)

Wed Jan 29 18:09:42 UTC 2014

Date: Wednesday, January 29, 2014 @ 18:09:41
  Author: sramacher
Revision: 27481

* New upstream release.
* Use pybuild buildsystem:
  - debian/rules: Add --buildsystem=pybuild to dh call.
  - debian/control: Add dh-python to Build-Depends.
* debian/control: Bump Standards-Version to 3.9.5, no changes required.
* debian/copyright: Update copyright years.
* debian/patches
  - sphinx-default-theme.patch: Removed, no longer needed.
  - github-fork.patch: Remove "Fork from github" button to fix
    privacy-breach-generic from lintian.
* Use dh_python2 to remove SOURCES.txt:
  - debian/python-flask-openid.pyremove: Add SOURCES.txt.
  - debian/rules: Remove override_dh_auto_install.

Added:
  packages/flask-openid/trunk/debian/patches/github-fork.patch
  packages/flask-openid/trunk/debian/python-flask-openid.pyremove
Modified:
  packages/flask-openid/trunk/debian/changelog
  packages/flask-openid/trunk/debian/control
  packages/flask-openid/trunk/debian/copyright
  packages/flask-openid/trunk/debian/patches/series
  packages/flask-openid/trunk/debian/rules
Deleted:
  packages/flask-openid/trunk/debian/patches/sphinx-default-theme.patch

Modified: packages/flask-openid/trunk/debian/changelog
===================================================================

--- packages/flask-openid/trunk/debian/changelog	2014-01-29 15:51:22 UTC (rev 27480)
+++ packages/flask-openid/trunk/debian/changelog	2014-01-29 18:09:41 UTC (rev 27481)
@@ -1,3 +1,21 @@
+flask-openid (1.2.1+dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * Use pybuild buildsystem:
+    - debian/rules: Add --buildsystem=pybuild to dh call.
+    - debian/control: Add dh-python to Build-Depends.
+  * debian/control: Bump Standards-Version to 3.9.5, no changes required.
+  * debian/copyright: Update copyright years.
+  * debian/patches
+    - sphinx-default-theme.patch: Removed, no longer needed.
+    - github-fork.patch: Remove "Fork from github" button to fix
+      privacy-breach-generic from lintian.
+  * Use dh_python2 to remove SOURCES.txt:
+    - debian/python-flask-openid.pyremove: Add SOURCES.txt.
+    - debian/rules: Remove override_dh_auto_install.
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Wed, 29 Jan 2014 19:08:59 +0100
+
 flask-openid (1.1.1+dfsg-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: packages/flask-openid/trunk/debian/control
===================================================================
--- packages/flask-openid/trunk/debian/control	2014-01-29 15:51:22 UTC (rev 27480)
+++ packages/flask-openid/trunk/debian/control	2014-01-29 18:09:41 UTC (rev 27481)
@@ -5,14 +5,15 @@
 Uploaders: Sebastian Ramacher <sramacher at debian.org>
 Build-Depends:
  debhelper (>= 9),
- python-all (>= 2.6.6-3~),
+ dh-python,
+ python-all,
  python-setuptools,
  python-sphinx (>= 1.0.7+dfsg),
  python-flask (>= 0.8),
  python-openid (>= 2.0),
  python-doc
 X-Python-Version: >= 2.6
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/flask-openid/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/flask-openid/trunk/
 Homepage: https://github.com/mitsuhiko/flask-openid

Modified: packages/flask-openid/trunk/debian/copyright
===================================================================
--- packages/flask-openid/trunk/debian/copyright	2014-01-29 15:51:22 UTC (rev 27480)
+++ packages/flask-openid/trunk/debian/copyright	2014-01-29 18:09:41 UTC (rev 27481)
@@ -10,7 +10,7 @@
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2013 Sebastian Ramacher <sramacher at debian.org>
+Copyright: 2013-2014 Sebastian Ramacher <sramacher at debian.org>
 License: BSD-3-clause
 
 License: BSD-3-clause

Added: packages/flask-openid/trunk/debian/patches/github-fork.patch
===================================================================
--- packages/flask-openid/trunk/debian/patches/github-fork.patch	                        (rev 0)
+++ packages/flask-openid/trunk/debian/patches/github-fork.patch	2014-01-29 18:09:41 UTC (rev 27481)
@@ -0,0 +1,18 @@
+Description: Remove "Fork from GitHub" button which loads images from the web
+Author: Sebastian Ramacher <sramacher at debian.org>
+Forwarded: not-needed
+Last-Update: 2014-01-29
+
+--- flask-openid-1.2.1+dfsg.orig/docs/_themes/flask_small/layout.html
++++ flask-openid-1.2.1+dfsg/docs/_themes/flask_small/layout.html
+@@ -13,10 +13,6 @@
+ {# do not display relbars #}
+ {% block relbar1 %}{% endblock %}
+ {% block relbar2 %}
+-  {% if theme_github_fork %}
+-    <a href="http://github.com/{{ theme_github_fork }}"><img style="position: fixed; top: 0; right: 0; border: 0;"
+-    src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" /></a>
+-  {% endif %}
+ {% endblock %}
+ {% block sidebar1 %}{% endblock %}
+ {% block sidebar2 %}{% endblock %}

Modified: packages/flask-openid/trunk/debian/patches/series
===================================================================
--- packages/flask-openid/trunk/debian/patches/series	2014-01-29 15:51:22 UTC (rev 27480)
+++ packages/flask-openid/trunk/debian/patches/series	2014-01-29 18:09:41 UTC (rev 27481)
@@ -1,2 +1,2 @@
-sphinx-default-theme.patch
 intersphinx-mapping.patch
+github-fork.patch

Deleted: packages/flask-openid/trunk/debian/patches/sphinx-default-theme.patch
===================================================================
--- packages/flask-openid/trunk/debian/patches/sphinx-default-theme.patch	2014-01-29 15:51:22 UTC (rev 27480)
+++ packages/flask-openid/trunk/debian/patches/sphinx-default-theme.patch	2014-01-29 18:09:41 UTC (rev 27481)
@@ -1,25 +0,0 @@
-Description: Use default theme for sphinx documentation
- The tarball is missing the flask_small theme. Until this is fixed in the
- tarball, build with the default theme.
-Author: Sebastian Ramacher <sramacher at debian.org>
-Forwarded: not-needed
-Last-Update: 2013-03-23
-
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -89,14 +89,12 @@
- 
- # The theme to use for HTML and HTML Help pages.  Major themes that come with
- # Sphinx are currently 'default' and 'sphinxdoc'.
--html_theme = 'flask_small'
-+html_theme = 'default'
- 
- # Theme options are theme-specific and customize the look and feel of a theme
- # further.  For a list of options available for each theme, see the
- # documentation.
- html_theme_options = {
--    'index_logo':       'flask-openid.png',
--    'github_fork':      'mitsuhiko/flask-openid'
- }
- 
- # Add any paths that contain custom themes here, relative to this directory.

Added: packages/flask-openid/trunk/debian/python-flask-openid.pyremove
===================================================================
--- packages/flask-openid/trunk/debian/python-flask-openid.pyremove	                        (rev 0)
+++ packages/flask-openid/trunk/debian/python-flask-openid.pyremove	2014-01-29 18:09:41 UTC (rev 27481)
@@ -0,0 +1 @@
+SOURCES.txt

Modified: packages/flask-openid/trunk/debian/rules
===================================================================
--- packages/flask-openid/trunk/debian/rules	2014-01-29 15:51:22 UTC (rev 27480)
+++ packages/flask-openid/trunk/debian/rules	2014-01-29 18:09:41 UTC (rev 27481)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with=python2,sphinxdoc
+	dh $@ --with=python2,sphinxdoc --buildsystem=pybuild
 
 override_dh_clean:
 	dh_clean
@@ -11,10 +11,6 @@
 	dh_auto_build
 	python setup.py build_sphinx
 
-override_dh_auto_install:
-	dh_auto_install
-	rm debian/tmp/usr/lib/python*/*-packages/Flask_OpenID-*.egg-info/SOURCES.txt
-
 DEB_DEBDIR=$(dir $(firstword $(MAKEFILE_LIST)))
 DEB_VER_DFSG=$(shell dpkg-parsechangelog -l$(DEB_DEBDIR)/changelog \
 	| sed -ne 's/^Version: \(.*\)-[^-]*/\1/p')


