[Python-modules-commits] r27464 - in packages/py-postgresql/trunk/debian (10 files)
dkg at users.alioth.debian.org
dkg at users.alioth.debian.org
Tue Jan 28 19:54:40 UTC 2014
Date: Tuesday, January 28, 2014 @ 19:54:39
Author: dkg
Revision: 27464
new upstream version, extra packaging work
I've removed py-postgresql's use of the bundled resolve/crypt.py to
avoid triggering Eric Young's obnoxious licensing clause. crypt.crypt
from libpython3-stdlib provides identical functionality, and debian
can manage the dependencies cleanly.
Added:
packages/py-postgresql/trunk/debian/patches/use_python3_for_sphinx.patch
Modified:
packages/py-postgresql/trunk/debian/changelog
packages/py-postgresql/trunk/debian/compat
packages/py-postgresql/trunk/debian/control
packages/py-postgresql/trunk/debian/copyright
packages/py-postgresql/trunk/debian/links
packages/py-postgresql/trunk/debian/patches/add_libpath.patch
packages/py-postgresql/trunk/debian/patches/series
packages/py-postgresql/trunk/debian/rules
packages/py-postgresql/trunk/debian/watch
Modified: packages/py-postgresql/trunk/debian/changelog
===================================================================
--- packages/py-postgresql/trunk/debian/changelog 2014-01-28 12:49:53 UTC (rev 27463)
+++ packages/py-postgresql/trunk/debian/changelog 2014-01-28 19:54:39 UTC (rev 27464)
@@ -1,9 +1,21 @@
-py-postgresql (1.0.2-2) UNRELEASED; urgency=low
+py-postgresql (1.1.0-1) unstable; urgency=low
+ [ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 16:01:33 +0200
+ [ Daniel Kahn Gillmor ]
+ * New upstream release (Closes: #736447, #724597)
+ * update debian/watch (Closes: #736450)
+ * bump debhelper to 9
+ * Add dependency on python3-ipaddr
+ * bump Standards-Version to 3.9.5 (no changes needed)
+ * refreshed add_libpath.patch
+ * added myself to Uploaders as part of the python-modules-team
+ * replaced resolved/crypt with crypt from libpython3-stdlib to reduce
+ licensing silliness
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net> Thu, 23 Jan 2014 13:44:16 -0500
+
py-postgresql (1.0.2-1) unstable; urgency=low
* Initial release (Closes: #591048)
Modified: packages/py-postgresql/trunk/debian/compat
===================================================================
--- packages/py-postgresql/trunk/debian/compat 2014-01-28 12:49:53 UTC (rev 27463)
+++ packages/py-postgresql/trunk/debian/compat 2014-01-28 19:54:39 UTC (rev 27464)
@@ -1 +1 @@
-7
+9
Modified: packages/py-postgresql/trunk/debian/control
===================================================================
--- packages/py-postgresql/trunk/debian/control 2014-01-28 12:49:53 UTC (rev 27463)
+++ packages/py-postgresql/trunk/debian/control 2014-01-28 19:54:39 UTC (rev 27464)
@@ -2,9 +2,14 @@
Section: python
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, python-sphinx
-Standards-Version: 3.9.1
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
+ Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Build-Depends:
+ debhelper (>= 9),
+ python3-all-dev,
+ python3-sphinx,
+ python-sphinx
+Standards-Version: 3.9.5
X-Python3-Version: >= 3.1
Homepage: http://python.projects.postgresql.org/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/py-postgresql/trunk/
@@ -12,8 +17,14 @@
Package: python3-postgresql
Architecture: any
-Depends: ${python3:Depends}, ${misc:Depends}, ${shlibs:Depends},
- libjs-jquery
+Depends:
+ ${python3:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libpython3-stdlib,
+ python3-ipaddr,
+ libjs-jquery,
+ libjs-underscore
Description: pgsql driver, cluster management tools, and client tools
py-postgresql is a python3 DB-API driver, including cluster management
tools and client development tools. Written in pure Python 3 with
Modified: packages/py-postgresql/trunk/debian/copyright
===================================================================
--- packages/py-postgresql/trunk/debian/copyright 2014-01-28 12:49:53 UTC (rev 27463)
+++ packages/py-postgresql/trunk/debian/copyright 2014-01-28 19:54:39 UTC (rev 27464)
@@ -1,97 +1,128 @@
-This work was packaged for Debian by:
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: py-postgresql
+Upstream-Contact: James William Pye <x at jwp.io>
+Source: http://python.projects.pgfoundry.org/
- William Grzybowski <william at agencialivre.com.br> on Thu, 29 Jul 2010 17:47:56 +0000
+Files: *
+Copyright: 2004-2013 James William Pye <x at jwp.io>
+License: BSD-3
-It was downloaded from:
+Files: postgresql/test/test_dbapi20.py:
+Copyright: 2003 Stuart Bishop <zen at shangri-la.dropbear.id.au>
+License: BSD-3
- http://python.projects.postgresql.org/
-
-Upstream Author(s):
-
- James William Pye <x at jwp.name>
-
-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.
-
- 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 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
- 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.
-
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.
+Comment: not shipped in binary package, not required for build
+License: Evans-fcrypt
- 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.
+Files: debian/*
+Copyright: 2010-2014 William Grzybowski <william at agencialivre.com.br>,
+ Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+License: BSD-3
- 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.
+License: BSD-3
+ 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.
+ .
+ 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 James William 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 COPYRIGHT HOLDERS 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
+ COPYRIGHT OWNER 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.
- 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>
- 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.
-
- 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.
+License: Evans-fcrypt
+ 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/
+ ----- BEGIN fcrypt.c LICENSE -----
+ .
+ This library is free for commercial and non-commercial use as long as
+ the following conditions are aheared to. The following conditions
+ apply to all code found in this distribution, be it the RC4, RSA,
+ lhash, DES, etc., code; not just the SSL code. The SSL documentation
+ included with this distribution is covered by the same copyright terms
+ except that the holder is Tim Hudson (tjh at mincom.oz.au).
+ .
+ Copyright remains Eric Young's, and as such any Copyright notices in
+ the code are not to be removed.
+ If this package is used in a product, Eric Young should be given attribution
+ as the author of the parts of the library used.
+ This can be in the form of a textual message at program startup or
+ in documentation (online or textual) provided with the package.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. 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.
+ 3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+ "This product includes cryptographic software written by
+ Eric Young (eay at mincom.oz.au)"
+ The word 'cryptographic' can be left out if the rouines from the library
+ being used are not cryptographic related :-).
+ 4. If you include any Windows specific code (or a derivative thereof) from
+ the apps directory (application code) you must include an acknowledgement:
+ "This product includes software written by Tim Hudson (tjh at mincom.oz.au)"
+ .
+ THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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 AUTHOR 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.
+ .
+ The licence and distribution terms for any publically available version or
+ derivative of this code cannot be changed. i.e. this code cannot simply be
+ copied and put under another distribution licence
+ [including the GNU Public Licence.]
+ .
+ ----- END fcrypt.c LICENSE -----
Modified: packages/py-postgresql/trunk/debian/links
===================================================================
--- packages/py-postgresql/trunk/debian/links 2014-01-28 12:49:53 UTC (rev 27463)
+++ packages/py-postgresql/trunk/debian/links 2014-01-28 19:54:39 UTC (rev 27464)
@@ -1 +1,2 @@
usr/share/javascript/jquery/jquery.js usr/share/doc/python3-postgresql/html/_static/jquery.js
+usr/share/javascript/underscore/underscore.js usr/share/doc/python3-postgresql/html/_static/underscore.js
Modified: packages/py-postgresql/trunk/debian/patches/add_libpath.patch
===================================================================
--- packages/py-postgresql/trunk/debian/patches/add_libpath.patch 2014-01-28 12:49:53 UTC (rev 27463)
+++ packages/py-postgresql/trunk/debian/patches/add_libpath.patch 2014-01-28 19:54:39 UTC (rev 27464)
@@ -3,7 +3,7 @@
Last-Update: 2010-08-04
--- a/postgresql/sys.py
+++ b/postgresql/sys.py
-@@ -27,7 +27,7 @@
+@@ -26,7 +26,7 @@
from .python.element import format_element
from .python.string import indent
Modified: packages/py-postgresql/trunk/debian/patches/series
===================================================================
--- packages/py-postgresql/trunk/debian/patches/series 2014-01-28 12:49:53 UTC (rev 27463)
+++ packages/py-postgresql/trunk/debian/patches/series 2014-01-28 19:54:39 UTC (rev 27464)
@@ -1 +1,3 @@
add_libpath.patch
+use_python3_for_sphinx.patch
+use_stock_crypt.patch
Added: packages/py-postgresql/trunk/debian/patches/use_python3_for_sphinx.patch
===================================================================
--- packages/py-postgresql/trunk/debian/patches/use_python3_for_sphinx.patch (rev 0)
+++ packages/py-postgresql/trunk/debian/patches/use_python3_for_sphinx.patch 2014-01-28 19:54:39 UTC (rev 27464)
@@ -0,0 +1,9 @@
+--- a/postgresql/documentation/sphinx/build.sh
++++ b/postgresql/documentation/sphinx/build.sh
+@@ -30,5 +30,5 @@
+ EOF
+
+ mkdir -p ../html/doctrees
+-sphinx-build -c "$(pwd)" -E -b html -d ../html/doctrees .. ../html
++python3 "$(which sphinx-build)" -c "$(pwd)" -E -b html -d ../html/doctrees .. ../html
+ cd ../html && pwd
Modified: packages/py-postgresql/trunk/debian/rules
===================================================================
--- packages/py-postgresql/trunk/debian/rules 2014-01-28 12:49:53 UTC (rev 27463)
+++ packages/py-postgresql/trunk/debian/rules 2014-01-28 19:54:39 UTC (rev 27464)
@@ -8,12 +8,13 @@
for i in $(build3vers); do \
python$$i ./setup.py build;\
done
-
+ rm -f build/*/postgresql/resolved/crypt.py # avoid shipping crypt.py since we rely on libpython3-stdlib instead
+
+ (cd postgresql/documentation/sphinx && ./build.sh)
mkdir -p build/docs/html/doctrees
- find postgresql/documentation/ -type f -exec cp {} build/docs/ \;
- cp postgresql/project.py build/docs/
- cp postgresql/documentation/sphinx/index.rst build/docs/index.txt
- sphinx-build -E -b html -d build/docs/html/doctrees build/docs build/docs/html
+ cp -r postgresql/documentation/html build/docs/
+ rm -f build/docs/html/_static/jquery.js build/docs/html/_static/underscore.js
+ rm -f build/docs/html/.gitignore
override_dh_auto_install:
dh_install -ppython3-postgresql
@@ -34,4 +35,4 @@
rm -rf html
%:
- dh --with python3 $@
+ dh $@ --with python3
Modified: packages/py-postgresql/trunk/debian/watch
===================================================================
--- packages/py-postgresql/trunk/debian/watch 2014-01-28 12:49:53 UTC (rev 27463)
+++ packages/py-postgresql/trunk/debian/watch 2014-01-28 19:54:39 UTC (rev 27464)
@@ -1,2 +1,3 @@
version=3
-http://python.projects.postgresql.org/files/ py-postgresql-(.*)\.tar\.gz
+opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/<project>-$1\.tar\.gz/ \
+ https://github.com/python-postgres/fe/tags .*/v?(\d\S*)\.tar\.gz
More information about the Python-modules-commits
mailing list