[Python-modules-commits] r14118 - in packages/py-postgresql/trunk/debian (3 files)

wgrz-guest at users.alioth.debian.org wgrz-guest at users.alioth.debian.org
Tue Aug 3 20:48:50 UTC 2010


    Date: Tuesday, August 3, 2010 @ 20:48:48
  Author: wgrz-guest
Revision: 14118

* Fix copyright issues
* Fix description
* Build sphinx documentation

Modified:
  packages/py-postgresql/trunk/debian/control
  packages/py-postgresql/trunk/debian/copyright
  packages/py-postgresql/trunk/debian/rules

Modified: packages/py-postgresql/trunk/debian/control
===================================================================
--- packages/py-postgresql/trunk/debian/control	2010-08-03 19:17:00 UTC (rev 14117)
+++ packages/py-postgresql/trunk/debian/control	2010-08-03 20:48:48 UTC (rev 14118)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: William Grzybowski <william at agencialivre.com.br>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python3-all-dev
+Build-Depends: debhelper (>= 7.0.50~), python3-all-dev, python-sphinx
 Standards-Version: 3.9.1
-XS-Python-Version: >= 3.1
+X-Python3-Version: >= 3.1
 Homepage: http://python.projects.postgresql.org/
 
 Package: python3-postgresql
@@ -13,9 +13,9 @@
 Depends: ${python3:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Description: pgsql driver, cluster management tools, and client tools
  py-postgresql is a python3 driver, cluster management tools and client
- development tools written in pure python 3 with optional optimizations
+ development tools written in pure Python 3 with optional optimizations
  made in C.
  .
  Has support for protocol-level prepared statements, COPY interface,
- arrays and composite types and a python console with connection to
+ arrays and composite types and a Python console with connection to
  PostgreSQL for quick tests and simple scripts called pg_python.

Modified: packages/py-postgresql/trunk/debian/copyright
===================================================================
--- packages/py-postgresql/trunk/debian/copyright	2010-08-03 19:17:00 UTC (rev 14117)
+++ packages/py-postgresql/trunk/debian/copyright	2010-08-03 20:48:48 UTC (rev 14118)
@@ -10,14 +10,24 @@
 
     James William Pye <x at jwp.name>
 
-Copyright:
+License:
 
     Copyright (C) 2004-2010 James Williame Pye
+    All rights reserved.
+    
+    Redistribution and use in source and binary forms, with or without modification, 
+    are permitted provided that the following conditions are met:
+    
+        Redistributions of source code must retain the above copyright notice, 
+        this list of conditions and the following disclaimer.
 
-License:
+        Redistributions in binary form must reproduce the above copyright notice, 
+        this list of conditions and the following disclaimer in the documentation 
+        and/or other materials provided with the distribution.
 
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted under the terms of the BSD License.
+        Neither the name of the James Williame Pye nor the names of its contributors 
+        may be used to endorse or promote products derived from this software without 
+        specific prior written permission.
 
     THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
     ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -31,12 +41,33 @@
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-On Debian systems, the complete text of the BSD License can be
-found in "/usr/share/common-licenses/BSD".
-
 The Debian packaging is:
 
     Copyright (C) 2010 William Grzybowski <william at agencialivre.com.br>
+    All rights reserved.
+    
+    Redistribution and use in source and binary forms, with or without modification, 
+    are permitted provided that the following conditions are met:
+    
+        Redistributions of source code must retain the above copyright notice, 
+        this list of conditions and the following disclaimer.
 
-and is licensed under the BSD,
-see "/usr/share/common-licenses/BSD".
+        Redistributions in binary form must reproduce the above copyright notice, 
+        this list of conditions and the following disclaimer in the documentation 
+        and/or other materials provided with the distribution.
+
+        Neither the name of the William Grzybowski nor the names of its contributors 
+        may be used to endorse or promote products derived from this software without 
+        specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.

Modified: packages/py-postgresql/trunk/debian/rules
===================================================================
--- packages/py-postgresql/trunk/debian/rules	2010-08-03 19:17:00 UTC (rev 14117)
+++ packages/py-postgresql/trunk/debian/rules	2010-08-03 20:48:48 UTC (rev 14118)
@@ -1,23 +1,31 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-build3vers := $(shell py3versions -sv)
+build3vers := $(shell py3versions -rv)
 
 override_dh_auto_build:
 	for i in $(build3vers); do \
 		python$$i ./setup.py build;\
 	done
+	
+	mkdir -p html html/doctrees
+	cp postgresql/documentation/*.txt postgresql/documentation/sphinx/
+	cp postgresql/documentation/sphinx/index.rst postgresql/documentation/sphinx/index.txt
+	sphinx-build -E -b html -d html/doctrees  postgresql/documentation/sphinx/ html
 
-
-override_dh_install:
+override_dh_auto_install:
 	dh_install -ppython3-postgresql
 	for i in $(build3vers); do \
 		python$$i ./setup.py install --root $(CURDIR)/debian/python3-postgresql; \
 	done
 
-override_dh_clean:
+	mkdir -p $(CURDIR)/debian/python3-postgresql/usr/share/doc/python3-postgresql
+	cp -r html $(CURDIR)/debian/python3-postgresql/usr/share/doc/python3-postgresql
+
+override_dh_auto_clean:
 	dh_clean
 	rm -rf build
+	rm -rf html
 
 %:
 	dh --with python3 $@




More information about the Python-modules-commits mailing list