The following commit has been merged in the master branch: commit 7df4d999e2e9ee1ad54b889bbadd813377f7a0e2 Author: David Paleino <da...@debian.org> Date: Tue Jan 18 21:03:55 2011 +0100
Use DEP-5 for debin/copyright diff --git a/debian/changelog b/debian/changelog index 4395a9a..859808b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,6 @@ osm2pgsql (0.70.5+r25090-1) UNRELEASED; urgency=low ***DO NOT RELEASE*** TODO: - + fix copyright file (DEP-5, missing entries?) + update manpage (reported upstream?) [ David Paleino ] @@ -20,6 +19,7 @@ osm2pgsql (0.70.5+r25090-1) UNRELEASED; urgency=low * debian/docs updated * Use new DebianGIS e-mail address * Add Build-Dependencies on zlib and protobuf-c + * Use DEP-5 for debin/copyright -- David Paleino <da...@debian.org> Mon, 17 Jan 2011 21:50:19 +0100 diff --git a/debian/copyright b/debian/copyright index 2277183..6b40532 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,66 +1,57 @@ -This package was debianized by Andreas Putzo <andr...@putzo.net> on -Sun, 30 Sep 2007 10:57:29 +0000. - -It was downloaded using svn from -http://svn.openstreetmap.org/applications/utils/export/osm2pgsql/. - -Upstream Authors: - - Jon Burgess <jburgess...@googlemail.com> - Artem Pavlenko <ar...@mapnik.org> - -Copyright: - - Copyright (C) 2006,2007,2008 Jon Burgess - Copyright (C) 2007,2007 Artem Pavlenko - -License: - - This package 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. - - This package 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. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - - -rb.c: Copyright (C) 1998-2002, 2004 Free Software Foundation, Inc. - Upstream Author: Ben Pfaff <b...@gnu.org> - License: GPL, see above. - - -sprompt.c: Copyright (c) 1994, The Regents of the University of California - Copyright (c) 1996-2006, PostgreSQL Global Development Group - -License: - - 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) 2007-2009 Andreas Putzo <andr...@putzo.net> and -is licensed under the GPL, see above. +Format: http://dep.debian.net/deps/dep5 +Source: http://svn.openstreetmap.org/applications/utils/export/osm2pgsql/ + +Files: * +Copyright: © 2007-2008, Artem Pavlenko <ar...@mapnik.org> + © 2006-2008, Jon Burgess <jburgess...@googlemail.com> +License: GPL-2+ + +Files: debian/* +Copyright: © 2007-2009, Andreas Putzo <andr...@putzo.net> + © 2010-2011, David Paleino <da...@debian.org> +License: GPL-2+ + +Files: rb.c +Copyright: © 1998-2002, 2004, Free Software Foundation, Inc. +License: GPL-2+ + +Files: sprompt.c +Copyright: © 1994, The Regents of the University of California + © 1996-2006, PostgreSQL Global Development Group +License: other + +License: GPL-2+ + This package 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. + . + This package 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. + . + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +Comments: + On Debian systems, the complete text of the GNU General Public License + version 2 or later can be found in `/usr/share/common-licenses/GPL-2'. + +License: other + 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. -- OpenStreetMap data to PostgreSQL converter _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel