[Python-modules-commits] r28060 - in packages/fedmsg/trunk/debian/patches (7 files)

Sun Mar 9 00:06:33 UTC 2014

Date: Sunday, March 9, 2014 @ 00:06:32
  Author: olasd
Revision: 28060

Refresh and update patches

Added:
  packages/fedmsg/trunk/debian/patches/fix_tests_path.diff
  packages/fedmsg/trunk/debian/patches/remove_references_to_external_resources_in_docs.diff
Modified:
  packages/fedmsg/trunk/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch
  packages/fedmsg/trunk/debian/patches/no-tweet
  packages/fedmsg/trunk/debian/patches/series
Deleted:
  packages/fedmsg/trunk/debian/patches/fix_test_certs_path.diff
  packages/fedmsg/trunk/debian/patches/remove_reference_to_google_web_fonts.diff

Modified: packages/fedmsg/trunk/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch
===================================================================

--- packages/fedmsg/trunk/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch	2014-03-08 22:19:41 UTC (rev 28059)
+++ packages/fedmsg/trunk/debian/patches/bypass_fedmsg_meta_fedora_infrastructure.patch	2014-03-09 00:06:32 UTC (rev 28060)
@@ -1,3 +1,7 @@
+Description: Replace fedmsg_meta_fedora_infrastructure with fedmsg_meta_debian
+Author: Nicolas Dandrimont <olasd at debian.org>
+Forwarded: not-needed
+
 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

Deleted: packages/fedmsg/trunk/debian/patches/fix_test_certs_path.diff
===================================================================
--- packages/fedmsg/trunk/debian/patches/fix_test_certs_path.diff	2014-03-08 22:19:41 UTC (rev 28059)
+++ packages/fedmsg/trunk/debian/patches/fix_test_certs_path.diff	2014-03-09 00:06:32 UTC (rev 28060)
@@ -1,11 +0,0 @@
---- fedmsg-0.7.6.orig/fedmsg/tests/fedmsg-test-config.py
-+++ fedmsg-0.7.6/fedmsg/tests/fedmsg-test-config.py
-@@ -23,7 +23,7 @@ import socket
- 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

Added: packages/fedmsg/trunk/debian/patches/fix_tests_path.diff
===================================================================
--- packages/fedmsg/trunk/debian/patches/fix_tests_path.diff	                        (rev 0)
+++ packages/fedmsg/trunk/debian/patches/fix_tests_path.diff	2014-03-09 00:06:32 UTC (rev 28060)
@@ -0,0 +1,16 @@
+Description: Fix the path for tests
+Author: Nicolas Dandrimont <olasd at debian.org>
+Forwarded: not-needed
+
+
+--- fedmsg-0.7.6.orig/fedmsg/tests/fedmsg-test-config.py
++++ fedmsg-0.7.6/fedmsg/tests/fedmsg-test-config.py
+@@ -23,7 +23,7 @@ import socket
+ 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

Modified: packages/fedmsg/trunk/debian/patches/no-tweet
===================================================================
--- packages/fedmsg/trunk/debian/patches/no-tweet	2014-03-08 22:19:41 UTC (rev 28059)
+++ packages/fedmsg/trunk/debian/patches/no-tweet	2014-03-09 00:06:32 UTC (rev 28060)
@@ -3,11 +3,11 @@
 Author: Simon Chopin <chopin.simon at gmail.com>
 Forwarded: not-needed
 
-Index: fedmsg-0.6.8+git20130809.1.44ccafe/setup.py
+Index: fedmsg-0.7.6/setup.py
 ===================================================================
---- fedmsg-0.6.8+git20130809.1.44ccafe.orig/setup.py	2013-08-12 12:07:29.926710364 +0200
-+++ fedmsg-0.6.8+git20130809.1.44ccafe/setup.py	2013-08-12 12:07:29.922710364 +0200
-@@ -125,7 +125,7 @@
+--- fedmsg-0.7.6.orig/setup.py	2014-03-09 00:44:40.061836768 +0100
++++ fedmsg-0.7.6/setup.py	2014-03-09 00:44:40.061836768 +0100
+@@ -146,7 +146,7 @@
              #"fedmsg-config=fedmsg.commands.config:config",
              "fedmsg-irc=fedmsg.commands.ircbot:ircbot",
              "fedmsg-collectd=fedmsg.commands.collectd:collectd",

Deleted: packages/fedmsg/trunk/debian/patches/remove_reference_to_google_web_fonts.diff
===================================================================
--- packages/fedmsg/trunk/debian/patches/remove_reference_to_google_web_fonts.diff	2014-03-08 22:19:41 UTC (rev 28059)
+++ packages/fedmsg/trunk/debian/patches/remove_reference_to_google_web_fonts.diff	2014-03-09 00:06:32 UTC (rev 28060)
@@ -1,12 +0,0 @@
-Description: <short summary of the patch>
-Author: Simon Chopin <chopin.simon at gmail.com>
-Forwarded: not-needed
-
---- fedmsg-0.6.8+git20130813.1.60346e0.orig/doc/_static/site.css
-+++ fedmsg-0.6.8+git20130813.1.60346e0/doc/_static/site.css
-@@ -1,5 +1,4 @@
- @import url("cloud.css");
-- at import url("http://fonts.googleapis.com/css?family=Comfortaa");
- 
- .fedmsg-logo span {
-     background: url("fedmsg.png") no-repeat scroll 0 0 transparent;

Added: packages/fedmsg/trunk/debian/patches/remove_references_to_external_resources_in_docs.diff
===================================================================
--- packages/fedmsg/trunk/debian/patches/remove_references_to_external_resources_in_docs.diff	                        (rev 0)
+++ packages/fedmsg/trunk/debian/patches/remove_references_to_external_resources_in_docs.diff	2014-03-09 00:06:32 UTC (rev 28060)
@@ -0,0 +1,58 @@
+Description: <short summary of the patch>
+Author: Simon Chopin <chopin.simon at gmail.com>
+Forwarded: not-needed
+
+Index: fedmsg-0.7.6/doc/_static/site.css
+===================================================================
+--- fedmsg-0.7.6.orig/doc/_static/site.css	2014-03-09 00:55:16.557560231 +0100
++++ fedmsg-0.7.6/doc/_static/site.css	2014-03-09 00:55:16.549560637 +0100
+@@ -1,5 +1,4 @@
+ @import url("cloud.css");
+- at import url("http://fonts.googleapis.com/css?family=Comfortaa");
+ 
+ .fedmsg-logo span {
+     background: url("fedmsg.png") no-repeat scroll 0 0 transparent;
+Index: fedmsg-0.7.6/doc/_templates/fedmsg-logo.html
+===================================================================
+--- fedmsg-0.7.6.orig/doc/_templates/fedmsg-logo.html	2014-03-09 00:55:16.557560231 +0100
++++ fedmsg-0.7.6/doc/_templates/fedmsg-logo.html	2014-03-09 00:55:16.549560637 +0100
+@@ -1,3 +1 @@
+ <h1 class='fedmsg-logo'><span></span>fedmsg</h1>
+-<iframe src="http://ghbtns.com/github-btn.html?user=fedora-infra&repo=fedmsg&type=watch&count=true&size=large"
+-    allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px"></iframe>
+Index: fedmsg-0.7.6/doc/_templates/page.html
+===================================================================
+--- fedmsg-0.7.6.orig/doc/_templates/page.html	2014-03-09 00:55:16.557560231 +0100
++++ fedmsg-0.7.6/doc/_templates/page.html	2014-03-09 00:55:16.549560637 +0100
+@@ -1,9 +1,4 @@
+ {% extends "!page.html" %}
+ {% block footer -%}
+ {{ super() }}
+-<a href="http://github.com/fedora-infra/fedmsg">
+-  <img style="position: absolute; top: 0; right: 0; border: 0; max-width: 149px;"
+-  src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"
+-  alt="Fork me on GitHub">
+-</a>
+ {%- endblock %}
+Index: fedmsg-0.7.6/doc/proposal.rst
+===================================================================
+--- fedmsg-0.7.6.orig/doc/proposal.rst	2013-10-22 21:15:27.000000000 +0200
++++ fedmsg-0.7.6/doc/proposal.rst	2014-03-09 00:55:44.560140048 +0100
+@@ -154,7 +154,7 @@
+ as an example of how Fedora Infrastructure could be reorganized with AMQP
+ and a set of federated AMQP brokers (qpid).
+ 
+-.. image:: https://github.com/fedora-infra/fedmsg/raw/develop/doc/_static/reorganize-amqp-j5.png
++.. image:: _static/reorganize-amqp-j5.png
+ 
+ The gist is that each service in the Fedora Infrastructure would have the
+ address of a central message broker on hand.  On startup, each service would
+@@ -185,7 +185,7 @@
+ organized with a decentralized 0mq bus parallel to the spirit of J5's
+ recreated diagram in the AMQP section above.
+ 
+-.. image:: https://github.com/fedora-infra/fedmsg/raw/develop/doc/_static/reorganize-0mq-overview.png
++.. image:: _static/reorganize-0mq-overview.png
+ 
+ No broker.  The gist is that each service will open a port and begin
+ publishing messages ("bind to" in zmq-language).  Each other service will

Modified: packages/fedmsg/trunk/debian/patches/series
===================================================================
--- packages/fedmsg/trunk/debian/patches/series	2014-03-08 22:19:41 UTC (rev 28059)
+++ packages/fedmsg/trunk/debian/patches/series	2014-03-09 00:06:32 UTC (rev 28060)
@@ -1,5 +1,5 @@
 default_prefix
 no-tweet
-remove_reference_to_google_web_fonts.diff
+remove_references_to_external_resources_in_docs.diff
 bypass_fedmsg_meta_fedora_infrastructure.patch
-fix_test_certs_path.diff
+fix_tests_path.diff


