diff -u regexxer-0.9/debian/control regexxer-0.9/debian/control
--- regexxer-0.9/debian/control
+++ regexxer-0.9/debian/control
@@ -1,8 +1,9 @@
 Source: regexxer
 Section: devel
 Priority: optional
-Maintainer: Ross Burton <ross@debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.17), autotools-dev, intltool, libpcre3-dev (> 5.0), libgtk2.0-bin, libgtkmm-2.4-dev (>= 2.6), libglademm-2.4-dev (>= 2.4.0), libgconfmm-2.6-dev (>= 2.6.1), gconf2
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Maintainer: Ross Burton <ross@debian.org>
+Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.17), autotools-dev, intltool, libpcre3-dev, libgtkmm-2.4-dev (>= 2.4.0), libglademm-2.4-dev (>= 2.4.0), libgconfmm-2.6-dev (>= 2.6.1), gconf2
 Standards-Version: 3.7.2
 
 Package: regexxer
diff -u regexxer-0.9/debian/changelog regexxer-0.9/debian/changelog
--- regexxer-0.9/debian/changelog
+++ regexxer-0.9/debian/changelog
@@ -1,4 +1,44 @@
+regexxer (0.9-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - deleted debian maintainer field in favour of ubuntu one
+    - added libgtk2.0-bin to build-depends
+    - added 03-fix-save-all-menu-item.patch in debian/patches
+    - added --export-dynamic -Wl to debian/rules
+
+ -- Andrea Veri <bluekuja@ubuntu.com>  Sun,  6 May 2007 22:51:26 +0200
+
 regexxer (0.9-1) unstable; urgency=low
+regexxer (0.9-0ubuntu3) feisty; urgency=low
+
+  * debian/rules:
+    - include /usr/share/cdbs/1/rules/simple-patchsys.mk. 
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Tue, 10 Apr 2007 12:00:05 +0200
+
+regexxer (0.9-0ubuntu2) feisty; urgency=low
+
+  * debian/patches/03-fix-save-all-menu-item.patch:
+    - fix "save all" menu item. Thanks Daniel Elstner <danielk@openismus.com>
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Tue,  3 Apr 2007 16:38:21 +0200
+
+regexxer (0.9-0ubuntu1) feisty; urgency=low
+
+  * New upstream release:
+    - Command line option support
+    - Icon theme support
+    - Now builds a working executable on systems with newer libglade
+    - New GTK+ file chooser button
+    - Replaced about dialog with stock GTK+ one
+    - Completely revamped build system
+    - Lots of new translations: bg ca dz es eu fi fr hu ne pa pl sl sr 
+      sr@Latn uk vi zh_CN zh_HK zh_TW
+    - Other minor cleanups and fixes
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Mon, 19 Feb 2007 11:28:21 +0100
+
+regexxer (0.8-3.1) unstable; urgency=low
 
   * New upstream release.
   * Fix FSF address.
diff -u regexxer-0.9/debian/rules regexxer-0.9/debian/rules
--- regexxer-0.9/debian/rules
+++ regexxer-0.9/debian/rules
@@ -5,2 +5,3 @@
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1 -Wl,--as-needed"
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1 -Wl,--export-dynamic -Wl,--as-needed"
only in patch2:
unchanged:
--- regexxer-0.9.orig/debian/patches/03-fix-save-all-menu-item.patch
+++ regexxer-0.9/debian/patches/03-fix-save-all-menu-item.patch
@@ -0,0 +1,12 @@
+diff -Nur regexxer-0.9/ui/mainwindow.glade regexxer-0.9.new/ui/mainwindow.glade
+--- regexxer-0.9/ui/mainwindow.glade	2007-01-08 17:36:55.000000000 +0100
++++ regexxer-0.9.new/ui/mainwindow.glade	2007-04-03 16:38:02.000000000 +0200
+@@ -47,7 +47,7 @@
+ 		    <widget class="GtkImageMenuItem" id="menuitem_save_all">
+ 		      <property name="visible">True</property>
+ 		      <property name="label">regexxer-save-all</property>
+-		      <property name="use_underline">True</property>
++		      <property name="use_stock">True</property>
+ 		    </widget>
+ 		  </child>
+