[Python-modules-commits] r20045 - in packages/psycopg2/trunk/debian (6 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Wed Jan 18 21:26:56 UTC 2012
Date: Wednesday, January 18, 2012 @ 21:26:55
Author: kitterman
Revision: 20045
* Team upload
* New upstream release (Closes: #607714)
- Update debian/copyright
* Add build-arch and build-indep targets to debian/rules
* Adjust debian/rules so docmentation is not compressed (Closes: #589142),
objects.inv is not compressed (Closes: #608745), and the upstream NEWS
file is included in the package (Closes: #651835)
* Exclude redundant COPYING files in the doc directory from being installed
* Remove redundant Section: field from the python-psycopg2 entry in debian/
control
* Use dh_prep instead of deprecated dh_clean -k
* Remove obsolete debian/pycompat file
Added:
packages/psycopg2/trunk/debian/README.zpsycopgda2
Modified:
packages/psycopg2/trunk/debian/changelog
packages/psycopg2/trunk/debian/control
packages/psycopg2/trunk/debian/copyright
packages/psycopg2/trunk/debian/rules
Deleted:
packages/psycopg2/trunk/debian/pycompat
Added: packages/psycopg2/trunk/debian/README.zpsycopgda2
===================================================================
--- packages/psycopg2/trunk/debian/README.zpsycopgda2 (rev 0)
+++ packages/psycopg2/trunk/debian/README.zpsycopgda2 2012-01-18 21:26:55 UTC (rev 20045)
@@ -0,0 +1,7 @@
+ZPsycopgDA (in the Debian zope-psycopgda package) is a Zope Database
+Adapter based on the psycopg Python/PostgreSQL driver. You'll find
+more information and documentation in the pythonX.Y-psycopg package,
+where X.Y is the version of your installed Python.
+
+Details for ZPsycopgDA for Zope are found in the documentation of
+the python2.3-psycopg package.
Modified: packages/psycopg2/trunk/debian/changelog
===================================================================
--- packages/psycopg2/trunk/debian/changelog 2012-01-18 17:08:32 UTC (rev 20044)
+++ packages/psycopg2/trunk/debian/changelog 2012-01-18 21:26:55 UTC (rev 20045)
@@ -1,3 +1,20 @@
+psycopg2 (2.4.4-1) unstable; urgency=low
+
+ * Team upload
+ * New upstream release (Closes: #607714)
+ - Update debian/copyright
+ * Add build-arch and build-indep targets to debian/rules
+ * Adjust debian/rules so docmentation is not compressed (Closes: #589142),
+ objects.inv is not compressed (Closes: #608745), and the upstream NEWS
+ file is included in the package (Closes: #651835)
+ * Exclude redundant COPYING files in the doc directory from being installed
+ * Remove redundant Section: field from the python-psycopg2 entry in debian/
+ control
+ * Use dh_prep instead of deprecated dh_clean -k
+ * Remove obsolete debian/pycompat file
+
+ -- Scott Kitterman <scott at kitterman.com> Wed, 18 Jan 2012 12:59:48 -0500
+
psycopg2 (2.4.2-1) unstable; urgency=low
[ Jakub Wilk ]
Modified: packages/psycopg2/trunk/debian/control
===================================================================
--- packages/psycopg2/trunk/debian/control 2012-01-18 17:08:32 UTC (rev 20044)
+++ packages/psycopg2/trunk/debian/control 2012-01-18 21:26:55 UTC (rev 20045)
@@ -11,7 +11,6 @@
Package: python-psycopg2
Architecture: any
-Section: python
Depends: python-egenix-mxdatetime, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Provides: ${python:Provides}
Description: Python module for PostgreSQL
Modified: packages/psycopg2/trunk/debian/copyright
===================================================================
--- packages/psycopg2/trunk/debian/copyright 2012-01-18 17:08:32 UTC (rev 20044)
+++ packages/psycopg2/trunk/debian/copyright 2012-01-18 21:26:55 UTC (rev 20045)
@@ -11,8 +11,8 @@
Copyright:
- Copyright (C) 2001-2006 Federico Di Gregorio <fog at debian.org>
- Copyright (C) 2001 Michele Comitini <mcm at initd.org>
+ Copyright (C) 2001-2011 Federico Di Gregorio <fog at debian.org>
+ Copyright (C) 2010-2011 Daniele Varrazzo <daniele.varrazzo at gmail.com>
For psycopg2da:
Copyright (C) 2006 Fabio Tranchitella <kobold at debian.org>
@@ -21,84 +21,139 @@
Copyright (C) 2001-2005 Federico Di Gregorio <fog at debian.org>
Copyright (C) 2002 Tom Jenkins <tjenkins at devis.com>
- For the file tests/dbapi20.py:
- Copyright (C) 2003 Ian Bicking <ianb at colorstudy.com>
+ For the file psycopg/xid_type.c:
+ Copyright (C) 2008 Canonical Ltd.
- For the file scripts/ext2html.py:
- Copyright (C) 2003 Daniele Varrazzo <daniele.varrazzo at gmail.com>
+ For the files psycopg/xid.h, tests/test_connection.py, and
+ tests/test_dates.py:
+ Copyright (C) 2008-2011 James Henstridge <james at jamesh.id.au>
+ For the files tests/test_cancel.py and tests/test_async.py
+ Copyright (C) 2010-2011 Jan Urbański <wulczer at wulczer.org>
+ For the file lib/errorcodes.py:
+ Copyright (C) 2006-2010 Johan Dahlin <jdahlin at async.com.br>
+
License for psycopg2, ZPsycopgDA and psycopg2da:
- psycopg is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+psycopg2 is free software: you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in '/usr/share/common-licenses/GPL'.
+psycopg2 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.
- As a special exception, specific permission is granted for the GPLed
- code in this distribition to be linked to OpenSSL and PostgreSQL libpq
- without invoking GPL clause 2(b).
+In addition, as a special exception, the copyright holders give
+permission to link this program with the OpenSSL library (or with
+modified versions of OpenSSL that use the same license as OpenSSL),
+and distribute linked combinations including the two.
- Note that the GPL was chosen to avoid proprietary adapters based on
- psycopg code. Using psycopg in a proprietary product (even bundling
- psycopg with the proprietary product) is fine as long as:
+You must obey the GNU Lesser General Public License in all respects for
+all of the code used other than OpenSSL. If you modify file(s) with this
+exception, you may extend this exception to your version of the file(s),
+but you are not obligated to do so. If you do not wish to do so, delete
+this exception statement from your version. If you delete this exception
+statement from all source files in the program, then also delete it here.
- 1. psycopg is called from Python only using only the provided API
- (i.e., no linking with C code and no C modules based on it); and
+You should have received a copy of the GNU Lesser General Public License
+along with psycopg2 (see the doc/ directory.)
+If not, see <http://www.gnu.org/licenses/>.
- 2. all the other points of the GPL are respected (you offer a copy
- of psycopg's source code, and so on.)
+On Debian systems see /usr/share/common-licenses/LGPL-3 for details
+Alternative licenses
+====================
-License for the files tests/dbapi20.py and scripts/ext2html.py:
+If you prefer you can use the Zope Database Adapter ZPsycopgDA (i.e.,
+every file inside the ZPsycopgDA directory) user the ZPL license as
+published on the Zope web site, http://www.zope.org/Resources/ZPL.
- These modules have been placed in the public domain.
+Also, the following BSD-like license applies (at your option) to the
+files following the pattern psycopg/adapter*.{h,c} and
+psycopg/microprotocol*.{h,c}:
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
-Alternative licenses for ZPsycopgDA:
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product documentation
+ would be appreciated but is not required.
- If you prefer you can use the Zope Database Adapter ZPsycopgDA (i.e.,
- every file inside the ZPsycopgDA directory) user the ZPL license as
- published on the Zope web site, http://www.zope.org/Resources/ZPL.
+ 2. Altered source versions must be plainly marked as such, and must not
+ be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
Alternative licenses for psycopg2da:
If you prefer you can use the Zope3 Database Adapter psycopg2da (i.e.,
every file inside the psycopg2da directory) user the ZPL license as
published on the Zope web site, http://www.zope.org/Resources/ZPL.
+ See above for full license text.
-Alternative licenses for psycopg/adapter*.{j,c} and
-psycopg/microprotocol*.{h.c}:
- Also, the following BSD-like license applies (at your option) to the
- files following the pattern psycopg/adapter*.{h,c} and
- psycopg/microprotocol*.{h,c}:
+License for the files tests/dbapi20.py and scripts/ext2html.py:
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
+ These modules have been placed in the public domain.
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this
- software in a product, an acknowledgment in the product documentation
- would be appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not
- be misrepresented as being the original software.
+doc/pep-0249.txt has been placed in the public domain
- 3. This notice may not be removed or altered from any source distribution.
- psycopg 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 General Public License for more details.
+License and copyright for doc/html/_static/jquery.js:
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+Copyright (c) The Regents of the University of California.
+All rights reserved.
+
+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 above 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. Neither the name of the University 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 and copyright for doc/html/_static/doctools.js, sidebar.js,
+searchtools.js, basic.css, websupport.js, and default.css
+ * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+
+See above for full BSD license text
+
+
Proprietary licenses:
A non-exclusive license is available for companies that want to include
Deleted: packages/psycopg2/trunk/debian/pycompat
===================================================================
--- packages/psycopg2/trunk/debian/pycompat 2012-01-18 17:08:32 UTC (rev 20044)
+++ packages/psycopg2/trunk/debian/pycompat 2012-01-18 21:26:55 UTC (rev 20045)
@@ -1 +0,0 @@
-2
Modified: packages/psycopg2/trunk/debian/rules
===================================================================
--- packages/psycopg2/trunk/debian/rules 2012-01-18 17:08:32 UTC (rev 20044)
+++ packages/psycopg2/trunk/debian/rules 2012-01-18 21:26:55 UTC (rev 20045)
@@ -38,10 +38,13 @@
done
dh_clean
-install-arch: build
+build-arch: build
+build-indep: build
+
+install-arch: build-arch
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# psycopg2
for python in $(PYVERS); do \
@@ -75,13 +78,13 @@
binary-arch: build install-arch
dh_testdir
dh_testroot
- dh_installdocs -a README AUTHORS doc tests
+ dh_installdocs -a README AUTHORS NEWS doc tests -Xdoc/COPYING*
dh_installchangelogs -a ChangeLog
dh_link -a
dh_strip -ppython-psycopg2 --dbg-package=python-psycopg2-dbg
rm -rf debian/python-psycopg2-dbg/usr/share/doc/python-psycopg2-dbg
ln -s python-psycopg2 debian/python-psycopg2-dbg/usr/share/doc/python-psycopg2-dbg
- dh_compress -a
+ dh_compress -a -X.js -X_sources -Xobjects.inv
dh_fixperms -a
dh_makeshlibs -a
dh_python2 -a
More information about the Python-modules-commits
mailing list