[Python-modules-commits] [sqlobject] 08/20: merge patched into master
Neil Muller
drnlmza-guest at moszumanska.debian.org
Thu Sep 1 20:31:40 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 fe6850918a565412dfe519c6b7f5e1927144fff9
Merge: 56fc99c b1214f5
Author: Neil Muller <drnlmuller+debian at gmail.com>
Date: Thu Sep 1 11:15:35 2016 +0200
merge patched into master
.travis.yml | 19 +-
MANIFEST.in | 13 +-
PKG-INFO | 6 +-
README.txt => README.rst | 4 +-
SQLObject.egg-info/PKG-INFO | 6 +-
SQLObject.egg-info/SOURCES.txt | 113 +-
SQLObject.egg-info/requires.txt | 2 +-
circle.yml | 9 +
debian/.git-dpm | 6 +-
.../0005-Remove-docs-from-installed-files.patch | 10 +-
...vis-ci-image-link-due-to-privacy-concerns.patch | 26 -
debian/patches/change_doc_build_script | 15 +-
debian/patches/get_rid_of_setuptools | 6 +-
debian/patches/remove_pkg_resources | 2 +-
debian/patches/replace_sf_logo | 294 +-
debian/patches/series | 1 -
docs/.gitignore | 1 +
docs/{Authors.txt => Authors.rst} | 1 +
docs/DeveloperGuide.rst | 290 ++
docs/DeveloperGuide.txt | 200 --
docs/{FAQ.txt => FAQ.rst} | 0
docs/{Inheritance.txt => Inheritance.rst} | 10 +-
docs/News.rst | 88 +
docs/{News1.txt => News1.rst} | 0
docs/{News2.txt => News2.rst} | 18 +-
docs/{News3.txt => News3.rst} | 2 +-
docs/{News4.txt => News4.rst} | 0
docs/{News.txt => News5.rst} | 27 -
docs/{Python3.txt => Python3.rst} | 5 +-
docs/{SQLBuilder.txt => SQLBuilder.rst} | 0
docs/{SQLObject.txt => SQLObject.rst} | 61 +-
docs/{SelectResults.txt => SelectResults.rst} | 0
docs/{TODO.txt => TODO.rst} | 9 +-
docs/{Versioning.txt => Versioning.rst} | 2 +
docs/{Views.txt => Views.rst} | 0
docs/{community.txt => community.rst} | 0
docs/{download.txt => download.rst} | 15 +-
docs/html/Authors.html | 1 +
docs/html/DeveloperGuide.html | 118 +-
docs/html/Inheritance.html | 27 +-
docs/html/News.html | 740 +---
docs/html/News2.html | 17 +-
docs/html/News3.html | 2 +-
docs/html/{News.html => News5.html} | 237 +-
docs/html/Python3.html | 1 +
docs/html/SQLObject.html | 296 +-
docs/html/TODO.html | 9 +-
docs/html/Versioning.html | 24 +-
docs/html/class-sqlobject.col.BLOBCol.html | 10 +-
docs/html/class-sqlobject.col.BigIntCol.html | 10 +-
docs/html/class-sqlobject.col.BoolCol.html | 10 +-
docs/html/class-sqlobject.col.Col.html | 10 +-
docs/html/class-sqlobject.col.CurrencyCol.html | 10 +-
docs/html/class-sqlobject.col.DateCol.html | 10 +-
docs/html/class-sqlobject.col.DateTimeCol.html | 12 +-
docs/html/class-sqlobject.col.DecimalCol.html | 10 +-
.../html/class-sqlobject.col.DecimalStringCol.html | 10 +-
docs/html/class-sqlobject.col.EnumCol.html | 10 +-
docs/html/class-sqlobject.col.FloatCol.html | 10 +-
docs/html/class-sqlobject.col.ForeignKey.html | 10 +-
docs/html/class-sqlobject.col.IntCol.html | 10 +-
...teCol.html => class-sqlobject.col.JSONCol.html} | 26 +-
...tCol.html => class-sqlobject.col.JsonbCol.html} | 26 +-
docs/html/class-sqlobject.col.KeyCol.html | 10 +-
docs/html/class-sqlobject.col.MediumIntCol.html | 10 +-
docs/html/class-sqlobject.col.PickleCol.html | 10 +-
docs/html/class-sqlobject.col.SOBLOBCol.html | 40 +-
docs/html/class-sqlobject.col.SOBigIntCol.html | 42 +-
docs/html/class-sqlobject.col.SOBoolCol.html | 42 +-
docs/html/class-sqlobject.col.SOCol.html | 42 +-
docs/html/class-sqlobject.col.SOCurrencyCol.html | 40 +-
docs/html/class-sqlobject.col.SODateCol.html | 40 +-
docs/html/class-sqlobject.col.SODateTimeCol.html | 40 +-
docs/html/class-sqlobject.col.SODecimalCol.html | 40 +-
.../class-sqlobject.col.SODecimalStringCol.html | 40 +-
docs/html/class-sqlobject.col.SOEnumCol.html | 40 +-
docs/html/class-sqlobject.col.SOFloatCol.html | 42 +-
docs/html/class-sqlobject.col.SOForeignKey.html | 50 +-
docs/html/class-sqlobject.col.SOIntCol.html | 42 +-
...Col.html => class-sqlobject.col.SOJSONCol.html} | 90 +-
...ol.html => class-sqlobject.col.SOJsonbCol.html} | 98 +-
docs/html/class-sqlobject.col.SOKeyCol.html | 40 +-
docs/html/class-sqlobject.col.SOMediumIntCol.html | 42 +-
docs/html/class-sqlobject.col.SOPickleCol.html | 40 +-
docs/html/class-sqlobject.col.SOSetCol.html | 40 +-
docs/html/class-sqlobject.col.SOSmallIntCol.html | 42 +-
docs/html/class-sqlobject.col.SOStringCol.html | 40 +-
docs/html/class-sqlobject.col.SOStringLikeCol.html | 40 +-
docs/html/class-sqlobject.col.SOTimeCol.html | 40 +-
docs/html/class-sqlobject.col.SOTimedeltaCol.html | 42 +-
docs/html/class-sqlobject.col.SOTimestampCol.html | 40 +-
docs/html/class-sqlobject.col.SOTinyIntCol.html | 42 +-
docs/html/class-sqlobject.col.SOUnicodeCol.html | 40 +-
...Col.html => class-sqlobject.col.SOUuidCol.html} | 98 +-
docs/html/class-sqlobject.col.SetCol.html | 10 +-
docs/html/class-sqlobject.col.SmallIntCol.html | 10 +-
docs/html/class-sqlobject.col.StringCol.html | 10 +-
docs/html/class-sqlobject.col.TimeCol.html | 10 +-
docs/html/class-sqlobject.col.TimedeltaCol.html | 10 +-
docs/html/class-sqlobject.col.TimestampCol.html | 10 +-
docs/html/class-sqlobject.col.TinyIntCol.html | 10 +-
docs/html/class-sqlobject.col.UnicodeCol.html | 10 +-
...teCol.html => class-sqlobject.col.UuidCol.html} | 26 +-
...class-sqlobject.dbconnection.ConnectionHub.html | 2 +-
docs/html/class-sqlobject.dberrors.DataError.html | 4 +-
.../class-sqlobject.dberrors.DatabaseError.html | 4 +-
...ass-sqlobject.dberrors.DuplicateEntryError.html | 4 +-
docs/html/class-sqlobject.dberrors.Error.html | 4 +-
.../class-sqlobject.dberrors.IntegrityError.html | 4 +-
.../class-sqlobject.dberrors.InterfaceError.html | 4 +-
.../class-sqlobject.dberrors.InternalError.html | 4 +-
...class-sqlobject.dberrors.NotSupportedError.html | 4 +-
.../class-sqlobject.dberrors.OperationalError.html | 4 +-
.../class-sqlobject.dberrors.ProgrammingError.html | 4 +-
docs/html/class-sqlobject.dberrors.Warning.html | 4 +-
...bird.firebirdconnection.FirebirdConnection.html | 2 +-
.../class-sqlobject.include.hashcol.HashCol.html | 4 +-
...object.include.tests.test_hashcol.HashTest.html | 6 +-
docs/html/class-sqlobject.index.DatabaseIndex.html | 2 +-
docs/html/class-sqlobject.joins.MultipleJoin.html | 4 +-
docs/html/class-sqlobject.joins.RelatedJoin.html | 4 +-
.../class-sqlobject.joins.SQLMultipleJoin.html | 4 +-
.../html/class-sqlobject.joins.SQLRelatedJoin.html | 4 +-
docs/html/class-sqlobject.joins.SingleJoin.html | 4 +-
docs/html/class-sqlobject.main.SQLObject.html | 4 +-
.../class-sqlobject.manager.command.Command.html | 2 +-
...ss-sqlobject.manager.command.CommandCreate.html | 4 +-
...lass-sqlobject.manager.command.CommandDrop.html | 4 +-
...s-sqlobject.manager.command.CommandExecute.html | 4 +-
...lass-sqlobject.manager.command.CommandHelp.html | 4 +-
...lass-sqlobject.manager.command.CommandList.html | 4 +-
...ss-sqlobject.manager.command.CommandRecord.html | 6 +-
...class-sqlobject.manager.command.CommandSQL.html | 4 +-
...ss-sqlobject.manager.command.CommandStatus.html | 4 +-
...s-sqlobject.manager.command.CommandUpgrade.html | 8 +-
...ject.manager.command.SQLObjectVersionTable.html | 4 +-
...ject.mssql.mssqlconnection.MSSQLConnection.html | 2 +-
docs/html/class-sqlobject.sqlbuilder.Delete.html | 2 +-
docs/html/class-sqlobject.sqlbuilder.Insert.html | 2 +-
docs/html/class-sqlobject.sqlbuilder.Replace.html | 2 +-
...ss-sqlobject.sqlbuilder.SQLJoinConditional.html | 9 +-
docs/html/class-sqlobject.sqlbuilder.Select.html | 2 +-
docs/html/class-sqlobject.sqlbuilder.Update.html | 2 +-
.../class-sqlobject.sresults.SelectResults.html | 4 +-
docs/html/class-sqlobject.views.ViewSQLObject.html | 6 +-
.../class-sqlobject.views.ViewSQLObjectField.html | 10 +-
.../class-sqlobject.views.ViewSQLObjectTable.html | 4 +-
docs/html/download.html | 13 +-
docs/html/index.html | 11 +-
docs/html/links.html | 31 +-
docs/html/module-index.html | 12 +-
docs/html/module-sqlobject-index.html | 2882 +++++++---------
docs/html/module-sqlobject.__version__-index.html | 7 +
docs/html/module-sqlobject.__version__.html | 6 +-
docs/html/module-sqlobject.classregistry.html | 2 +-
docs/html/module-sqlobject.col-index.html | 1083 +++---
docs/html/module-sqlobject.col.html | 174 +-
docs/html/module-sqlobject.converters.html | 2 +-
docs/html/module-sqlobject.dbconnection.html | 2 +-
docs/html/module-sqlobject.dberrors-index.html | 22 +-
docs/html/module-sqlobject.dberrors.html | 26 +-
docs/html/module-sqlobject.html | 10 +-
docs/html/module-sqlobject.include-index.html | 72 +-
.../html/module-sqlobject.include.tests-index.html | 72 +-
...sqlobject.include.tests.test_hashcol-index.html | 72 +-
...odule-sqlobject.include.tests.test_hashcol.html | 78 +-
docs/html/module-sqlobject.joins-index.html | 21 -
docs/html/module-sqlobject.main.html | 6 +-
docs/html/module-sqlobject.manager-index.html | 31 +
.../module-sqlobject.manager.command-index.html | 35 -
docs/html/module-sqlobject.manager.command.html | 2 +-
docs/html/module-sqlobject.sqlbuilder-index.html | 536 ++-
docs/html/module-sqlobject.sqlbuilder.html | 8 +-
docs/html/module-sqlobject.views-index.html | 74 +-
docs/html/module-sqlobject.views.html | 70 +-
docs/html/sqlobject/__version__.py.html | 4 +-
docs/html/sqlobject/col.py.html | 3628 ++++++++++----------
docs/html/sqlobject/compat.py.html | 2 +-
docs/html/sqlobject/dberrors.py.html | 83 +-
docs/html/sqlobject/main.py.html | 4 +-
docs/html/sqlobject/sqlbuilder.py.html | 8 +-
docs/html/sqlobject/views.py.html | 288 +-
docs/{index.txt => index.rst} | 11 +-
docs/{links.txt => links.rst} | 32 +-
docs/rebuild | 6 +-
docs/{sqlobject-admin.txt => sqlobject-admin.rst} | 0
docs/test.py | 3 +-
ez_setup.py | 400 ++-
requirements.txt | 5 +
requirements_dev.txt | 5 +
requirements_docs.txt | 5 +
setup.cfg | 15 +-
setup.py | 14 +-
sqlobject/.coveragerc | 11 +
sqlobject/.gitignore | 2 +
sqlobject/__version__.py | 4 +-
sqlobject/col.py | 115 +-
sqlobject/compat.py | 2 +-
sqlobject/dberrors.py | 5 +-
sqlobject/include/tests/__init__.py | 1 +
sqlobject/include/tests/test_hashcol.py | 84 +
sqlobject/inheritance/tests/testDestroyCascade.py | 6 +-
sqlobject/inheritance/tests/test_aggregates.py | 6 +-
sqlobject/inheritance/tests/test_asdict.py | 6 +-
.../inheritance/tests/test_deep_inheritance.py | 4 +-
sqlobject/inheritance/tests/test_foreignKey.py | 4 +-
sqlobject/inheritance/tests/test_indexes.py | 4 +-
sqlobject/inheritance/tests/test_inheritance.py | 4 +-
.../inheritance/tests/test_inheritance_tree.py | 6 +-
sqlobject/main.py | 4 +-
sqlobject/sqlbuilder.py | 8 +-
sqlobject/tests/dbtest.py | 4 +-
sqlobject/tests/test_ForeignKey.py | 6 +-
sqlobject/tests/test_NoneValuedResultItem.py | 4 +-
sqlobject/tests/test_SQLMultipleJoin.py | 5 +-
sqlobject/tests/test_SQLRelatedJoin.py | 4 +-
sqlobject/tests/test_SingleJoin.py | 4 +-
sqlobject/tests/test_aggregates.py | 4 +-
sqlobject/tests/test_aliases.py | 6 +-
sqlobject/tests/test_asdict.py | 4 +-
sqlobject/tests/test_auto.py | 6 +-
sqlobject/tests/test_basic.py | 7 +-
sqlobject/tests/test_blob.py | 4 +-
sqlobject/tests/test_cache.py | 4 +-
sqlobject/tests/test_class_hash.py | 4 +-
sqlobject/tests/test_columns_order.py | 2 +-
sqlobject/tests/test_combining_joins.py | 4 +-
sqlobject/tests/test_comparison.py | 4 +-
sqlobject/tests/test_complex_sorting.py | 4 +-
sqlobject/tests/test_constraints.py | 5 +-
sqlobject/tests/test_create_drop.py | 5 +-
sqlobject/tests/test_csvexport.py | 6 +-
sqlobject/tests/test_cyclic_reference.py | 5 +-
sqlobject/tests/test_datetime.py | 22 +-
sqlobject/tests/test_decimal.py | 15 +-
sqlobject/tests/test_declarative.py | 2 +-
sqlobject/tests/test_default_style.py | 5 +-
sqlobject/tests/test_delete.py | 4 +-
sqlobject/tests/test_distinct.py | 4 +-
sqlobject/tests/test_empty.py | 4 +-
sqlobject/tests/test_enum.py | 4 +-
sqlobject/tests/test_events.py | 5 +-
sqlobject/tests/test_exceptions.py | 6 +-
sqlobject/tests/test_expire.py | 4 +-
sqlobject/tests/test_groupBy.py | 4 +-
sqlobject/tests/test_identity.py | 4 +-
sqlobject/tests/test_indexes.py | 8 +-
sqlobject/tests/test_inheritance.py | 4 +-
sqlobject/tests/test_joins.py | 5 +-
sqlobject/tests/test_joins_conditional.py | 7 +-
sqlobject/tests/test_jsonbcol.py | 53 +
sqlobject/tests/test_jsoncol.py | 34 +
sqlobject/tests/test_lazy.py | 4 +-
sqlobject/tests/test_mysql.py | 4 +-
sqlobject/tests/test_new_joins.py | 4 +-
sqlobject/tests/test_paste.py | 4 +-
sqlobject/tests/test_perConnection.py | 4 +-
sqlobject/tests/test_pickle.py | 4 +-
sqlobject/tests/test_picklecol.py | 4 +-
sqlobject/tests/test_postgres.py | 4 +-
sqlobject/tests/test_reparent_sqlmeta.py | 4 +-
sqlobject/tests/test_schema.py | 4 +-
sqlobject/tests/test_select.py | 7 +-
sqlobject/tests/test_select_through.py | 18 +-
sqlobject/tests/test_setters.py | 4 +-
sqlobject/tests/test_slice.py | 4 +-
sqlobject/tests/test_sorting.py | 4 +-
sqlobject/tests/test_sqlbuilder.py | 7 +-
sqlobject/tests/test_sqlbuilder_dbspecific.py | 7 +-
sqlobject/tests/test_sqlbuilder_importproxy.py | 7 +-
sqlobject/tests/test_sqlbuilder_joins_instances.py | 25 +-
sqlobject/tests/test_sqlite.py | 4 +-
sqlobject/tests/test_sqlmeta_idName.py | 4 +-
sqlobject/tests/test_sqlobject_admin.py | 2 +-
sqlobject/tests/test_string_id.py | 4 +-
sqlobject/tests/test_style.py | 5 +-
sqlobject/tests/test_subqueries.py | 7 +-
sqlobject/tests/test_transactions.py | 4 +-
sqlobject/tests/test_unicode.py | 4 +-
sqlobject/tests/test_uuidcol.py | 28 +
sqlobject/tests/test_validation.py | 5 +-
sqlobject/tests/test_views.py | 31 +-
sqlobject/versioning/test/test_version.py | 4 +-
sqlobject/views.py | 4 +-
sqlobject/wsgi_middleware.py | 10 +-
tox.ini | 63 +-
286 files changed, 7729 insertions(+), 7561 deletions(-)
diff --cc debian/.git-dpm
index d6ed643,0000000..8141a76
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
- 92d777b5e15f14a20fb18b9487e8f83e052a501d
- 92d777b5e15f14a20fb18b9487e8f83e052a501d
- ced1ca4e28c774f8711a474029b83ab2f1adf3e5
++b1214f54b1b5bb7f8864a0afd12883e2fb4733f7
++b1214f54b1b5bb7f8864a0afd12883e2fb4733f7
++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 795b752,0000000..56c74b9
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 a4bc9c63f6e4e79c968cc54301f579e32e57cb5e Mon Sep 17 00:00:00 2001
++From b1214f54b1b5bb7f8864a0afd12883e2fb4733f7 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 5fe278c..9490fd4 100755
++index aafa3a1..1753c84 100755
+--- a/setup.py
++++ b/setup.py
- @@ -80,27 +80,6 @@ and `GitHub <https://github.com/sqlobject>`_.
++@@ -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/*.txt", "../docs/*.css",
++- "../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 5bf7eab,0000000..d5cbed1
mode 100644,000000..100644
--- a/debian/patches/change_doc_build_script
+++ b/debian/patches/change_doc_build_script
@@@ -1,32 -1,0 +1,31 @@@
- From d282bbe89eb2cfbfc5a5729ef401a210c8145e60 Mon Sep 17 00:00:00 2001
++From 99977fdda9307c1d7b508d4ee96ca367ccdfe816 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 | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
++ docs/rebuild | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/rebuild b/docs/rebuild
- index 82e6cc6..e4969a3 100755
++index c5313e0..4e06f4c 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.txt" ] ; then
- + if [ -e "docs/$NAME.html" -a ! "docs/$NAME.html" -ot "docs/$NAME.txt" ] ; then
++- 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.txt" > "$NAME.html"
++ rst2html --no-toc-backlinks --stylesheet=default.css --link-stylesheet \
- + -- "docs/$NAME.txt" > "docs/$NAME.html"
++ -- "$NAME.rst" > "$NAME.html"
+ done
diff --cc debian/patches/get_rid_of_setuptools
index ea7afb9,0000000..618b33c
mode 100644,000000..100644
--- a/debian/patches/get_rid_of_setuptools
+++ b/debian/patches/get_rid_of_setuptools
@@@ -1,33 -1,0 +1,33 @@@
- From 397877369cfd4326d7fbe993216e6bde3eb5e2ed Mon Sep 17 00:00:00 2001
++From 4eb4dceb605064aa8003bad6a1b2f6d6de1d1a23 Mon Sep 17 00:00:00 2001
+From: Bernd Zeimetz <bzed at debian.org>
+Date: Thu, 8 Oct 2015 14:08:54 -0700
+Subject: Remove the unnecessary setuptools requirement.
+
+Last-Update: 2014-04-13
+
+Patch-Name: get_rid_of_setuptools
+---
+ setup.py | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/setup.py b/setup.py
- index 834893d..5fe278c 100755
++index 1c9c4ec..aafa3a1 100755
+--- a/setup.py
++++ b/setup.py
- @@ -3,14 +3,8 @@
++@@ -4,14 +4,8 @@ import sys
+ from imp import load_source
+ from os.path import abspath, dirname, join
+
+-try:
+- from ez_setup import use_setuptools
+- use_setuptools()
+- from setuptools import setup
+- is_setuptools = True
+-except ImportError:
+- from distutils.core import setup
+- is_setuptools = False
++from distutils.core import setup
++is_setuptools = False
+
+ versionpath = join(abspath(dirname(__file__)), "sqlobject", "__version__.py")
+ load_source("sqlobject_version", versionpath)
diff --cc debian/patches/remove_pkg_resources
index e3b347d,0000000..bf0a066
mode 100644,000000..100644
--- a/debian/patches/remove_pkg_resources
+++ b/debian/patches/remove_pkg_resources
@@@ -1,31 -1,0 +1,31 @@@
- From 2eee1a7bf8546339b7058a173a0adea8a7fddfab Mon Sep 17 00:00:00 2001
++From 53331ed0659c05ed01c3a60eaa187d66ced4457a 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_sf_logo
index 6d509aa,0000000..413623a
mode 100644,000000..100644
--- a/debian/patches/replace_sf_logo
+++ b/debian/patches/replace_sf_logo
@@@ -1,396 -1,0 +1,470 @@@
- From 0b0e6c4d8306edc248f80c24e64d1866e0a1b108 Mon Sep 17 00:00:00 2001
++From e384926bebf74d856340b0c19e0e07566d81ea19 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
+
+ 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
+
+Patch-Name: replace_sf_logo
+---
- docs/Authors.txt | 10 +++-------
- docs/DeveloperGuide.txt | 10 +++-------
- docs/FAQ.txt | 10 +++-------
- docs/Inheritance.txt | 10 +++-------
- docs/News.txt | 10 +++-------
- docs/News1.txt | 10 +++-------
- docs/News2.txt | 10 +++-------
- docs/News3.txt | 10 +++-------
- docs/News4.txt | 10 +++-------
- docs/SQLBuilder.txt | 10 +++-------
- docs/SQLObject.txt | 10 +++-------
- docs/SelectResults.txt | 10 +++-------
- docs/TODO.txt | 10 +++-------
- docs/Versioning.txt | 10 +++-------
- docs/Views.txt | 10 +++-------
- docs/community.txt | 10 +++-------
- docs/download.txt | 10 +++-------
- docs/index.txt | 10 +++-------
- docs/links.txt | 10 +++-------
- docs/sqlobject-admin.txt | 10 +++-------
- 20 files changed, 60 insertions(+), 140 deletions(-)
++ 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.txt b/docs/Authors.txt
- index 5dbc625..43a145e 100644
- --- a/docs/Authors.txt
- +++ b/docs/Authors.txt
- @@ -35,10 +35,6 @@ Contributions have been made by:
- * Nathan Edwards <nje5 at georgetown.edu>
++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.txt b/docs/DeveloperGuide.txt
- index 4453733..4e091b1 100644
- --- a/docs/DeveloperGuide.txt
- +++ b/docs/DeveloperGuide.txt
- @@ -197,10 +197,6 @@ directory. Pudge converts documentation from Restructured Text to
- HTML. It presently requires kid 0.9.3, which must be obtained
- separately (for instance, from http://pypi.python.org/pypi/kid/0.9.3)
++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.txt b/docs/FAQ.txt
++diff --git a/docs/FAQ.rst b/docs/FAQ.rst
+index 3238efb..d905c01 100644
- --- a/docs/FAQ.txt
- +++ b/docs/FAQ.txt
++--- 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.txt b/docs/Inheritance.txt
- index c3de5f4..f40ecee 100644
- --- a/docs/Inheritance.txt
- +++ b/docs/Inheritance.txt
- @@ -325,10 +325,6 @@ Limitations and notes
++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.txt b/docs/News.txt
- index 3cfec6e..71b7f4a 100644
- --- a/docs/News.txt
- +++ b/docs/News.txt
- @@ -661,10 +661,6 @@ Features & Interface
++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
+
- .. __: News4.html
++ .. __: 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.txt b/docs/News1.txt
++diff --git a/docs/News1.rst b/docs/News1.rst
+index 77296c2..eca06a1 100644
- --- a/docs/News1.txt
- +++ b/docs/News1.txt
++--- 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.txt b/docs/News2.txt
- index f9cf012..35dbee3 100644
- --- a/docs/News2.txt
- +++ b/docs/News2.txt
++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.txt b/docs/News3.txt
- index 840eedd..c831d0f 100644
- --- a/docs/News3.txt
- +++ b/docs/News3.txt
++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.txt b/docs/News4.txt
++diff --git a/docs/News4.rst b/docs/News4.rst
+index 11f76d4..71c1bd4 100644
- --- a/docs/News4.txt
- +++ b/docs/News4.txt
++--- 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/SQLBuilder.txt b/docs/SQLBuilder.txt
++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.txt
- +++ b/docs/SQLBuilder.txt
++--- 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.txt b/docs/SQLObject.txt
- index 4b04f44..42ac17d 100644
- --- a/docs/SQLObject.txt
- +++ b/docs/SQLObject.txt
- @@ -2112,10 +2112,6 @@ Documentation`_.
++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.txt b/docs/SelectResults.txt
++diff --git a/docs/SelectResults.rst b/docs/SelectResults.rst
+index 7f2836e..feb885a 100644
- --- a/docs/SelectResults.txt
- +++ b/docs/SelectResults.txt
++--- 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.txt b/docs/TODO.txt
- index 588f89b..d27e5a0 100644
- --- a/docs/TODO.txt
- +++ b/docs/TODO.txt
- @@ -124,10 +124,6 @@ TODO
++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.txt b/docs/Versioning.txt
- index ca16d4f..aab3d8e 100644
- --- a/docs/Versioning.txt
- +++ b/docs/Versioning.txt
- @@ -82,10 +82,6 @@ for a versioned class is created. Version tables are not altered when
++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.txt b/docs/Views.txt
++diff --git a/docs/Views.rst b/docs/Views.rst
+index f2cc9cd..f48c4d8 100644
- --- a/docs/Views.txt
- +++ b/docs/Views.txt
++--- 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.txt b/docs/community.txt
++diff --git a/docs/community.rst b/docs/community.rst
+index 2e75642..1f04d73 100644
- --- a/docs/community.txt
- +++ b/docs/community.txt
++--- 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.txt b/docs/download.txt
- index e556283..ce4f542 100644
- --- a/docs/download.txt
- +++ b/docs/download.txt
- @@ -44,10 +44,6 @@ Before switching to git development was performed at the `Subversion
++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
... 93 lines suppressed ...
--
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