[Python-modules-commits] r26074 - in packages/sqlobject/trunk/debian (9 files)

drnlmza-guest at users.alioth.debian.org drnlmza-guest at users.alioth.debian.org
Sun Oct 6 12:01:11 UTC 2013 

    Date: Sunday, October 6, 2013 @ 12:01:09
  Author: drnlmza-guest
Revision: 26074

Update to recently released 1.5.0

   * Use pybuild to build the package.
   * Build and include the html version of the documentation.
   * Reformat copyright to the machine-readable format.
   * Run tests (against sqlite memory database) during the build.

Added:
  packages/sqlobject/trunk/debian/patches/change_doc_build_script
Modified:
  packages/sqlobject/trunk/debian/changelog
  packages/sqlobject/trunk/debian/control
  packages/sqlobject/trunk/debian/copyright
  packages/sqlobject/trunk/debian/docs
  packages/sqlobject/trunk/debian/patches/series
  packages/sqlobject/trunk/debian/rules
  packages/sqlobject/trunk/debian/sqlobject-admin.1
  packages/sqlobject/trunk/debian/sqlobject-convertOldURI.1

Modified: packages/sqlobject/trunk/debian/changelog
===================================================================
--- packages/sqlobject/trunk/debian/changelog	2013-10-06 10:57:06 UTC (rev 26073)
+++ packages/sqlobject/trunk/debian/changelog	2013-10-06 12:01:09 UTC (rev 26074)
@@ -1,3 +1,21 @@
+sqlobject (1.5.0-1) UNRELEASED; urgency=low
+
+  * Update to current upstream.
+  * Use pybuild to build the package.
+  * Simplify how we handle docs in debian/rules.
+    - Update DH_ALWAYS_EXCLUDE in rules.
+  * Build and include the html version of the documentation.
+    - Add change_doc_build_script patch to make html build use
+      python-docutils' version of rst2html
+    - Add python-docutils as build dependency.
+  * Reformat copyright to the machine-readable format.
+    - update some stale information.
+    - Add LGPL version to the manpages.
+  * Run tests (against sqlite memory database) during the build.
+    - Add python-pytest as build dependency.
+
+ -- Neil Muller <drnlmuller+debian at gmail.com>  Sun, 06 Oct 2013 12:45:42 +0200
+
 sqlobject (1.4.1-1) unstable; urgency=low
 
   * Update to current upstream.

Modified: packages/sqlobject/trunk/debian/control
===================================================================
--- packages/sqlobject/trunk/debian/control	2013-10-06 10:57:06 UTC (rev 26073)
+++ packages/sqlobject/trunk/debian/control	2013-10-06 12:01:09 UTC (rev 26074)
@@ -1,7 +1,10 @@
 Source: sqlobject
 Section: python
 Priority: optional
-Build-Depends: debhelper (>= 8.1), python-all (>= 2.7.3-4)
+Build-Depends: debhelper (>= 8.1),
+               python-all (>= 2.7.3-4),
+               python-docutils,
+               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
@@ -12,8 +15,15 @@
 
 Package: python-sqlobject
 Architecture: all
-Depends: ${python:Depends}, python-pkg-resources (>=0.6c8), python-formencode, ${misc:Depends}
-Suggests: python-mysqldb, python-sqlite, python-psycopg2, python-kinterbasdb, python-maxdb
+Depends: python-formencode,
+         python-pkg-resources (>=0.6c8),
+         ${misc:Depends},
+         ${python:Depends}
+Suggests: python-kinterbasdb,
+          python-maxdb,
+          python-mysqldb,
+          python-psycopg2,
+          python-sqlite
 Description: object relational manager providing an object interface to your database
  SQLObject is an object-relational mapper. It allows you to translate RDBMS
  table rows into Python objects, and manipulate those objects to transparently

Modified: packages/sqlobject/trunk/debian/copyright
===================================================================
--- packages/sqlobject/trunk/debian/copyright	2013-10-06 10:57:06 UTC (rev 26073)
+++ packages/sqlobject/trunk/debian/copyright	2013-10-06 12:01:09 UTC (rev 26074)
@@ -1,15 +1,28 @@
-This package was debianized by Carlos Perelló Marín <carlos at pemas.net>
-on Wed, 20 Oct 2004. It was orphaned and is now maintained by
-Debian Python Modules Team.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: SQLObject
+Upstream-Contact: Oleg Broytman <phd at phdru.name>
+Source: http://sqlobject.org/
 
-It was downloaded from 'http://www.sqlobject.org'.
+Files: *
+Copyright: 2000-2008 Ian Bicking
+ 2008-2013 Oleg Broytman
+License: LGPL-2.1+
 
-Upstream Author: Ian Bicking
+Files: debian/*
+Copyright: 2004, Carlos Perelló Marín
+ 2006-2009 Fabio Tranchitella
+ 2010-2013 Debain Python Modules Team
+License: LGPL-2.1+
 
-Copyright © 2000-2008 Ian Bicking
-
-License:
-
-This package is licensed under the GNU Lesser General Public License. You can
-find the full text of the LGPL in /usr/share/common-licenses/LGPL in your
-Debian system.
+License: LGPL-2.1+
+ The code is licensed under the GNU Lesser General Public License v2.1
+ or (at your option) any later version. You can find the full text of the
+ LGPL in /usr/share/common-licenses/LGPL-2.1 in your Debian system.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this package; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

Modified: packages/sqlobject/trunk/debian/docs
===================================================================
--- packages/sqlobject/trunk/debian/docs	2013-10-06 10:57:06 UTC (rev 26073)
+++ packages/sqlobject/trunk/debian/docs	2013-10-06 12:01:09 UTC (rev 26074)
@@ -1,2 +1,5 @@
 README.txt
-docs/
+docs/*txt
+docs/*html 
+docs/*css
+docs/interface.py

Added: packages/sqlobject/trunk/debian/patches/change_doc_build_script
===================================================================
--- packages/sqlobject/trunk/debian/patches/change_doc_build_script	                        (rev 0)
+++ packages/sqlobject/trunk/debian/patches/change_doc_build_script	2013-10-06 12:01:09 UTC (rev 26074)
@@ -0,0 +1,17 @@
+--- a/docs/rebuild
++++ b/docs/rebuild
+@@ -11,11 +11,11 @@
+         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
+         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"
+ done

Modified: packages/sqlobject/trunk/debian/patches/series
===================================================================
--- packages/sqlobject/trunk/debian/patches/series	2013-10-06 10:57:06 UTC (rev 26073)
+++ packages/sqlobject/trunk/debian/patches/series	2013-10-06 12:01:09 UTC (rev 26074)
@@ -1 +1,2 @@
 get_rid_of_setuptools
+change_doc_build_script

Modified: packages/sqlobject/trunk/debian/rules
===================================================================
--- packages/sqlobject/trunk/debian/rules	2013-10-06 10:57:06 UTC (rev 26073)
+++ packages/sqlobject/trunk/debian/rules	2013-10-06 12:01:09 UTC (rev 26074)
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
-export DH_ALWAYS_EXCLUDE=tests:examples:presentation-2004-11:europython
+export DH_ALWAYS_EXCLUDE=tests:dbs_data.tmp
+export PYBUILD_TEST_PYTEST=1
+export PYBUILD_TEST_ARGS="{dir}"
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2 --buildsystem=pybuild
 
 override_dh_installdocs:
+	docs/rebuild
 	dh_installdocs
-	mv -f debian/python-sqlobject/usr/share/doc/python-sqlobject/docs/* \
-debian/python-sqlobject/usr/share/doc/python-sqlobject/	
-	rmdir debian/python-sqlobject/usr/share/doc/python-sqlobject/docs/

Modified: packages/sqlobject/trunk/debian/sqlobject-admin.1
===================================================================
--- packages/sqlobject/trunk/debian/sqlobject-admin.1	2013-10-06 10:57:06 UTC (rev 26073)
+++ packages/sqlobject/trunk/debian/sqlobject-admin.1	2013-10-06 12:01:09 UTC (rev 26074)
@@ -122,9 +122,9 @@
 .RS 4
 .\}
 .nf
-This package is licensed under the GNU Lesser General Public License\&. You can
-find the full text of the LGPL in /usr/share/common\-licenses/LGPL in your
-Debian system\&.
+This package is licensed under the GNU Lesser General Public License version
+2.1 (or later)\&. You can find the full text of the LGPL in
+/usr/share/common\-licenses/LGPL in your Debian system\&.
 .fi
 .if n \{\
 .RE

Modified: packages/sqlobject/trunk/debian/sqlobject-convertOldURI.1
===================================================================
--- packages/sqlobject/trunk/debian/sqlobject-convertOldURI.1	2013-10-06 10:57:06 UTC (rev 26073)
+++ packages/sqlobject/trunk/debian/sqlobject-convertOldURI.1	2013-10-06 12:01:09 UTC (rev 26074)
@@ -31,6 +31,6 @@
 This manual page was written by Neil Muller <drnlmuller+debian at gmail\&.com>\&.
 .SH "LICENSE"
 .sp
-This package is licensed under the GNU Lesser General Public License\&. You can
-find the full text of the LGPL in /usr/share/common\-licenses/LGPL in your
-Debian system\&.
+This package is licensed under the GNU Lesser General Public License version
+2.1 (or later)\&. You can find the full text of the LGPL in
+/usr/share/common\-licenses/LGPL in your Debian system\&.

More information about the Python-modules-commits mailing list