Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 ido (0.3.4-1) unstable; urgency=low
 .
   * Merge newest upstream from Ubuntu.
     + Refresh 01_dont_use_ubuntu_gtk_widget_set_has_grab.patch.
     + Drop 02_dont_disable_deprecated.patch, we do not use deprecated
       functions anymore.
     + Refresh 03_linker.patch.
     + Closes: #660591
   * Thanks gregor herrmann and peter green for the NMU!
   * Standards-Version: 3.9.3
   * Fix descriptions of the GTK3 packages.
Author: Evgeni Golov <evgeni@debian.org>
Bug-Debian: http://bugs.debian.org/660591

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- ido-0.3.4.orig/configure.ac
+++ ido-0.3.4/configure.ac
@@ -111,7 +111,7 @@ AC_ARG_ENABLE([maintainer-flags],
 MAINTAINER_CFLAGS=""
 AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"],
       [
-        MAINTAINER_CFLAGS="-Werror -Wall -Wshadow -Wcast-align -Wno-uninitialized -Wempty-body -Wformat-security -Winit-self"
+        MAINTAINER_CFLAGS="-Wall -Wshadow -Wcast-align -Wno-uninitialized -Wempty-body -Wformat-security -Winit-self"
       ]
 )
 
--- ido-0.3.4.orig/src/Makefile.am
+++ ido-0.3.4/src/Makefile.am
@@ -55,7 +55,7 @@ AM_CPPFLAGS =				\
 	$(GCC_FLAGS)			\
 	$(GTK_CFLAGS)			\
 	$(MAINTAINER_CFLAGS)    \
-	-Wall -Werror -Wextra -Wno-unused-parameter
+	-Werror -Wall -Wextra -Wno-unused-parameter -Wno-error=deprecated-declarations
 
 libido_0_1_la_SOURCES =			\
 	idotypebuiltins.c		\
