[SCM] liblas branch, release1.2, updated. debian/1.2.1-1-10-g74f8ffb

Francesco Paolo Lovergine frankie at debian.org
Sat May 14 18:11:37 UTC 2011


The following commit has been merged in the release1.2 branch:
commit 74f8ffbca00e23bac86ad71c7c0f1f114d30ed6b
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Sat May 14 19:55:45 2011 +0200

    Fixed #625095

diff --git a/debian/changelog b/debian/changelog
index a7221f4..49891dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ liblas (1.2.1-3) unstable; urgency=low
   * Added a couple of new patches: now linking explictly libtiff and
     reautotoolized with current version of tools.
     (closes: #555283)
+  * Fixed missing standard header inclusion in iterator.hpp.
+    (closes: #625095)
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 14 May 2011 19:28:59 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 14 May 2011 19:50:36 +0200
 
 liblas (1.2.1-2) unstable; urgency=high
 
diff --git a/debian/patches/iterator.hpp b/debian/patches/iterator.hpp
new file mode 100644
index 0000000..7264e01
--- /dev/null
+++ b/debian/patches/iterator.hpp
@@ -0,0 +1,21 @@
+Index: liblas/include/liblas/iterator.hpp
+===================================================================
+--- liblas.orig/include/liblas/iterator.hpp	2011-05-14 19:50:30.000000000 +0200
++++ liblas/include/liblas/iterator.hpp	2011-05-14 19:55:24.000000000 +0200
+@@ -46,6 +46,7 @@
+ #include <liblas/laswriter.hpp>
+ #include <iterator>
+ #include <cassert>
++#include <cstddef>
+ 
+ namespace liblas {
+ 
+@@ -63,7 +64,7 @@
+     typedef T value_type;
+     typedef T const* pointer;
+     typedef T const& reference;
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+ 
+     /// Initializes iterator pointing to pass-the-end.
+     reader_iterator()
diff --git a/debian/patches/series b/debian/patches/series
index f08c990..8a5f169 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ missing.diff
 gcc4.5
 noundefined
 autoreconf
+iterator.hpp

-- 
ASPRS LiDAR data translation library



More information about the Pkg-grass-devel mailing list