[Python-modules-commits] [sqlobject] 17/20: merge patched into master
Neil Muller
drnlmza-guest at moszumanska.debian.org
Thu Sep 1 20:31:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
drnlmza-guest pushed a commit to branch master
in repository sqlobject.
commit 21fa542f43cc34fe1807f337a5d68efa255ec782
Merge: 101faf3 e9a9323
Author: Neil Muller <drnlmuller+debian at gmail.com>
Date: Thu Sep 1 11:48:50 2016 +0200
merge patched into master
debian/.git-dpm | 4 ++--
.../patches/0005-Remove-docs-from-installed-files.patch | 2 +-
debian/patches/change_doc_build_script | 11 ++++++-----
debian/patches/remove_pkg_resources | 2 +-
debian/patches/replace_logos | 17 ++++++++---------
docs/rebuild | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
diff --cc debian/.git-dpm
index 8141a76,0000000..7d89bdb
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- b1214f54b1b5bb7f8864a0afd12883e2fb4733f7
- b1214f54b1b5bb7f8864a0afd12883e2fb4733f7
++e9a932305b79254971e05490bc9143776ea8e439
++e9a932305b79254971e05490bc9143776ea8e439
+d2df5da8629c9934b60ab99d1632f0494c56e00a
+d2df5da8629c9934b60ab99d1632f0494c56e00a
+sqlobject_3.1.0+dfsg.orig.tar.gz
+fc71b97f3dbe63ea8a2ebc29c96073e606949ea7
+902976
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0005-Remove-docs-from-installed-files.patch
index 56c74b9,0000000..24a97c4
mode 100644,000000..100644
--- a/debian/patches/0005-Remove-docs-from-installed-files.patch
+++ b/debian/patches/0005-Remove-docs-from-installed-files.patch
@@@ -1,44 -1,0 +1,44 @@@
- From b1214f54b1b5bb7f8864a0afd12883e2fb4733f7 Mon Sep 17 00:00:00 2001
++From e9a932305b79254971e05490bc9143776ea8e439 Mon Sep 17 00:00:00 2001
+From: Neil <neil at dip.sun.ac.za>
+Date: Thu, 29 Oct 2015 13:33:31 +0200
+Subject: Remove docs from installed files
+
+We don't want to install the documentation in the package as well,
+since we already install it under /usr/share/doc, so we exclude
+it from setup.py
+---
+ setup.py | 21 ---------------------
+ 1 file changed, 21 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index aafa3a1..1753c84 100755
+--- a/setup.py
++++ b/setup.py
+@@ -89,27 +89,6 @@ and `GitHub <https://github.com/sqlobject>`_.
+ packages=["sqlobject"] +
+ ['sqlobject.%s' % package for package in subpackages],
+ scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],
+- package_data={"sqlobject":
+- [
+- "../docs/LICENSE", "../docs/*.rst", "../docs/*.css",
+- "../docs/html/*.html", "../docs/html/*.css",
+- "../docs/html/sqlobject/*.html",
+- "../docs/html/sqlobject/firebird/*.html",
+- "../docs/html/sqlobject/include/*.html",
+- "../docs/html/sqlobject/inheritance/*.html",
+- "../docs/html/sqlobject/manager/*.html",
+- "../docs/html/sqlobject/maxdb/*.html",
+- "../docs/html/sqlobject/mssql/*.html",
+- "../docs/html/sqlobject/mysql/*.html",
+- "../docs/html/sqlobject/postgres/*.html",
+- "../docs/html/sqlobject/rdbhost/*.html",
+- "../docs/html/sqlobject/sqlite/*.html",
+- "../docs/html/sqlobject/sybase/*.html",
+- "../docs/html/sqlobject/util/*.html",
+- "../docs/html/sqlobject/versioning/*.html",
+- ],
+- "sqlobject.maxdb": ["readme.txt"],
+- },
+ requires=['FormEncode', 'PyDispatcher'],
+ **kw
+ )
diff --cc debian/patches/change_doc_build_script
index d5cbed1,0000000..d33369b
mode 100644,000000..100644
--- a/debian/patches/change_doc_build_script
+++ b/debian/patches/change_doc_build_script
@@@ -1,31 -1,0 +1,32 @@@
- From 99977fdda9307c1d7b508d4ee96ca367ccdfe816 Mon Sep 17 00:00:00 2001
++From 0fb824590378ef261ac0cfc902f96b2338d88b6b Mon Sep 17 00:00:00 2001
+From: Neil Muller <drnlmuller+debian at gmail.com>
+Date: Thu, 8 Oct 2015 14:08:55 -0700
+Subject: Use rst2html from python-docutils to build the documentation.
+
+Forwarded: not-needed
+Last-Update: 2014-04-13
+
+Patch-Name: change_doc_build_script
+---
- docs/rebuild | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
++ docs/rebuild | 6 +++---
++ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/docs/rebuild b/docs/rebuild
- index c5313e0..4e06f4c 100755
++index c5313e0..31b0077 100755
+--- a/docs/rebuild
++++ b/docs/rebuild
+@@ -12,11 +12,11 @@ NORMAL="Authors DeveloperGuide FAQ Inheritance
+ community download index links sqlobject-admin"
+
+ for NAME in $NORMAL ; do
+- if [ -e "$NAME.html" -a ! "$NAME.html" -ot "$NAME.rst" ] ; then
++ if [ -e "docs/$NAME.html" -a ! "docs/$NAME.html" -ot "docs/$NAME.rst" ] ; then
+ echo "$NAME is up to date."
+ continue
+ fi
+ echo "Building $NAME."
+- rst2html.py --no-toc-backlinks --stylesheet=default.css --link-stylesheet \
++- -- "$NAME.rst" > "$NAME.html"
++ rst2html --no-toc-backlinks --stylesheet=default.css --link-stylesheet \
- -- "$NAME.rst" > "$NAME.html"
+++ -- "docs/$NAME.rst" > "docs/$NAME.html"
+ done
diff --cc debian/patches/remove_pkg_resources
index bf0a066,0000000..64c23c4
mode 100644,000000..100644
--- a/debian/patches/remove_pkg_resources
+++ b/debian/patches/remove_pkg_resources
@@@ -1,31 -1,0 +1,31 @@@
- From 53331ed0659c05ed01c3a60eaa187d66ced4457a Mon Sep 17 00:00:00 2001
++From 3b13d16cfb4d6c756123d73449c05336413b09c9 Mon Sep 17 00:00:00 2001
+From: Neil Muller <drnlmuller+debian at gmail.com>
+Date: Thu, 8 Oct 2015 14:08:56 -0700
+Subject: We don't need pkg_resources to run the test suite during the
+
+ build, so remove that dependency.
+Forwarded: not-needed
+Last-Update: 2014-04-13
+
+Patch-Name: remove_pkg_resources
+---
+ sqlobject/conftest.py | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/sqlobject/conftest.py b/sqlobject/conftest.py
+index 1d9dc26..967ab44 100644
+--- a/sqlobject/conftest.py
++++ b/sqlobject/conftest.py
+@@ -6,12 +6,6 @@ application.
+ import py
+ import sqlobject
+
+-try:
+- import pkg_resources
+-except ImportError: # Python 2.2
+- pass
+-else:
+- pkg_resources.require('SQLObject')
+
+ # Override some options (doesn't override command line):
+ verbose = 0
diff --cc debian/patches/replace_logos
index 413623a,0000000..bd62851
mode 100644,000000..100644
--- a/debian/patches/replace_logos
+++ b/debian/patches/replace_logos
@@@ -1,470 -1,0 +1,469 @@@
- From e384926bebf74d856340b0c19e0e07566d81ea19 Mon Sep 17 00:00:00 2001
++From 0825dde07aecfd7f29b23e1d7d1da57b3e25ee24 Mon Sep 17 00:00:00 2001
+From: Neil Muller <drnlmuller+debian at gmail.com>
+Date: Thu, 8 Oct 2015 14:08:57 -0700
- Subject: Replace the image link to the sourceforge site with a simple text
++Subject: Replace the image links simple text links.
+
- footer including the link.
- .
- The image link links to an external sourceforge url, which triggers lintian's
- privacy-breach-logo error. This avoids the entire issue and avoids dragging
- the sourceforge logo into the package.
- Last-Update: 2015-10-28
++ The image links link to several external sites (sourceforge, travis-ci,
++ circleci.com and so forth), which triggers lintian's privacy-breach-logo
++ error. This avoids the entire issue and avoids dragging the logos into
++ the package.
++Last-Update: 2016-09-01
+
- Patch-Name: replace_sf_logo
++Patch-Name: replace_logos
+---
+ docs/Authors.rst | 10 +++-------
+ docs/DeveloperGuide.rst | 30 +++++++++++-------------------
+ docs/FAQ.rst | 10 +++-------
+ docs/Inheritance.rst | 10 +++-------
+ docs/News.rst | 10 +++-------
+ docs/News1.rst | 10 +++-------
+ docs/News2.rst | 10 +++-------
+ docs/News3.rst | 10 +++-------
+ docs/News4.rst | 10 +++-------
+ docs/News5.rst | 10 +++-------
+ docs/Python3.rst | 10 +++-------
+ docs/SQLBuilder.rst | 10 +++-------
+ docs/SQLObject.rst | 10 +++-------
+ docs/SelectResults.rst | 10 +++-------
+ docs/TODO.rst | 10 +++-------
+ docs/Versioning.rst | 10 +++-------
+ docs/Views.rst | 10 +++-------
+ docs/community.rst | 10 +++-------
+ docs/download.rst | 10 +++-------
+ docs/index.rst | 10 +++-------
+ docs/links.rst | 10 +++-------
+ docs/sqlobject-admin.rst | 10 +++-------
+ 22 files changed, 74 insertions(+), 166 deletions(-)
+
+diff --git a/docs/Authors.rst b/docs/Authors.rst
+index cf35dfc..556b9f2 100644
+--- a/docs/Authors.rst
++++ b/docs/Authors.rst
+@@ -36,10 +36,6 @@ Contributions have been made by:
+ * Lutz Steinborn <l.steinborn at 4c-gmbh.de>
+ * Oleg Broytman <phd at phdru.name>
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/DeveloperGuide.rst b/docs/DeveloperGuide.rst
+index 588c781..4f07c57 100644
+--- a/docs/DeveloperGuide.rst
++++ b/docs/DeveloperGuide.rst
+@@ -257,13 +257,11 @@ forced to write the test. That's no fun for us, to just be writing
+ tests. So please, write tests; everything at least needs to be
+ exercised, even if the tests are absolutely complete.
+
+-We now use Travis CI and Circle CI to run tests. See the statuses:
++We now use Travis CI and Circle CI to run tests.
+
+-.. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=master
+- :target: https://travis-ci.org/sqlobject/sqlobject
+-
+-.. image:: https://circleci.com/gh/sqlobject/sqlobject.svg?style=shield
+- :target: https://circleci.com/gh/sqlobject/sqlobject
++Visit `Travis CI status <<https://travis-ci.org/sqlobject/sqlobject>` or
++`Circle CI status <https://circleci.com/gh/sqlobject/sqlobject>` to see the
++current status.
+
+ To avoid triggering unnecessary test run at CI services add text `[skip ci]
+ <https://docs.travis-ci.com/user/customizing-the-build/#skipping-a-build>`_ or
+@@ -273,13 +271,11 @@ messages for commits that don't change code (documentation updates and such).
+ We use `coverage.py <https://pypi.python.org/pypi/coverage>`_
+ to measures code coverage by tests and upload the result for analyzis to
+ `Coveralls <https://coveralls.io/github/sqlobject/sqlobject>`_ and
+-`Codecov <https://codecov.io/gh/sqlobject/sqlobject>`_:
+-
+-.. image:: https://coveralls.io/repos/github/sqlobject/sqlobject/badge.svg?branch=master
+- :target: https://coveralls.io/github/sqlobject/sqlobject?branch=master
++`Codecov <https://codecov.io/gh/sqlobject/sqlobject>`_.
+
+-.. image:: https://codecov.io/gh/sqlobject/sqlobject/branch/master/graph/badge.svg
+- :target: https://codecov.io/gh/sqlobject/sqlobject
++Visit `Coveralls status <https://coveralls.io/github/sqlobject/sqlobject?branch=master>`
++or `Codecov status <https://codecov.io/gh/sqlobject/sqlobject>` to see the
++current status.
+
+ Documentation
+ =============
+@@ -289,10 +285,6 @@ directory. Pudge converts documentation from Restructured Text to
+ HTML. It presently requires kid 0.9.6, which must be obtained
+ separately (for instance, from https://pypi.python.org/pypi/kid/0.9.6).
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/FAQ.rst b/docs/FAQ.rst
+index 3238efb..d905c01 100644
+--- a/docs/FAQ.rst
++++ b/docs/FAQ.rst
+@@ -588,10 +588,6 @@ Maybe you want to specify the charset too? No problem::
+ COLLATE utf8_estonian_ci''']
+ }
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/Inheritance.rst b/docs/Inheritance.rst
+index 38ed2e6..351a874 100644
+--- a/docs/Inheritance.rst
++++ b/docs/Inheritance.rst
+@@ -327,10 +327,6 @@ Limitations and notes
+ * If you have suggestion, bugs, or patch to this patch, you can
+ contact the SQLObject team: <sqlobject-discuss at lists.sourceforge.net>
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/News.rst b/docs/News.rst
+index c18e70a..6dcfb17 100644
+--- a/docs/News.rst
++++ b/docs/News.rst
+@@ -83,10 +83,6 @@ Documentation
+
+ .. __: News5.html
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/News1.rst b/docs/News1.rst
+index 77296c2..eca06a1 100644
+--- a/docs/News1.rst
++++ b/docs/News1.rst
+@@ -456,10 +456,6 @@ Features
+
+ .. _Col docs: SQLObject.html#col-class-specifying-columns
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/News2.rst b/docs/News2.rst
+index 9a37d77..19fc7e4 100644
+--- a/docs/News2.rst
++++ b/docs/News2.rst
+@@ -597,10 +597,6 @@ Bug Fixes
+
+ .. __: News1.html
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/News3.rst b/docs/News3.rst
+index a680527..3d20a5d 100644
+--- a/docs/News3.rst
++++ b/docs/News3.rst
+@@ -382,10 +382,6 @@ Bug Fixes
+
+ .. __: News2.html
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/News4.rst b/docs/News4.rst
+index 11f76d4..71c1bd4 100644
+--- a/docs/News4.rst
++++ b/docs/News4.rst
+@@ -323,10 +323,6 @@ Minor features
+
+ .. __: News3.html
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/News5.rst b/docs/News5.rst
+index 6f1118c..a415164 100644
+--- a/docs/News5.rst
++++ b/docs/News5.rst
+@@ -634,10 +634,6 @@ Features & Interface
+
+ .. __: News4.html
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/Python3.rst b/docs/Python3.rst
+index f14b106..8d7b08c 100644
+--- a/docs/Python3.rst
++++ b/docs/Python3.rst
+@@ -81,10 +81,6 @@ Python 3.
+ If a character set wasn't specified, then things may work if the character set
+ is set to match the dbEncoding parameter used when defining the UnicodeCol.
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/SQLBuilder.rst b/docs/SQLBuilder.rst
+index f2678fe..d27a40a 100644
+--- a/docs/SQLBuilder.rst
++++ b/docs/SQLBuilder.rst
+@@ -259,10 +259,6 @@ call. To work around this issue, use ``IN``::
+ IN(PersonWorkplace.q.WorkplaceID,
+ Select(Workplace.q.id, Workplace.q.id==SOME_ID)))
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/SQLObject.rst b/docs/SQLObject.rst
+index d207a0a..9b67072 100644
+--- a/docs/SQLObject.rst
++++ b/docs/SQLObject.rst
+@@ -2125,10 +2125,6 @@ Documentation`_.
+ .. _SQLBuilder: SQLBuilder.html
+ .. _`SQLBuilder Documentation`: SQLBuilder.html
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/SelectResults.rst b/docs/SelectResults.rst
+index 7f2836e..feb885a 100644
+--- a/docs/SelectResults.rst
++++ b/docs/SelectResults.rst
+@@ -193,10 +193,6 @@ named ``teachers``. Similarily, with a self-joining foreign key named
+ returns a SelectResult of Persons who are the paternal grandfather of someone
+ named ``Steve``.
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/TODO.rst b/docs/TODO.rst
+index cad9938..a09598d 100644
+--- a/docs/TODO.rst
++++ b/docs/TODO.rst
+@@ -121,10 +121,6 @@ TODO
+ * Allow to override ConsoleWriter/LogWriter classes and makeDebugWriter
+ function.
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/Versioning.rst b/docs/Versioning.rst
+index 7666e53..a6409a8 100644
+--- a/docs/Versioning.rst
++++ b/docs/Versioning.rst
+@@ -84,10 +84,6 @@ for a versioned class is created. Version tables are not altered when
+ the main table is altered, so if you add a column to your main class,
+ you will need to manually add the column to your version table.
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/Views.rst b/docs/Views.rst
+index f2cc9cd..f48c4d8 100644
+--- a/docs/Views.rst
++++ b/docs/Views.rst
+@@ -62,10 +62,6 @@ View classes::
+ calls = SQLMultipleJoin('PhoneCall', joinColumn='phoneNumberID')
+ vCalls = SQLMultipleJoin('ViewPhoneCall', joinColumn='phoneNumberID')
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/community.rst b/docs/community.rst
+index 2e75642..1f04d73 100644
+--- a/docs/community.rst
++++ b/docs/community.rst
+@@ -32,10 +32,6 @@ contributors.
+ One can also contribute to `community-editable recipe/documentation site
+ <https://sites.google.com/site/sqlobject/>`_.
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/download.rst b/docs/download.rst
+index 07349a9..62f03ac 100644
+--- a/docs/download.rst
++++ b/docs/download.rst
+@@ -49,10 +49,6 @@ Before switching to git development was performed at the `Subversion
+ <https://subversion.apache.org/>`_ repository that is still located at
+ http://svn.colorstudy.com/SQLObject
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/index.rst b/docs/index.rst
+index ff0f463..6dd6d61 100644
+--- a/docs/index.rst
++++ b/docs/index.rst
+@@ -65,10 +65,6 @@ Here's how you'd use the object::
+ >>> p is p2
+ True
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/links.rst b/docs/links.rst
+index ff1ab36..bb6939f 100644
+--- a/docs/links.rst
++++ b/docs/links.rst
+@@ -44,10 +44,6 @@ Open Source Projects
+ * `My Newspaper <http://inigo.katxi.org/devel/mynewspaper/>`_, a
+ personal RSS Aggregator and Reader.
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
+diff --git a/docs/sqlobject-admin.rst b/docs/sqlobject-admin.rst
+index 94a2f21..7e77555 100644
+--- a/docs/sqlobject-admin.rst
++++ b/docs/sqlobject-admin.rst
+@@ -209,10 +209,6 @@ Future
+
+ * A command to trim versions, by merging upgrade scripts.
+
+-.. image:: https://sourceforge.net/sflogo.php?group_id=74338&type=10
+- :target: https://sourceforge.net/projects/sqlobject
+- :class: noborder
+- :align: center
+- :height: 15
+- :width: 80
+- :alt: Get SQLObject at SourceForge.net. Fast, secure and Free Open Source software downloads
++.. footer:: Get SQLObject at Sourceforge.net_. Fast, secure and Free Open Source software downloads
++
++.. _Sourceforge.net: http://sourceforge.net/projects/sqlobject
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sqlobject.git
More information about the Python-modules-commits
mailing list