[Python-modules-commits] [twistar] 07/07: merge patched into master
Jan-Pascal van Best
janpascal-guest at moszumanska.debian.org
Mon Oct 12 21:32:28 UTC 2015
This is an automated email from the git hooks/post-receive script.
janpascal-guest pushed a commit to branch master
in repository twistar.
commit 7ef5c1e3e1f74bb518586430523cc9f2d50497a6
Merge: af4b8ef d80dcc5
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date: Wed Oct 7 16:41:01 2015 +0200
merge patched into master
debian/.git-dpm | 4 +--
.../0001-Fix-dbobject-delete_all-test.patch | 21 +++++++++++++++
...le-analytics-from-generated-documentation.patch | 31 ++++++++++++++++++++++
...-link-to-apidocs-from-documentation-index.patch | 21 +++++++++++++++
debian/patches/series | 3 +++
doc/index.xhtml | 1 +
doc/template.tpl | 11 --------
twistar/tests/test_dbobject.py | 1 +
8 files changed, 80 insertions(+), 13 deletions(-)
diff --cc debian/.git-dpm
index 853156b,0000000..0fad7dc
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- d6c8cb13a3374c74749cecf7f32dd57e55cbb7aa
- d6c8cb13a3374c74749cecf7f32dd57e55cbb7aa
++d80dcc5065c4411dde07d8ca554d5c17aa361eca
++d80dcc5065c4411dde07d8ca554d5c17aa361eca
+d6c8cb13a3374c74749cecf7f32dd57e55cbb7aa
+d6c8cb13a3374c74749cecf7f32dd57e55cbb7aa
+twistar_1.3.orig.tar.gz
+e9e501603d5b4f17db54f6a41d24c5f1317eab3c
+38670
diff --cc debian/patches/0001-Fix-dbobject-delete_all-test.patch
index 0000000,0000000..aad1605
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-dbobject-delete_all-test.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 20b1ef206597c25ae64cd7425e07dcb959e6ba71 Mon Sep 17 00:00:00 2001
++From: Jan-Pascal van Best <janpascal at vanbest.org>
++Date: Wed, 7 Oct 2015 16:39:39 +0200
++Subject: Fix dbobject delete_all test
++
++---
++ twistar/tests/test_dbobject.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/twistar/tests/test_dbobject.py b/twistar/tests/test_dbobject.py
++index 3e7ebdb..6611e90 100644
++--- a/twistar/tests/test_dbobject.py
+++++ b/twistar/tests/test_dbobject.py
++@@ -126,6 +126,7 @@ class DBObjectTest(unittest.TestCase):
++ self.assertEqual(result, None)
++
++
+++ @inlineCallbacks
++ def test_delete_all(self):
++ users = yield User.all()
++ ids = [user.id for user in users]
diff --cc debian/patches/0002-Remove-Google-analytics-from-generated-documentation.patch
index 0000000,0000000..afa23b9
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Remove-Google-analytics-from-generated-documentation.patch
@@@ -1,0 -1,0 +1,31 @@@
++From 853ab99ac8652721ef11da8be07368f54d6879ea Mon Sep 17 00:00:00 2001
++From: Jan-Pascal van Best <janpascal at vanbest.org>
++Date: Wed, 7 Oct 2015 16:40:23 +0200
++Subject: Remove Google analytics from generated documentation
++
++---
++ doc/template.tpl | 11 -----------
++ 1 file changed, 11 deletions(-)
++
++diff --git a/doc/template.tpl b/doc/template.tpl
++index 5d25cb1..5d26dbe 100644
++--- a/doc/template.tpl
+++++ b/doc/template.tpl
++@@ -4,17 +4,6 @@
++ <head>
++ <title>Twistar Documentation: </title>
++ <link type="text/css" rel="stylesheet" href="stylesheet.css" />
++- <script type="text/javascript">
++- var _gaq = _gaq || [];
++- _gaq.push(['_setAccount', 'UA-19398875-1']);
++- _gaq.push(['_trackPageview']);
++-
++- (function() {
++- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
++- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
++- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
++- })();
++- </script>
++ </head>
++
++ <body bgcolor="white">
diff --cc debian/patches/0003-Add-link-to-apidocs-from-documentation-index.patch
index 0000000,0000000..36d4c9f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Add-link-to-apidocs-from-documentation-index.patch
@@@ -1,0 -1,0 +1,21 @@@
++From d80dcc5065c4411dde07d8ca554d5c17aa361eca Mon Sep 17 00:00:00 2001
++From: Jan-Pascal van Best <janpascal at vanbest.org>
++Date: Wed, 7 Oct 2015 16:40:52 +0200
++Subject: Add link to apidocs from documentation index
++
++---
++ doc/index.xhtml | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/doc/index.xhtml b/doc/index.xhtml
++index f46e689..3e56bfd 100644
++--- a/doc/index.xhtml
+++++ b/doc/index.xhtml
++@@ -24,6 +24,7 @@ object. You must understand the propper use of these objects before most of thi
++ <li><a href="examples.xhtml">Basic Examples</a></li>
++ <li><a href="relationship_examples.xhtml">Examples With Relationships</a></li>
++ <li><a href="lowlevel.xhtml">Lowlevel Database Interaction</a></li>
+++ <li><a href="apidoc/">API Documentation</a></li>
++ </ul>
++
++ </body>
diff --cc debian/patches/series
index 0000000,0000000..fbf75cf
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,3 @@@
++0001-Fix-dbobject-delete_all-test.patch
++0002-Remove-Google-analytics-from-generated-documentation.patch
++0003-Add-link-to-apidocs-from-documentation-index.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/twistar.git
More information about the Python-modules-commits
mailing list