[Pkg-cli-apps-commits] [gnome-do-plugins] 02/05: Drop WindowManager plugin.

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to branch master
in repository gnome-do-plugins.

commit a8446cad0c253311404c32ba71f4338531a74f35
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Thu Nov 12 13:10:57 2015 +1100

    Drop WindowManager plugin.
    
    This requires the WNCK bindings from gnome-desktop-sharp2, which has been removed.
    
    Closes: 798874
---
 debian/control                                        |  2 --
 ...rop-mandatory-gnome-desktop-sharp-dependency.patch | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index cdf37bb..97a9677 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,6 @@ Build-Depends-Indep:
   libgtk2.0-cil-dev,
   libglade2.0-cil-dev,
   libgnome-keyring1.0-cil-dev,
-  libgnomedesktop2.0-cil-dev,
   libgconf2.0-cil-dev,
   libgnome2.0-cil-dev,
   libgnome-vfs2.0-cil-dev,
@@ -29,7 +28,6 @@ Build-Depends-Indep:
   libdbus2.0-cil-dev,
   libdbus-glib2.0-cil-dev,
   libnotify-cil-dev,
-  libwnck1.0-cil-dev,
   libgdata-cil-dev,
   libnewtonsoft-json-cil-dev,
 Standards-Version: 3.9.3
diff --git a/debian/patches/drop-mandatory-gnome-desktop-sharp-dependency.patch b/debian/patches/drop-mandatory-gnome-desktop-sharp-dependency.patch
new file mode 100644
index 0000000..850baf8
--- /dev/null
+++ b/debian/patches/drop-mandatory-gnome-desktop-sharp-dependency.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -193,7 +193,7 @@
+ 	enable_wnck=auto)
+ 
+ if test "x$enable_wnck" != "xno"; then
+-   	PKG_CHECK_MODULES([WNCK_SHARP_10], [wnck-sharp-1.0], HAVE_WNCK=yes, HAVE_WNCK=no)
++   	PKG_CHECK_MODULES([WNCK_SHARP_10], [wnck-sharp-1.0 gnome-desktop-sharp-2.0], HAVE_WNCK=yes, HAVE_WNCK=no)
+ 
+ 	if test "x$enable_wnck" = "xyes" -a "x$HAVE_WNCK" = "no"; then
+    		AC_MSG_ERROR([Window manager support explicitly requested but dependencies not found])
+@@ -259,7 +259,6 @@
+ PKG_CHECK_MODULES([GCONF_SHARP_20], [gconf-sharp-2.0])
+ PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0])
+ PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
+-PKG_CHECK_MODULES([GNOME_DESKTOP_SHARP_20], [gnome-desktop-sharp-2.0])
+ PKG_CHECK_MODULES([GNOME_KEYRING_SHARP], [gnome-keyring-sharp-1.0])
+ PKG_CHECK_MODULES([GNOME_SHARP_20], [gnome-sharp-2.0])
+ PKG_CHECK_MODULES([GNOME_VFS_SHARP_20], [gnome-vfs-sharp-2.0])
diff --git a/debian/patches/series b/debian/patches/series
index 2eca9d7..db3781e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 01_firefox_iceweasel_rename.patch
 use_dbussharp_2.patch
 Drop-outdated-urls.patch
+drop-mandatory-gnome-desktop-sharp-dependency.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/gnome-do-plugins.git