diff -u gmetadom-0.2.5/debian/changelog gmetadom-0.2.5/debian/changelog
--- gmetadom-0.2.5/debian/changelog
+++ gmetadom-0.2.5/debian/changelog
@@ -1,3 +1,11 @@
+gmetadom (0.2.5-3ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable (LP: #172546), remaining changes:
+    - Fix build failure with g++-4.3 (re-add lost patch).
+    - Set Ubuntu maintainer address.
+
+ -- Michael Bienia <geser@ubuntu.com>  Wed, 28 Nov 2007 12:22:16 +0100
+
 gmetadom (0.2.5-3) unstable; urgency=low
 
   * debian/rules
@@ -16,6 +24,13 @@
 
  -- Stefano Zacchiroli <zack@debian.org>  Mon, 16 Jul 2007 15:38:29 +0200
 
+gmetadom (0.2.5-1ubuntu1) gutsy; urgency=low
+
+  * Fix build failure with g++-4.3.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 10 Sep 2007 12:10:18 +0200
+
 gmetadom (0.2.5-1) unstable; urgency=low
 
   * new upstream release
diff -u gmetadom-0.2.5/debian/control gmetadom-0.2.5/debian/control
--- gmetadom-0.2.5/debian/control
+++ gmetadom-0.2.5/debian/control
@@ -1,7 +1,8 @@
 Source: gmetadom
 Section: devel
 Priority: optional
-Maintainer: Stefano Zacchiroli <zack@debian.org>
+Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Stefano Zacchiroli <zack@debian.org>
 Build-Depends: debhelper (>= 5.0.0), ocaml-nox (>= 3.10.0), ocaml-findlib (>= 1.1), libgdome2-dev (>= 0.8.1), pkg-config, dpatch, cdbs
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/gmetadom
only in patch2:
unchanged:
--- gmetadom-0.2.5.orig/debian/patches/00list
+++ gmetadom-0.2.5/debian/patches/00list
@@ -0,0 +1 @@
+01_gcc43-fix
only in patch2:
unchanged:
--- gmetadom-0.2.5.orig/debian/patches/01_gcc43-fix.dpatch
+++ gmetadom-0.2.5/debian/patches/01_gcc43-fix.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_gcc43-fix.dpatch by Michael Bienia <geser@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad gmetadom-0.2.5-3ubuntu1~/src/gdome_cpp_smart/include/GdomeSmartDOMTraits.hh gmetadom-0.2.5-3ubuntu1/src/gdome_cpp_smart/include/GdomeSmartDOMTraits.hh
+--- gmetadom-0.2.5-3ubuntu1~/src/gdome_cpp_smart/include/GdomeSmartDOMTraits.hh	2007-11-21 18:27:08.000000000 +0100
++++ gmetadom-0.2.5-3ubuntu1/src/gdome_cpp_smart/include/GdomeSmartDOMTraits.hh	2007-11-28 12:16:00.000000000 +0100
+@@ -26,6 +26,7 @@
+  */
+ 
+ #include <string>
++#include <cstring>
+ 
+ #include "GdomeSmartDOMChar.hh"
+