[Python-modules-commits] r28052 - in packages/fedmsg/trunk/debian (6 files)
olasd at users.alioth.debian.org
olasd at users.alioth.debian.org
Sat Mar 8 13:53:10 UTC 2014
Date: Saturday, March 8, 2014 @ 13:53:08
Author: olasd
Revision: 28052
New upstream release; refresh patches
Added:
packages/fedmsg/trunk/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch
Modified:
packages/fedmsg/trunk/debian/changelog
packages/fedmsg/trunk/debian/control
packages/fedmsg/trunk/debian/patches/series
Deleted:
packages/fedmsg/trunk/debian/patches/fix_test_paths
packages/fedmsg/trunk/debian/patches/strip_docs.diff
Modified: packages/fedmsg/trunk/debian/changelog
===================================================================
--- packages/fedmsg/trunk/debian/changelog 2014-03-08 09:52:26 UTC (rev 28051)
+++ packages/fedmsg/trunk/debian/changelog 2014-03-08 13:53:08 UTC (rev 28052)
@@ -1,3 +1,11 @@
+fedmsg (0.7.6-1) UNRELEASED; urgency=medium
+
+ * New upstream release (Closes: #738058)
+ * Update docs patch to use fedmsg_meta_debian
+ * Remove doc theming patch (cloud_sptheme is packaged)
+
+ -- Nicolas Dandrimont <olasd at debian.org> Sat, 08 Mar 2014 14:39:42 +0100
+
fedmsg (0.7.1-1) unstable; urgency=low
[ Simon Chopin ]
Modified: packages/fedmsg/trunk/debian/control
===================================================================
--- packages/fedmsg/trunk/debian/control 2014-03-08 09:52:26 UTC (rev 28051)
+++ packages/fedmsg/trunk/debian/control 2014-03-08 13:53:08 UTC (rev 28052)
@@ -7,6 +7,8 @@
debhelper (>= 9),
help2man,
python-all (>= 2.6.6-3~),
+ python-cloud-sptheme,
+ python-fedmsg-meta-debian,
python-setuptools,
python-zmq,
python-kitchen,
Added: packages/fedmsg/trunk/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch
===================================================================
--- packages/fedmsg/trunk/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch (rev 0)
+++ packages/fedmsg/trunk/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch 2014-03-08 13:53:08 UTC (rev 28052)
@@ -0,0 +1,15 @@
+Index: fedmsg-0.7.6/fedmsg/doc_utilities.py
+===================================================================
+--- fedmsg-0.7.6.orig/fedmsg/doc_utilities.py 2013-11-13 23:20:03.000000000 +0100
++++ fedmsg-0.7.6/fedmsg/doc_utilities.py 2014-03-08 14:49:53.731080218 +0100
+@@ -101,8 +101,8 @@
+ fname = output_dir + "/topics.rst"
+
+ global outfile
+- import fedmsg_meta_fedora_infrastructure
+- filename = fedmsg_meta_fedora_infrastructure.__file__
++ import fedmsg_meta_debian
++ filename = fedmsg_meta_debian.__file__
+ folder = os.path.sep + os.path.join(*filename.split('/')[:-1])
+ test_classes = load_classes(folder)
+
Deleted: packages/fedmsg/trunk/debian/patches/fix_test_paths
===================================================================
--- packages/fedmsg/trunk/debian/patches/fix_test_paths 2014-03-08 09:52:26 UTC (rev 28051)
+++ packages/fedmsg/trunk/debian/patches/fix_test_paths 2014-03-08 13:53:08 UTC (rev 28052)
@@ -1,26 +0,0 @@
-Description: Fix the paths used in the tests to lookup certificates
-Author: Simon Chopin <chopin.simon at gmail.com>
-Forwarded: not-needed
-
-Index: fedmsg-0.7.1/fedmsg/tests/fedmsg-test-config.py
-===================================================================
---- fedmsg-0.7.1.orig/fedmsg/tests/fedmsg-test-config.py 2013-10-05 11:09:07.980931873 +0200
-+++ fedmsg-0.7.1/fedmsg/tests/fedmsg-test-config.py 2013-10-05 11:09:59.641571536 +0200
-@@ -23,7 +23,7 @@
- import random
-
- SEP = os.path.sep
--here = os.getcwd()
-+here = SEP.join((os.getcwd(), 'fedmsg', 'tests'))
- hostname = socket.gethostname().split('.', 1)[0]
-
- ssl_enabled_for_tests = True
-@@ -74,7 +74,7 @@
- # SSL stuff.
- sign_messages=ssl_enabled_for_tests,
- validate_signatures=ssl_enabled_for_tests,
-- ssldir=SEP.join([here, 'dev_certs/keys']),
-+ ssldir=SEP.join([here, 'test_certs/keys']),
-
- crl_location="http://threebean.org/fedmsg-tests/crl.pem",
- crl_cache="/tmp/crl.pem",
Modified: packages/fedmsg/trunk/debian/patches/series
===================================================================
--- packages/fedmsg/trunk/debian/patches/series 2014-03-08 09:52:26 UTC (rev 28051)
+++ packages/fedmsg/trunk/debian/patches/series 2014-03-08 13:53:08 UTC (rev 28052)
@@ -1,5 +1,4 @@
-strip_docs.diff
default_prefix
no-tweet
remove_reference_to_google_web_fonts.diff
-fix_test_paths
+bypass_fedmsg_meta_fedora_infrastructure.patch
Deleted: packages/fedmsg/trunk/debian/patches/strip_docs.diff
===================================================================
--- packages/fedmsg/trunk/debian/patches/strip_docs.diff 2014-03-08 09:52:26 UTC (rev 28051)
+++ packages/fedmsg/trunk/debian/patches/strip_docs.diff 2014-03-08 13:53:08 UTC (rev 28052)
@@ -1,81 +0,0 @@
-Description: Remove theme and informations not available in Debian
- The Cloud theme as well as the fedmsg_meta_fedora_infrastructure are not
- available in Debian.
-Author: Simon Chopin <chopin.simon at gmail.com>
-Forwarded: not-needed
-
---- a/doc/_templates/layout.html
-+++ b/doc/_templates/layout.html
-@@ -1,4 +1,4 @@
--{% extends "cloud/layout.html" %}
-+{% extends "default/layout.html" %}
- {% block footer -%}
- {{ super() }}
- <a href="http://github.com/fedora-infra/fedmsg">
-diff --git a/doc/conf.py b/doc/conf.py
-index 54a82d7..1e4303a 100644
---- a/doc/conf.py
-+++ b/doc/conf.py
-@@ -26,61 +26,8 @@ import os
-
- # General configuration
- # ---------------------
--# import Cloud
--import cloud_sptheme as csp
--
--from fedmsg.doc_utilities import make_topics_doc
--here = os.path.dirname(os.path.abspath(__file__))
--make_topics_doc(here)
--
--# ... some contents omitted ...
--
--# set the html theme
--html_theme = "cloud"
--
--# ... some contents omitted ...
--
--# set the theme path to point to cloud's theme data
--html_theme_path = [csp.get_theme_dir()]
--
--# [optional] set some of the options listed above...
--html_theme_options = {
-- "sidebarwidth": "200px",
-- "max_width": "900px",
-- "compact_width": "800px",
-- "minimal_width": "700px",
--
-- # Style it like Fedora..
-- "bodyfont": "Cantarell",
--
-- "highlightcolor": "#060", # First Green
--
-- "sidebarbgcolor": "#FEFEFE",
-- "sidebartrimcolor": "#FEFEFE",
--
-- "sectionbgcolor": "#FEFEFE",
-- "sectiontrimcolor": "#FEFEFE",
-- "sectiontextcolor": "#444444",
--
-- "relbarbgcolor": "#FEFEFE",
-- "relbartextcolor": "#444444",
-- "relbarlinkcolor": "#444444",
--
-- "bgcolor": "#FEFEFE",
-- "textcolor": "#444444",
-- "linkcolor": "#060", # First Green
--
-- "headtextcolor": "#444444",
-- "headlinkcolor": "#444444",
--
-- #"codebgcolor"
-- #"codetextcolor"
-- "codetrimcolor": "#060", # First Green
--
-- "footerbgcolor": "#FEFEFE",
--
--}
-
-+html_theme = "default"
-
- # Add any Sphinx extension module names here, as strings. They can be
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
More information about the Python-modules-commits
mailing list