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

[David Paleino]

The following commit has been merged in the master branch:
commit 62a76baebaa169d5d6c1f63cb8ba2ad14e18618a
Author: David Paleino 
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   Sun, 26 Feb 2012 21:07:38 +0100
+ -- David Paleino   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 
@@ -8,9 +8,13 @@ License: GPL-2+
 
 Files: debian/*
 Copyright: © 2007-2009, Andreas Putzo 
- © 2010-2011, David Paleino 
+ © 2010-2012, David Paleino 
 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 .
+ .
  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 .
+ .
+ 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

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

[David Paleino]

The following commit has been merged in the master branch:
commit eaab0c03a46788da0ef03b66a0e806ac843736c8
Author: David Paleino 
Date:   Sun Feb 26 21:37:43 2012 +0100

Releasing to sid

diff --git a/debian/changelog b/debian/changelog
index 7a7ef48..13a19fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-osm2pgsql (0.80.0+r27899-1) UNRELEASED; urgency=low
+osm2pgsql (0.80.0+r27899-1) unstable; urgency=low
 
   * New SVN snapshot
   * Strip the debian/ directory from the SVN checkout
@@ -7,7 +7,7 @@ osm2pgsql (0.80.0+r27899-1) UNRELEASED; urgency=low
   * Patches refreshed to apply to new source
   * Switch build-dependency from libgeos-dev to libgeos++-dev
 
- -- David Paleino   Sun, 26 Feb 2012 21:35:40 +0100
+ -- David Paleino   Sun, 26 Feb 2012 21:37:38 +0100
 
 osm2pgsql (0.70.5+r25090-2) unstable; urgency=low
 

-- 
OpenStreetMap data to PostgreSQL converter

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

[David Paleino]

The following commit has been merged in the master branch:
commit caafbc4fb187a95ccba95089888133594d8c55bf
Author: David Paleino 
Date:   Sun Feb 26 21:30:41 2012 +0100

Patches refreshed to apply to new source

diff --git a/debian/changelog b/debian/changelog
index f7156d3..0dbd8e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ osm2pgsql (0.80.0+r27899-1) UNRELEASED; urgency=low
   * Strip the debian/ directory from the SVN checkout
   * Standards-Version bump to 3.9.3, no changes needed
   * Updated debian/copyright
+  * Patches refreshed to apply to new source
 
- -- David Paleino   Sun, 26 Feb 2012 21:22:58 +0100
+ -- David Paleino   Sun, 26 Feb 2012 21:30:31 +0100
 
 osm2pgsql (0.70.5+r25090-2) unstable; urgency=low
 
diff --git a/debian/patches/00-fix_build.patch 
b/debian/patches/00-fix_build.patch
index c62e24c..9dc5ea8 100644
--- a/debian/patches/00-fix_build.patch
+++ b/debian/patches/00-fix_build.patch
@@ -3,22 +3,19 @@ Subject: add missing ZLIB linkage
 Forwarded: no
 
 ---
- Makefile.am |6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ Makefile.am |4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 --- osm2pgsql.orig/Makefile.am
 +++ osm2pgsql/Makefile.am
-@@ -35,10 +35,10 @@ BUILT_SOURCES = \
+@@ -37,8 +37,8 @@ endif
  
- endif
+ osm2pgsqldir = $(datadir)/osm2pgsql
  
--AM_CFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@ 
 @GEOS_CFLAGS@ @PROJ_CFLAGS@  @PROTOBUF_C_CFLAGS@ 
-DOSM2PGSQL_DATADIR='"$(datadir)"' -DVERSION='"@PACKAGE_VERSION@"'
--AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ 
@BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@ -DOSM2PGSQL_DATADIR='"$(datadir)"'
-+AM_CFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@ 
 @GEOS_CFLAGS@ @PROJ_CFLAGS@  @PROTOBUF_C_CFLAGS@ @ZLIB_CFLAGS@ 
-DOSM2PGSQL_DATADIR='"$(datadir)"' -DVERSION='"@PACKAGE_VERSION@"'
-+AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ 
@BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@ @ZLIB_CFLAGS@ 
-DOSM2PGSQL_DATADIR='"$(datadir)"'
+-AM_CFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@ 
 @GEOS_CFLAGS@ @PROJ_CFLAGS@  @PROTOBUF_C_CFLAGS@ 
-DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -DVERSION='"@PACKAGE_VERSION@"' 
+-AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ 
@BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@ 
-DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -Igeos-fallback
++AM_CFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ @BZIP2_CFLAGS@ 
 @GEOS_CFLAGS@ @PROJ_CFLAGS@  @PROTOBUF_C_CFLAGS@ @ZLIB_CFLAGS@ 
-DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -DVERSION='"@PACKAGE_VERSION@"'
++AM_CPPFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_CFLAGS@ @XML2_CFLAGS@ 
@BZIP2_CFLAGS@  @GEOS_CFLAGS@ @PROJ_CFLAGS@ @ZLIB_CFLAGS@ 
-DOSM2PGSQL_DATADIR='"$(osm2pgsqldir)"' -Igeos-fallback
  
--AM_LDFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_LDFLAGS@ @XML2_LDFLAGS@ 
@BZIP2_LDFLAGS@ @GEOS_LDFLAGS@ @GEOS_LIBS@ @PROJ_LDFLAGS@ @PROTOBUF_C_LDFLAGS@
-+AM_LDFLAGS = @PTHREAD_CFLAGS@ @POSTGRESQL_LDFLAGS@ @XML2_LDFLAGS@ 
@BZIP2_LDFLAGS@ @GEOS_LDFLAGS@ @GEOS_LIBS@ @PROJ_LDFLAGS@ @PROTOBUF_C_LDFLAGS@ 
@ZLIB_LDFLAGS@
+ AM_LDFLAGS = @PTHREAD_CFLAGS@ @ZLIB_LDFLAGS@ @ZLIB_LIBS@ @POSTGRESQL_LDFLAGS@ 
@POSTGRESQL_LIBS@ @XML2_LDFLAGS@ @BZIP2_LDFLAGS@ @BZIP2_LIBS@ @GEOS_LDFLAGS@ 
@GEOS_LIBS@ @PROJ_LDFLAGS@ @PROJ_LIBS@ @PROTOBUF_C_LDFLAGS@ @PROTOBUF_C_LIBS@
  
- osm2pgsqldir = $(datadir)/osm2pgsql
- osm2pgsql_DATA = default.style 900913.sql
diff --git a/debian/patches/01-disable_gazetteer.patch 
b/debian/patches/01-disable_gazetteer.patch
index a17b1b9..919754c 100644
--- a/debian/patches/01-disable_gazetteer.patch
+++ b/debian/patches/01-disable_gazetteer.patch
@@ -20,7 +20,7 @@ Forwarded: not-needed
  
 --- osm2pgsql.orig/configure.ac
 +++ osm2pgsql/configure.ac
-@@ -91,5 +91,5 @@ AX_PTHREAD(,[AC_MSG_ERROR([no])])
+@@ -93,5 +93,5 @@ AX_PTHREAD(,[AC_MSG_ERROR([no])])
  
  
  dnl Generate Makefile

-- 
OpenStreetMap data to PostgreSQL converter

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

[David Paleino]

The following commit has been merged in the master branch:
commit 82c7994ab424860f9c41fcde5572ed337ceef9e2
Author: David Paleino 
Date:   Sun Feb 26 21:35:51 2012 +0100

Switch build-dependency from libgeos-dev to libgeos++-dev

diff --git a/debian/changelog b/debian/changelog
index 0dbd8e6..7a7ef48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ osm2pgsql (0.80.0+r27899-1) UNRELEASED; urgency=low
   * Standards-Version bump to 3.9.3, no changes needed
   * Updated debian/copyright
   * Patches refreshed to apply to new source
+  * Switch build-dependency from libgeos-dev to libgeos++-dev
 
- -- David Paleino   Sun, 26 Feb 2012 21:30:31 +0100
+ -- David Paleino   Sun, 26 Feb 2012 21:35:40 +0100
 
 osm2pgsql (0.70.5+r25090-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 89bef14..e616531 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  , dh-autoreconf
  , libbz2-dev
  , zlib1g-dev
- , libgeos-dev
+ , libgeos++-dev
  , libpq-dev
  , libxml2-dev
  , libproj-dev

-- 
OpenStreetMap data to PostgreSQL converter

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

[David Paleino]

The following commit has been merged in the master branch:
commit 173d75b2a5cda799527f5668f273a1ccef10b04b
Merge: 64368717892a336602d3413b0e0abf32e9ed6640 
3ba1a1360fc4400993783b07b8ed24d40733ea12
Author: David Paleino 
Date:   Sun Feb 26 21:05:38 2012 +0100

Merge tag 'upstream/0.80.0+r27899'

Upstream version 0.80.0+r27899


-- 
OpenStreetMap data to PostgreSQL converter

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

[David Paleino]

The following commit has been merged in the master branch:
commit a1a495f05171fad3436e62f59f27f0413c781539
Author: David Paleino 
Date:   Sun Feb 26 21:07:51 2012 +0100

Standards-Version bump to 3.9.3, no changes needed

diff --git a/debian/changelog b/debian/changelog
index 8a33c6d..f5e14e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,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
 
- -- David Paleino   Sun, 26 Feb 2012 20:55:49 +0100
+ -- David Paleino   Sun, 26 Feb 2012 21:07:38 +0100
 
 osm2pgsql (0.70.5+r25090-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f398cda..89bef14 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends:
  , libproj-dev
  , libprotobuf-c0-dev (>= 0.14)
  , protobuf-c-compiler
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
 Homepage: http://wiki.openstreetmap.org/wiki/Osm2pgsql
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/osm2pgsql.git
 Vcs-Git: git://git.debian.org/pkg-grass/osm2pgsql.git

-- 
OpenStreetMap data to PostgreSQL converter

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

[David Paleino]

The following commit has been merged in the master branch:
commit 48ecc3d513bfde22aa1e66e95e3852f49f0b8cfe
Author: David Paleino 
Date:   Sun Feb 26 21:07:28 2012 +0100

New SVN snapshot

diff --git a/debian/changelog b/debian/changelog
index 97b5282..8a33c6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-osm2pgsql (0.70.5+r25090-3) UNRELEASED; urgency=low
+osm2pgsql (0.80.0+r27899-1) UNRELEASED; urgency=low
 
+  * New SVN snapshot
   * Strip the debian/ directory from the SVN checkout
 
  -- David Paleino   Sun, 26 Feb 2012 20:55:49 +0100

-- 
OpenStreetMap data to PostgreSQL converter

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

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

[David Paleino]

The following commit has been merged in the master branch:
commit 64368717892a336602d3413b0e0abf32e9ed6640
Author: David Paleino 
Date:   Sun Feb 26 20:59:45 2012 +0100

Strip the debian/ directory from the SVN checkout

diff --git a/debian/changelog b/debian/changelog
index 5af219d..97b5282 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osm2pgsql (0.70.5+r25090-3) UNRELEASED; urgency=low
+
+  * Strip the debian/ directory from the SVN checkout
+
+ -- David Paleino   Sun, 26 Feb 2012 20:55:49 +0100
+
 osm2pgsql (0.70.5+r25090-2) unstable; urgency=low
 
   * Fix Maintainer e-mail address
diff --git a/debian/rules b/debian/rules
index 53f3920..19b6e3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,8 @@ get-orig-source:
svn export -r ${SVNREV} ${SVNREPO} osm2pgsql-${UPVER}${SUFFIX}/
@echo Removing gazetteer.
rm -rf osm2pgsql-${UPVER}${SUFFIX}/gazetteer/
+   @echo Removing debian/ directory
+   rm -rf osm2pgsql-${UPVER}${SUFFIX}/debian/
@echo Building snapshot tarball.
tar czvf osm2pgsql_${UPVER}${SUFFIX}.orig.tar.gz 
osm2pgsql-${UPVER}${SUFFIX}
@echo Cleaning up

-- 
OpenStreetMap data to PostgreSQL converter

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel