Control: tags -1 + patch

Dear maintainer,

I've prepared an NMU for libkdtree++ (versioned as 0.7.0-1.1). It is
available at [1] and the debdiff is attached.

Regards

[1] 
http://mentors.debian.net/debian/pool/main/libk/libkdtree++/libkdtree++_0.7.0-1.1.dsc
-- 
Sebastian Ramacher
diff -u libkdtree++-0.7.0/debian/changelog libkdtree++-0.7.0/debian/changelog
--- libkdtree++-0.7.0/debian/changelog
+++ libkdtree++-0.7.0/debian/changelog
@@ -1,3 +1,11 @@
+libkdtree++ (0.7.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Cherry pick 8d4fbb9a from upstream to fix issues with g++ 4.7. (Closes:
+    #687604)
+
+ -- Sebastian Ramacher <s.ramac...@gmx.at>  Tue, 25 Sep 2012 16:57:06 +0200
+
 libkdtree++ (0.7.0-1) unstable; urgency=low
 
   * New upstream release (closes: Bug#506485)
only in patch2:
unchanged:
--- libkdtree++-0.7.0.orig/kdtree++/kdtree.hpp
+++ libkdtree++-0.7.0/kdtree++/kdtree.hpp
@@ -1163,7 +1163,7 @@
       {
          typename _Base::NoLeakAlloc noleak(this);
          _Link_type new_node = noleak.get();
-         _M_construct_node(new_node, __V, __PARENT, __LEFT, __RIGHT);
+	 _Base::_M_construct_node(new_node, __V, __PARENT, __LEFT, __RIGHT);
          noleak.disconnect();
          return new_node;
       }
@@ -1181,8 +1181,8 @@
       void
       _M_delete_node(_Link_type __p)
       {
-        _M_destroy_node(__p);
-        _M_deallocate_node(__p);
+	_Base::_M_destroy_node(__p);
+        _Base::_M_deallocate_node(__p);
       }
 
       _Link_type _M_root;

Attachment: signature.asc
Description: Digital signature

Reply via email to