diff --git a/debian/changelog b/debian/changelog index 9d0269171b..1a73cd4956 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ gtk+3.0 (3.6.3-1) UNRELEASED; urgency=low * New upstream release. + * Refresh patches. -- Michael Biebl Fri, 04 Jan 2013 21:42:17 +0100 diff --git a/debian/patches/015_default-fallback-icon-theme.patch b/debian/patches/015_default-fallback-icon-theme.patch old mode 100644 new mode 100755 index 5dced21a31..9c11e275fb --- a/debian/patches/015_default-fallback-icon-theme.patch +++ b/debian/patches/015_default-fallback-icon-theme.patch @@ -1,8 +1,8 @@ -Index: gtk+-3.4.1/gtk/gtksettings.c +Index: gtk+-3.6.3/gtk/gtksettings.c =================================================================== ---- gtk+-3.4.1.orig/gtk/gtksettings.c 2012-04-04 03:06:04.000000000 +0200 -+++ gtk+-3.4.1/gtk/gtksettings.c 2012-04-15 20:55:20.822307902 +0200 -@@ -429,7 +429,7 @@ +--- gtk+-3.6.3.orig/gtk/gtksettings.c 2013-01-04 21:43:23.372362757 +0100 ++++ gtk+-3.6.3/gtk/gtksettings.c 2013-01-04 21:43:23.372362757 +0100 +@@ -450,7 +450,7 @@ g_param_spec_string ("gtk-fallback-icon-theme", P_("Fallback Icon Theme Name"), P_("Name of a icon theme to fall back to"), diff --git a/debian/patches/016_no_offscreen_widgets_grabbing.patch b/debian/patches/016_no_offscreen_widgets_grabbing.patch old mode 100644 new mode 100755 index 9b799a0ff3..859ad0793e --- a/debian/patches/016_no_offscreen_widgets_grabbing.patch +++ b/debian/patches/016_no_offscreen_widgets_grabbing.patch @@ -3,11 +3,11 @@ Author: Cody Russell Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607668 Bug-Ubuntu: https://bugs.launchpad.net/bugs/512427 -Index: gtk+-3.5.18/gtk/gtkmain.c +Index: gtk+-3.6.3/gtk/gtkmain.c =================================================================== ---- gtk+-3.5.18.orig/gtk/gtkmain.c 2012-09-19 03:34:42.000000000 +1200 -+++ gtk+-3.5.18/gtk/gtkmain.c 2012-09-19 12:16:53.696728253 +1200 -@@ -2046,9 +2046,14 @@ +--- gtk+-3.6.3.orig/gtk/gtkmain.c 2013-01-04 21:43:29.888428374 +0100 ++++ gtk+-3.6.3/gtk/gtkmain.c 2013-01-04 21:43:29.884428334 +0100 +@@ -2043,9 +2043,14 @@ { GtkWindowGroup *group; GtkWidget *old_grab_widget; diff --git a/debian/patches/017_no_offscreen_device_grabbing.patch b/debian/patches/017_no_offscreen_device_grabbing.patch old mode 100644 new mode 100755 index 4ea78fd521..fab1433aac --- a/debian/patches/017_no_offscreen_device_grabbing.patch +++ b/debian/patches/017_no_offscreen_device_grabbing.patch @@ -3,11 +3,11 @@ Author: Robert Carr Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658563 Bug-Ubuntu: https://launchpad.net/bugs/804009 -Index: gtk+-3.5.18/gtk/gtkmain.c +Index: gtk+-3.6.3/gtk/gtkmain.c =================================================================== ---- gtk+-3.5.18.orig/gtk/gtkmain.c 2012-09-19 12:16:53.696728253 +1200 -+++ gtk+-3.5.18/gtk/gtkmain.c 2012-09-19 12:16:57.224728130 +1200 -@@ -2139,9 +2139,14 @@ +--- gtk+-3.6.3.orig/gtk/gtkmain.c 2013-01-04 21:43:32.392453591 +0100 ++++ gtk+-3.6.3/gtk/gtkmain.c 2013-01-04 21:43:32.388453550 +0100 +@@ -2136,9 +2136,14 @@ { GtkWindowGroup *group; GtkWidget *old_grab_widget; diff --git a/debian/patches/071_fix-installation-of-HTML-images.patch b/debian/patches/071_fix-installation-of-HTML-images.patch old mode 100644 new mode 100755 index 8aa65c1285..d2ca6b3e6e --- a/debian/patches/071_fix-installation-of-HTML-images.patch +++ b/debian/patches/071_fix-installation-of-HTML-images.patch @@ -11,11 +11,11 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656803 gtk-doc.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: gtk+-3.4.1/gtk-doc.make +Index: gtk+-3.6.3/gtk-doc.make =================================================================== ---- gtk+-3.4.1.orig/gtk-doc.make 2012-04-10 00:52:46.000000000 +0200 -+++ gtk+-3.4.1/gtk-doc.make 2012-04-17 19:22:04.294590580 +0200 -@@ -155,8 +155,8 @@ +--- gtk+-3.6.3.orig/gtk-doc.make 2013-01-04 21:43:41.152541801 +0100 ++++ gtk+-3.6.3/gtk-doc.make 2013-01-04 21:43:41.148541763 +0100 +@@ -173,8 +173,8 @@ if test -f $(abs_srcdir)/$$file ; then \ cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ fi; \ @@ -25,4 +25,4 @@ Index: gtk+-3.4.1/gtk-doc.make + cp $$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)