The following commit has been merged in the master branch:
commit 78715a82105aa6eb639e90b6953638b9742926b5
Merge: 0f0c076cccb7b9f08848eb41c585a4c0d47652ad 
10e6bb6b19a9bde2fdc52338b8dacf61587ee33d
Author: David Paleino <da...@debian.org>
Date:   Sun Sep 23 09:28:02 2012 +0200

    Merge branch 'wheezy/master'
    
    Conflicts:
        debian/changelog
        debian/patches/series

diff --combined debian/changelog
index 7d89e5b,def62db..e6d76d3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,9 +1,20 @@@
 +osm2pgsql (0.81.0+r28712-1) UNRELEASED; urgency=low
 +
 +  * New SVN snapshot
 +  * Patches refreshed to apply to new source
 +  * Update debian/rules get-orig-source to not bother trying to remove the
 +    gazetteer as it is no longer included upstream
 +  * Update manpage
 +  * Add debian/watch documenting the situation of the upstream version number
 +
 + -- Andrew Harvey <andrew.harv...@gmail.com>  Sun, 23 Sep 2012 10:03:25 +1000
++
+ osm2pgsql (0.80.0+r27899-3) unstable; urgency=low
+ 
+   * Update Recommends of postgresql-8.4-postgis to -9.1
+   * Backport support for 64-bit IDs (Closes: #687965)
+ 
+  -- David Paleino <da...@debian.org>  Sun, 23 Sep 2012 09:14:15 +0200
  
  osm2pgsql (0.80.0+r27899-1) unstable; urgency=low
  
diff --combined debian/patches/series
index b75ec23,be78265..0d15675
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,3 +1,2 @@@
  00-fix_build.patch
 -01-disable_gazetteer.patch
+ 02-backport_64bit_ids_support.patch

-- 
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

Reply via email to