diff --git a/debian/changelog b/debian/changelog index ef6f5570e7..7426c365c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -72,7 +72,8 @@ gtk+2.0 (2.16.1-1) experimental; urgency=low * New upstream bugfix release: + debian/patches/070_mandatory-relibtoolize.patch: - Regenerated for the new version. - + debian/patches/092_fix_printtest_include.patch, + + debian/patches/072_workaround_directfb_build.patch, + debian/patches/092_fix_printtest_include.patch, debian/patches/093_git_change_fix_focus_issue.patch: - Dropped, merged upstream. diff --git a/debian/patches/072_workaround_directfb_build.patch b/debian/patches/072_workaround_directfb_build.patch deleted file mode 100644 index 71ee8f9634..0000000000 --- a/debian/patches/072_workaround_directfb_build.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: gtk+2.0-2.14.0/gdk/directfb/gdktestutils-directfb.c -=================================================================== ---- gtk+2.0-2.14.0.orig/gdk/directfb/gdktestutils-directfb.c 2008-09-04 06:36:10.000000000 +0200 -+++ gtk+2.0-2.14.0/gdk/directfb/gdktestutils-directfb.c 2008-09-05 00:36:44.000000000 +0200 -@@ -175,7 +175,6 @@ - - evt.clazz = DFEC_WINDOW; - evt.type = (key_pressrelease == GDK_KEY_PRESS) ? DWET_KEYDOWN : DWET_KEYUP; -- evt.flags = DWEF_NONE; - evt.window_id = impl->dfb_id; - evt.x = MAX(x, 0); - evt.y = MAX(y, 0); -@@ -241,7 +240,6 @@ - - evt.clazz = DFEC_WINDOW; - evt.type = (button_pressrelease == GDK_BUTTON_PRESS) ? DWET_BUTTONDOWN : DWET_BUTTONUP; -- evt.flags = DWEF_NONE; - evt.window_id = impl->dfb_id; - evt.x = MAX(x, 0); - evt.y = MAX(y, 0); diff --git a/debian/patches/series b/debian/patches/series index 86827cb411..2655b1c65c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,5 +15,4 @@ 060_ignore-random-icons.patch 061_use_pdf_as_default_printing_standard.patch 070_mandatory-relibtoolize.patch -072_workaround_directfb_build.patch 091_workaround_no_gtk_init_incorrect_display.patch