debian/changelog | 11 +++++++++-- debian/control | 2 +- debian/patches/020_disable_gdk_gtk_disable_deprecated | 18 ++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 29 insertions(+), 3 deletions(-)
New commits: commit 3bbbf5347a4512a8ab22ca85b1d5aea4cc9ebf4c Author: Cyril Brulebois <[email protected]> Date: Thu Apr 15 03:29:39 2010 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 671b9e3..28ae494 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -compiz (0.8.4-3) UNRELEASED; urgency=high +compiz (0.8.4-3) unstable; urgency=high [ Brice Goglin ] * Remove Thierry Reding from Uploaders, closes: #572540. @@ -9,7 +9,7 @@ compiz (0.8.4-3) UNRELEASED; urgency=high * Add myself to Uploaders. * Set urgency to high due to RC bugfix. - -- Brice Goglin <[email protected]> Sun, 07 Mar 2010 12:37:03 +0100 + -- Cyril Brulebois <[email protected]> Thu, 15 Apr 2010 03:29:29 +0200 compiz (0.8.4-2) unstable; urgency=low commit 3a3c9072efca5344193e028ae83ae20eb931f12e Author: Cyril Brulebois <[email protected]> Date: Thu Apr 15 03:26:26 2010 +0200 Set urgency to high due to RC bugfix. diff --git a/debian/changelog b/debian/changelog index db31eb2..671b9e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -compiz (0.8.4-3) UNRELEASED; urgency=low +compiz (0.8.4-3) UNRELEASED; urgency=high [ Brice Goglin ] * Remove Thierry Reding from Uploaders, closes: #572540. @@ -7,6 +7,7 @@ compiz (0.8.4-3) UNRELEASED; urgency=low * Add patch to prevent FTBFS due to deprecated GDK/GTK stuff: * 020_disable_gdk_gtk_disable_deprecated (Closes: #577352). * Add myself to Uploaders. + * Set urgency to high due to RC bugfix. -- Brice Goglin <[email protected]> Sun, 07 Mar 2010 12:37:03 +0100 commit 30aad9a4499d11ca5124990cc5244460094b864c Author: Cyril Brulebois <[email protected]> Date: Thu Apr 15 03:25:21 2010 +0200 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index 58984c1..db31eb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ compiz (0.8.4-3) UNRELEASED; urgency=low [ Cyril Brulebois ] * Add patch to prevent FTBFS due to deprecated GDK/GTK stuff: * 020_disable_gdk_gtk_disable_deprecated (Closes: #577352). + * Add myself to Uploaders. -- Brice Goglin <[email protected]> Sun, 07 Mar 2010 12:37:03 +0100 diff --git a/debian/control b/debian/control index 5fa12b7..abf4d1e 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: compiz Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Sean Finney <[email protected]> +Uploaders: David Nusinow <[email protected]>, Sean Finney <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: autoconf, automake1.9, autotools-dev, debhelper (>= 5), intltool, kdebase-workspace-dev, commit cccf8adf40f67b6383aeac09455d7756037b7981 Author: Cyril Brulebois <[email protected]> Date: Thu Apr 15 03:21:57 2010 +0200 Add patch to prevent FTBFS due to deprecated GDK/GTK stuff (Closes: #577352). diff --git a/debian/changelog b/debian/changelog index c751119..58984c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ compiz (0.8.4-3) UNRELEASED; urgency=low + [ Brice Goglin ] * Remove Thierry Reding from Uploaders, closes: #572540. + [ Cyril Brulebois ] + * Add patch to prevent FTBFS due to deprecated GDK/GTK stuff: + * 020_disable_gdk_gtk_disable_deprecated (Closes: #577352). + -- Brice Goglin <[email protected]> Sun, 07 Mar 2010 12:37:03 +0100 compiz (0.8.4-2) unstable; urgency=low diff --git a/debian/patches/020_disable_gdk_gtk_disable_deprecated b/debian/patches/020_disable_gdk_gtk_disable_deprecated new file mode 100644 index 0000000..6b35d6e --- /dev/null +++ b/debian/patches/020_disable_gdk_gtk_disable_deprecated @@ -0,0 +1,18 @@ +Stop breaking on deprecated GTK_WIDGET_VISIBLE. +--- a/gtk/window-decorator/gtk-window-decorator.c ++++ b/gtk/window-decorator/gtk-window-decorator.c +@@ -31,14 +31,6 @@ + #include <X11/extensions/Xrender.h> + #include <X11/Xregion.h> + +-#ifndef GDK_DISABLE_DEPRECATED +-#define GDK_DISABLE_DEPRECATED +-#endif +- +-#ifndef GTK_DISABLE_DEPRECATED +-#define GTK_DISABLE_DEPRECATED +-#endif +- + #include <gtk/gtk.h> + #include <gdk/gdkx.h> + #include <glib/gi18n.h> diff --git a/debian/patches/series b/debian/patches/series index a6b4d8e..0264081 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,7 @@ 012_snap-by-default.patch 014_fix-no-border-window-shadow.patch 015_optional-fbo.patch +020_disable_gdk_gtk_disable_deprecated # the following patches are imported from the ubuntu compiz packages 010-disable-child-window-clipping.patch 013-add-cursor-theme-support.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
