[SCM] osm2pgsql branch, master, updated. debian/0.70.5+r25090-2-10-geaab0c0

David Paleino dapal at debian.org
Sun Feb 26 20:49:15 UTC 2012


The following commit has been merged in the master branch:
commit 62a76baebaa169d5d6c1f63cb8ba2ad14e18618a
Author: David Paleino <dapal at debian.org>
Date:   Sun Feb 26 21:23:06 2012 +0100

    Updated debian/copyright

diff --git a/debian/changelog b/debian/changelog
index f5e14e2..f7156d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ osm2pgsql (0.80.0+r27899-1) UNRELEASED; urgency=low
   * New SVN snapshot
   * Strip the debian/ directory from the SVN checkout
   * Standards-Version bump to 3.9.3, no changes needed
+  * Updated debian/copyright
 
- -- David Paleino <dapal at debian.org>  Sun, 26 Feb 2012 21:07:38 +0100
+ -- David Paleino <dapal at debian.org>  Sun, 26 Feb 2012 21:22:58 +0100
 
 osm2pgsql (0.70.5+r25090-2) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 6b40532..21ef622 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
-Format: http://dep.debian.net/deps/dep5
-Source: http://svn.openstreetmap.org/applications/utils/export/osm2pgsql/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Upstream-Source: http://svn.openstreetmap.org/applications/utils/export/osm2pgsql/
 
 Files: *
 Copyright: © 2007-2008, Artem Pavlenko <artem at mapnik.org>
@@ -8,9 +8,13 @@ License: GPL-2+
 
 Files: debian/*
 Copyright: © 2007-2009, Andreas Putzo <andreas at putzo.net>
- © 2010-2011, David Paleino <dapal at debian.org>
+ © 2010-2012, David Paleino <dapal at debian.org>
 License: GPL-2+
 
+Files: geos-fallback/*
+Copyright: © 2006, Refractions Research Inc.
+License: LGPL-3+
+
 Files: rb.c
 Copyright: © 1998-2002, 2004, Free Software Foundation, Inc.
 License: GPL-2+
@@ -32,9 +36,8 @@ License: GPL-2+
  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:
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
  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'.
 
@@ -55,3 +58,20 @@ License: other
  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.
+
+License: LGPL-3+
+ This package 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.
+ .
+ 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 Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 3 or later can be found in `/usr/share/common-licenses/LGPL-3'.

-- 
OpenStreetMap data to PostgreSQL converter



More information about the Pkg-grass-devel mailing list