[Python-modules-commits] r28515 - in packages/sqlobject/trunk/debian (5 files)

drnlmza-guest at users.alioth.debian.org drnlmza-guest at users.alioth.debian.org
Sun Apr 13 20:32:43 UTC 2014 

    Date: Sunday, April 13, 2014 @ 20:32:42
  Author: drnlmza-guest
Revision: 28515

Fix issues idenitiified in review.

  - Use DEP-3 patch descriptions.
  - Also closes corresponding bug on launchpad (LP: #1283192)

Modified:
  packages/sqlobject/trunk/debian/changelog
  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/replace_sf_logo

Modified: packages/sqlobject/trunk/debian/changelog
===================================================================
--- packages/sqlobject/trunk/debian/changelog	2014-04-13 18:46:28 UTC (rev 28514)
+++ packages/sqlobject/trunk/debian/changelog	2014-04-13 20:32:42 UTC (rev 28515)
@@ -1,7 +1,8 @@
 sqlobject (1.5.2-1) UNRELEASED; urgency=low
 
   * Update to latest upstream release.
-    - Adapt duplicate error message strings for SQLite 3.8 (closes: #735815).
+    - Adapt duplicate error message strings for SQLite 3.8
+      (closes: #735815, LP: #1283192).
   * 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.

Modified: packages/sqlobject/trunk/debian/patches/change_doc_build_script
===================================================================
--- packages/sqlobject/trunk/debian/patches/change_doc_build_script	2014-04-13 18:46:28 UTC (rev 28514)
+++ packages/sqlobject/trunk/debian/patches/change_doc_build_script	2014-04-13 20:32:42 UTC (rev 28515)
@@ -1,4 +1,8 @@
-Use rst2html from python-docutils to build the documentation.
+Description: Use rst2html from python-docutils to build the documentation.
+Author: Neil Muller <drnlmuller+debian at gmail.com>
+Forwarded: not-needed
+Last-Update: 2014-04-13
+
 --- 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 18:46:28 UTC (rev 28514)
+++ packages/sqlobject/trunk/debian/patches/get_rid_of_setuptools	2014-04-13 20:32:42 UTC (rev 28515)
@@ -1,4 +1,7 @@
-Remove the unnecessary setuptools requirement.
+Description: Remove the unnecessary setuptools requirement.
+Author: Bernd Zeimetz <bzed at debian.org>
+Last-Update: 2014-04-13
+
 --- 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 18:46:28 UTC (rev 28514)
+++ packages/sqlobject/trunk/debian/patches/remove_pkg_resources	2014-04-13 20:32:42 UTC (rev 28515)
@@ -1,5 +1,9 @@
-We don't need pkg_resources to run the test suite during the build, so
-remove that dependency.
+Description: We don't need pkg_resources to run the test suite during the
+ build, so remove that dependency.
+Author: Neil Muller <drnlmuller+debian at gmail.com>
+Forwarded: not-needed
+Last-Update: 2014-04-13
+
 --- a/sqlobject/conftest.py
 +++ b/sqlobject/conftest.py
 @@ -11,12 +11,6 @@

Modified: packages/sqlobject/trunk/debian/patches/replace_sf_logo
===================================================================
--- packages/sqlobject/trunk/debian/patches/replace_sf_logo	2014-04-13 18:46:28 UTC (rev 28514)
+++ packages/sqlobject/trunk/debian/patches/replace_sf_logo	2014-04-13 20:32:42 UTC (rev 28515)
@@ -1,13 +1,14 @@
-Replace the image link to the sourceforge site with a simple text footer including
-the link.
+Description: 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.
+Author: Neil Muller
+Last-Update: 2014-04-13
 
-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
+--- a/docs/Authors.txt
++++ b/docs/Authors.txt
 @@ -31,10 +31,6 @@
  * Andrew Trusty <atrusty at gatech.edu>
  * Oleg Broytman <phd at phdru.name>
@@ -22,10 +23,8 @@
 +.. 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
+--- a/docs/community.txt
++++ b/docs/community.txt
 @@ -28,10 +28,6 @@
  One can also contribute to `community-editable recipe/documentation site
  <https://sites.google.com/site/sqlobject/>`_.
@@ -40,10 +39,8 @@
 +.. 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
+--- a/docs/DeveloperGuide.txt
++++ b/docs/DeveloperGuide.txt
 @@ -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)
@@ -58,10 +55,8 @@
 +.. 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
+--- a/docs/download.txt
++++ b/docs/download.txt
 @@ -47,10 +47,6 @@
  If you are on Windows you may want to use `TortoiseSVN
  <http://tortoisesvn.tigris.org/>`_.
@@ -76,10 +71,8 @@
 +.. 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
+--- a/docs/FAQ.txt
++++ b/docs/FAQ.txt
 @@ -588,10 +588,6 @@
                      COLLATE utf8_estonian_ci''']
                  }
@@ -94,10 +87,8 @@
 +.. 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
+--- a/docs/index.txt
++++ b/docs/index.txt
 @@ -65,10 +65,6 @@
    >>> p is p2
    True
@@ -112,10 +103,8 @@
 +.. 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
+--- a/docs/Inheritance.txt
++++ b/docs/Inheritance.txt
 @@ -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>
@@ -130,10 +119,8 @@
 +.. 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
+--- a/docs/links.txt
++++ b/docs/links.txt
 @@ -59,10 +59,6 @@
  
  * `Stoq <http://www.stoq.com.br/>`_, an open source retail system.
@@ -148,10 +135,8 @@
 +.. 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
+--- a/docs/News.txt
++++ b/docs/News.txt
 @@ -617,10 +617,6 @@
  * Changed the order of testing of SQLite modules - look for external
    PySQLite2 before sqlite3.
@@ -166,10 +151,8 @@
 +.. 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
+--- a/docs/SelectResults.txt
++++ b/docs/SelectResults.txt
 @@ -193,10 +193,6 @@
  returns a SelectResult of Persons who are the paternal grandfather of someone
  named ``Steve``.
@@ -184,10 +167,8 @@
 +.. 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
+--- a/docs/SQLBuilder.txt
++++ b/docs/SQLBuilder.txt
 @@ -259,10 +259,6 @@
         IN(PersonWorkplace.q.WorkplaceID,
         Select(Workplace.q.id, Workplace.q.id==SOME_ID)))
@@ -202,10 +183,8 @@
 +.. 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
+--- a/docs/sqlobject-admin.txt
++++ b/docs/sqlobject-admin.txt
 @@ -209,10 +209,6 @@
  
  * A command to trim versions, by merging upgrade scripts.
@@ -220,10 +199,8 @@
 +.. 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
+--- a/docs/SQLObject.txt
++++ b/docs/SQLObject.txt
 @@ -2084,10 +2084,6 @@
  .. _SQLBuilder: SQLBuilder.html
  .. _`SQLBuilder Documentation`: SQLBuilder.html
@@ -238,10 +215,8 @@
 +.. 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
+--- a/docs/TODO.txt
++++ b/docs/TODO.txt
 @@ -147,10 +147,6 @@
  * Allow to override ConsoleWriter/LogWriter classes and makeDebugWriter
    function.
@@ -256,10 +231,8 @@
 +.. 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
+--- a/docs/Versioning.txt
++++ b/docs/Versioning.txt
 @@ -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. 
@@ -274,10 +247,8 @@
 +.. 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
+--- a/docs/Views.txt
++++ b/docs/Views.txt
 @@ -62,10 +62,6 @@
      calls = SQLMultipleJoin('PhoneCall', joinColumn='phoneNumberID')
      vCalls = SQLMultipleJoin('ViewPhoneCall', joinColumn='phoneNumberID')

More information about the Python-modules-commits mailing list