From 723baaefa09bcd9f0a7089961d3f697b48f072fb Mon Sep 17 00:00:00 2001 From: Dimitri Fontaine Date: Tue, 9 Nov 2010 16:13:15 +0100 Subject: [PATCH] Fix lintian warnings, and update copyright to match PostgreSQL licence text --- debian/changelog | 2 +- debian/control | 4 ++-- debian/copyright | 43 +++++++++++++++++++++++++------------------ debian/rules | 0 4 files changed, 28 insertions(+), 21 deletions(-) mode change 100644 => 100755 debian/rules diff --git a/debian/changelog b/debian/changelog index bd1dbf7..304c3ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,7 @@ pgloader (2.3.3~dev3-1) unstable; urgency=low * Fix pgloader thread error management * Fix exit status to be non-zero in case of known errors - -- Dimitri Fontaine Sun, 4 Apr 2010 19:34:39 +0200 + -- Dimitri Fontaine Tue, 09 Nov 2010 16:10:01 +0100 pgloader (2.3.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 73e2083..1b62f22 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,12 @@ Section: database Priority: extra Maintainer: Dimitri Fontaine Build-Depends: debhelper (>= 5), docbook-to-man (>= 2.0.0), python-support (>= 0.3), xmlto, asciidoc (>= 0.8.2) -Standards-Version: 3.8.3 +Standards-Version: 3.9.1 Homepage: http://pgloader.projects.postgresql.org Package: pgloader Architecture: all -Depends: python (>=2.4.4), python-psycopg2 | python-psycopg (<< 1.1.21) | python-psycopg (>= 1.1.21-14), python-support (>= 0.3) +Depends: ${misc:Depends}, python (>=2.4.4), python-psycopg2 | python-psycopg (<< 1.1.21) | python-psycopg (>= 1.1.21-14), python-support (>= 0.3) Description: loads flat data files into PostgreSQL pgloader imports data from flat files and insert it into a database table. You have to provide a configuration file containing sections, diff --git a/debian/copyright b/debian/copyright index 0411693..f95aee5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,31 +1,38 @@ -This package was debianized by Dimitri Fontaine on +This package was debianized by Dimitri Fontaine on Mon, 13 Nov 2006 22:56:15 +0100. -It was downloaded from http://pgloader.dalibo.org/ +It was downloaded from http://pgloader.projects.postgresql.org/ Upstream Author: Dimitri Fontaine Copyright: 2005, Jan Wieck 2006, 2007, 2008 Dimitri Fontaine -License: - Redistribution and use in source and binary forms, with or without - modification, are permitted under the terms of the BSD License. +Copyright. The following copyright applies to the entire distribution: - 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. + PostgreSQL Data Base Management System + (formerly known as Postgres, then as Postgres95). + + Portions Copyright (c) 1996-2003, The PostgreSQL Global Development Group -On Debian systems, the complete text of the BSD License can be -found in `/usr/share/common-licenses/BSD'. + Portions Copyright (c) 1994, The Regents of the University of California + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose, without fee, and without a written agreement + is hereby granted, provided that the above copyright notice and this + paragraph and the following two paragraphs appear in all copies. + + IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR + DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING + LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS + DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO + PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. The Debian packaging is (C) 2006, Dimitri Fontaine and diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755