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

Wed Aug 4 13:39:19 UTC 2010

Date: Wednesday, August 4, 2010 @ 13:39:10
  Author: wgrz-guest
Revision: 14122

* Description review
* Use of debian/links instead of hard-coded in rules
* Move libsys.sql to /usr/share/python3-postgresql
* Patch to add libpath for the moved libsys.sql
* Mention fcrypt license in copyright

Added:
  packages/py-postgresql/trunk/debian/links
  packages/py-postgresql/trunk/debian/patches/
  packages/py-postgresql/trunk/debian/patches/add_libpath.patch
  packages/py-postgresql/trunk/debian/patches/series
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-04 11:55:14 UTC (rev 14121)
+++ packages/py-postgresql/trunk/debian/control	2010-08-04 13:39:10 UTC (rev 14122)
@@ -15,10 +15,10 @@
 Depends: ${python3:Depends}, ${misc:Depends}, ${shlibs:Depends},
  libjs-jquery
 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
- written in C.
+ py-postgresql is a python3 DB-API driver, including cluster management 
+ tools and client development tools. Written in pure Python 3 with 
+ optional optimizations written in C.
  .
- Provides support for protocol-level prepared statements, COPY interface,
+ It provides support for protocol-level prepared statements, the COPY interface,
  arrays and composite types, and a console to run quick tests and simple 
  scripts in PostgreSQL called pg_python.

Modified: packages/py-postgresql/trunk/debian/copyright
===================================================================
--- packages/py-postgresql/trunk/debian/copyright	2010-08-04 11:55:14 UTC (rev 14121)
+++ packages/py-postgresql/trunk/debian/copyright	2010-08-04 13:39:10 UTC (rev 14122)
@@ -41,6 +41,30 @@
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
+Files: postgresql/resolved/crypt.py
+Copyright: Copyright (C) 2000, 2001, 2004  Carey Evans  <careye at spamcop.net>
+License: 
+    Permission to use, copy, modify, and distribute this software and
+    its documentation for any purpose and without fee is hereby granted,
+    provided that the above copyright notice appear in all copies and
+    that both that copyright notice and this permission notice appear in
+    supporting documentation.
+    
+    CAREY EVANS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+    INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+    EVENT SHALL CAREY EVANS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+    CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+    USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
+    
+    Based on C code by Eric Young (eay at mincom.oz.au), which has the
+    following copyright.  Especially note condition 3, which imposes
+    extra restrictions on top of the standard Python license used above.
+    
+    The fcrypt.c source is available from:
+        ftp://ftp.psy.uq.oz.au/pub/Crypto/DES/
+
 The Debian packaging is:
 
     Copyright (C) 2010 William Grzybowski <william at agencialivre.com.br>

Added: packages/py-postgresql/trunk/debian/links
===================================================================
--- packages/py-postgresql/trunk/debian/links	                        (rev 0)
+++ packages/py-postgresql/trunk/debian/links	2010-08-04 13:39:10 UTC (rev 14122)
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/python3-postgresql/html/_static/jquery.js

Added: packages/py-postgresql/trunk/debian/patches/add_libpath.patch
===================================================================
--- packages/py-postgresql/trunk/debian/patches/add_libpath.patch	                        (rev 0)
+++ packages/py-postgresql/trunk/debian/patches/add_libpath.patch	2010-08-04 13:39:10 UTC (rev 14122)
@@ -0,0 +1,12 @@
+Add /usr/share/python3-postgresql to the py-postgresql libpath
+--- a/postgresql/sys.py
++++ b/postgresql/sys.py
+@@ -27,7 +27,7 @@
+ from .python.element import format_element
+ from .python.string import indent
+ 
+-libpath = []
++libpath = ['/usr/share/python3-postgresql/',]
+ 
+ def default_errformat(val):
+ 	"""

Added: packages/py-postgresql/trunk/debian/patches/series
===================================================================
--- packages/py-postgresql/trunk/debian/patches/series	                        (rev 0)
+++ packages/py-postgresql/trunk/debian/patches/series	2010-08-04 13:39:10 UTC (rev 14122)
@@ -0,0 +1 @@
+add_libpath.patch

Modified: packages/py-postgresql/trunk/debian/rules
===================================================================
--- packages/py-postgresql/trunk/debian/rules	2010-08-04 11:55:14 UTC (rev 14121)
+++ packages/py-postgresql/trunk/debian/rules	2010-08-04 13:39:10 UTC (rev 14122)
@@ -3,7 +3,7 @@
 
 build3vers := $(shell py3versions -rv)
 
-override_dh_auto_build:
+override_dh_auto_build: 
 	set -e ; \
 	for i in $(build3vers); do \
 		python$$i ./setup.py build;\
@@ -13,16 +13,16 @@
 	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
-	rm -rf html/_static/jquery.js
 
 override_dh_auto_install:
 	dh_install -ppython3-postgresql
+	mkdir -p $(CURDIR)/debian/python3-postgresql/usr/share/python3-postgresql/
 	set -e ; \
 	for i in $(build3vers); do \
 		python$$i ./setup.py install --root $(CURDIR)/debian/python3-postgresql; \
-		rm -rf $(CURDIR)/debian/python3-postgresql/usr/lib/python$$i/dist-packages/documentation; \
+		rm -rf $(CURDIR)/debian/python3-postgresql/usr/local/lib/python$$i/dist-packages/postgresql/documentation; \
+		mv $(CURDIR)/debian/python3-postgresql/usr/local/lib/python$$i/dist-packages/postgresql/lib/libsys.sql $(CURDIR)/debian/python3-postgresql/usr/share/python3-postgresql/; \
 	done
-	dh_link usr/share/javascript/jquery/jquery.js usr/share/doc/python3-postgresql/html/_static/jquery.js
 
 override_dh_compress:
 	dh_compress -X.js


