[Python-modules-commits] r28514 - in packages/sqlobject/trunk/debian (8 files)

drnlmza-guest at users.alioth.debian.org drnlmza-guest at users.alioth.debian.org
Sun Apr 13 18:46:29 UTC 2014


    Date: Sunday, April 13, 2014 @ 18:46:28
  Author: drnlmza-guest
Revision: 28514

Update to 1.5.2 release

   * Adapt error strings for sqlite 3.8 - closes #735815
   * Register HTML documentation with doc-base
   * Add replace_sf_logo patch to strip out sourceforge web-logo from
     documenation (lintian privacy-breach-logo error)
   * Add descriptions to all patches
   * Bump Standards-Version to 3.9.5 (no changes)

Added:
  packages/sqlobject/trunk/debian/doc-base
  packages/sqlobject/trunk/debian/patches/replace_sf_logo
Modified:
  packages/sqlobject/trunk/debian/changelog
  packages/sqlobject/trunk/debian/control
  packages/sqlobject/trunk/debian/patches/change_doc_build_script
  packages/sqlobject/trunk/debian/patches/get_rid_of_setuptools
  packages/sqlobject/trunk/debian/patches/remove_pkg_resources
  packages/sqlobject/trunk/debian/patches/series

Modified: packages/sqlobject/trunk/debian/changelog
===================================================================
--- packages/sqlobject/trunk/debian/changelog	2014-04-13 15:59:34 UTC (rev 28513)
+++ packages/sqlobject/trunk/debian/changelog	2014-04-13 18:46:28 UTC (rev 28514)
@@ -1,3 +1,16 @@
+sqlobject (1.5.2-1) UNRELEASED; urgency=low
+
+  * Update to latest upstream release.
+    - Adapt duplicate error message strings for SQLite 3.8 (closes: #735815).
+  * Standards-Version: 3.9.5 (no changes needed).
+  * Add replace_sf_logo patch to replace the sourceforge logo with a text link
+    to the sourceforge page to solve lintian's "privacy-breach-logo" error.
+  * Add descriptions to all the patches.
+  * Register HTML documentation in doc-base.
+
+ -- Neil Muller <drnlmuller+debian at gmail.com>  Sun, 13 Apr 2014 19:46:10 +0200
+
+
 sqlobject (1.5.0-1) unstable; urgency=low
 
   * Update to current upstream.

Modified: packages/sqlobject/trunk/debian/control
===================================================================
--- packages/sqlobject/trunk/debian/control	2014-04-13 15:59:34 UTC (rev 28513)
+++ packages/sqlobject/trunk/debian/control	2014-04-13 18:46:28 UTC (rev 28514)
@@ -9,7 +9,7 @@
                python-pytest
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Neil Muller <drnlmuller+debian at gmail.com>
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 X-Python-Version: >= 2.4
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/sqlobject/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/sqlobject/trunk/

Added: packages/sqlobject/trunk/debian/doc-base
===================================================================
--- packages/sqlobject/trunk/debian/doc-base	                        (rev 0)
+++ packages/sqlobject/trunk/debian/doc-base	2014-04-13 18:46:28 UTC (rev 28514)
@@ -0,0 +1,9 @@
+Document: python-sqlobject
+Title: SQLObject documentation
+Abstract: Documentation and FAQ about using SQLObject. Includes detailed
+ desciptions of several features, such as table inheritance and versioning.
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-sqlobject/index.html
+Files: /usr/share/doc/python-sqlobject/*.html

Modified: packages/sqlobject/trunk/debian/patches/change_doc_build_script
===================================================================
--- packages/sqlobject/trunk/debian/patches/change_doc_build_script	2014-04-13 15:59:34 UTC (rev 28513)
+++ packages/sqlobject/trunk/debian/patches/change_doc_build_script	2014-04-13 18:46:28 UTC (rev 28514)
@@ -1,3 +1,4 @@
+Use rst2html from python-docutils to build the documentation.
 --- a/docs/rebuild
 +++ b/docs/rebuild
 @@ -11,11 +11,11 @@

Modified: packages/sqlobject/trunk/debian/patches/get_rid_of_setuptools
===================================================================
--- packages/sqlobject/trunk/debian/patches/get_rid_of_setuptools	2014-04-13 15:59:34 UTC (rev 28513)
+++ packages/sqlobject/trunk/debian/patches/get_rid_of_setuptools	2014-04-13 18:46:28 UTC (rev 28514)
@@ -1,3 +1,4 @@
+Remove the unnecessary setuptools requirement.
 --- a/setup.py
 +++ b/setup.py
 @@ -3,14 +3,8 @@

Modified: packages/sqlobject/trunk/debian/patches/remove_pkg_resources
===================================================================
--- packages/sqlobject/trunk/debian/patches/remove_pkg_resources	2014-04-13 15:59:34 UTC (rev 28513)
+++ packages/sqlobject/trunk/debian/patches/remove_pkg_resources	2014-04-13 18:46:28 UTC (rev 28514)
@@ -1,3 +1,5 @@
+We don't need pkg_resources to run the test suite during the build, so
+remove that dependency.
 --- a/sqlobject/conftest.py
 +++ b/sqlobject/conftest.py
 @@ -11,12 +11,6 @@

Added: packages/sqlobject/trunk/debian/patches/replace_sf_logo
===================================================================
--- packages/sqlobject/trunk/debian/patches/replace_sf_logo	                        (rev 0)
+++ packages/sqlobject/trunk/debian/patches/replace_sf_logo	2014-04-13 18:46:28 UTC (rev 28514)
@@ -0,0 +1,294 @@
+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.
+Index: sqlobject-1.5.2/docs/Authors.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/Authors.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/Authors.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -31,10 +31,6 @@
+ * Andrew Trusty <atrusty at gatech.edu>
+ * Oleg Broytman <phd at phdru.name>
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/community.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/community.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/community.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -28,10 +28,6 @@
+ One can also contribute to `community-editable recipe/documentation site
+ <https://sites.google.com/site/sqlobject/>`_.
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/DeveloperGuide.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/DeveloperGuide.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/DeveloperGuide.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -188,10 +188,6 @@
+ 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)
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/download.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/download.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/download.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -47,10 +47,6 @@
+ If you are on Windows you may want to use `TortoiseSVN
+ <http://tortoisesvn.tigris.org/>`_.
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/FAQ.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/FAQ.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/FAQ.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -588,10 +588,6 @@
+                     COLLATE utf8_estonian_ci''']
+                 }
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/index.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/index.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/index.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -65,10 +65,6 @@
+   >>> p is p2
+   True
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/Inheritance.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/Inheritance.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/Inheritance.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -325,10 +325,6 @@
+ * If you have suggestion, bugs, or patch to this patch, you can
+   contact the SQLObject team: <sqlobject-discuss at lists.sourceforge.net>
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/links.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/links.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/links.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -59,10 +59,6 @@
+ 
+ * `Stoq <http://www.stoq.com.br/>`_, an open source retail system.
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/News.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/News.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/News.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -617,10 +617,6 @@
+ * Changed the order of testing of SQLite modules - look for external
+   PySQLite2 before sqlite3.
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/SelectResults.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/SelectResults.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/SelectResults.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -193,10 +193,6 @@
+ returns a SelectResult of Persons who are the paternal grandfather of someone
+ named ``Steve``.
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/SQLBuilder.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/SQLBuilder.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/SQLBuilder.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -259,10 +259,6 @@
+        IN(PersonWorkplace.q.WorkplaceID,
+        Select(Workplace.q.id, Workplace.q.id==SOME_ID)))
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/sqlobject-admin.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/sqlobject-admin.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/sqlobject-admin.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -209,10 +209,6 @@
+ 
+ * A command to trim versions, by merging upgrade scripts.
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/SQLObject.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/SQLObject.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/SQLObject.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -2084,10 +2084,6 @@
+ .. _SQLBuilder: SQLBuilder.html
+ .. _`SQLBuilder Documentation`: SQLBuilder.html
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/TODO.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/TODO.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/TODO.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -147,10 +147,6 @@
+ * Allow to override ConsoleWriter/LogWriter classes and makeDebugWriter
+   function.
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/Versioning.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/Versioning.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/Versioning.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -82,10 +82,6 @@
+ 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:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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
+Index: sqlobject-1.5.2/docs/Views.txt
+===================================================================
+--- sqlobject-1.5.2.orig/docs/Views.txt	2014-04-13 15:11:09.000000000 +0000
++++ sqlobject-1.5.2/docs/Views.txt	2014-04-13 15:11:09.000000000 +0000
+@@ -62,10 +62,6 @@
+     calls = SQLMultipleJoin('PhoneCall', joinColumn='phoneNumberID')
+     vCalls = SQLMultipleJoin('ViewPhoneCall', joinColumn='phoneNumberID')
+ 
+-.. image:: http://sflogo.sourceforge.net/sflogo.php?group_id=74338&type=10
+-   :target: http://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

Modified: packages/sqlobject/trunk/debian/patches/series
===================================================================
--- packages/sqlobject/trunk/debian/patches/series	2014-04-13 15:59:34 UTC (rev 28513)
+++ packages/sqlobject/trunk/debian/patches/series	2014-04-13 18:46:28 UTC (rev 28514)
@@ -1,3 +1,4 @@
 get_rid_of_setuptools
 change_doc_build_script
 remove_pkg_resources
+replace_sf_logo




More information about the Python-modules-commits mailing list