[SCM] marco Debian package branch, master, updated. debian/1.8.0+dfsg1-1-8-g8603691

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/marco.git;a=commitdiff;h=4648535

The following commit has been merged in the master branch:
commit 46485356ff3fea0fef8c76c673e34759fda55977
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Mar 19 11:11:49 2014 +0100

    debian/patches: Add patch 0001_use-zenity-instead-of-mate-dialogs.patch. Use zenity instead of mate-dialogs.
---
 debian/control                                     |  4 +--
 .../0001_use-zenity-instead-of-mate-dialogs.patch  | 34 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 9361d61..412340d 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Build-Depends: debhelper (>= 9),
                libsm-dev,
                libice-dev,
                yelp-tools,
-               mate-dialogs,
+               zenity,
 Standards-Version: 3.9.5
 Homepage: http://www.mate-desktop.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-mate/marco.git;a=summary
@@ -37,7 +37,7 @@ Package: marco
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         mate-dialogs,
+         zenity,
          marco-common (= ${source:Version}),
          libmarco-private0 (= ${binary:Version}),
 Breaks: mate-window-manager (<= 1.0.0-2)
diff --git a/debian/patches/0001_use-zenity-instead-of-mate-dialogs.patch b/debian/patches/0001_use-zenity-instead-of-mate-dialogs.patch
new file mode 100644
index 0000000..4704926
--- /dev/null
+++ b/debian/patches/0001_use-zenity-instead-of-mate-dialogs.patch
@@ -0,0 +1,34 @@
+Description: Use zenity instead of mate-dialogs
+Author: Stefano Karapetsas <stefano at karapetsas.com>
+Origin: vendor, http://git.mate-desktop.org/marco/patch/?id=22cec78be5c7a3887e695e9a787fc462102e0509
+---
+diff --git a/configure.ac b/configure.ac
+index 938cf13..76fe288 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -489,9 +489,9 @@ fi
+ 
+ AC_SUBST(GDK_PIXBUF_CSOURCE)
+ 
+-AC_PATH_PROG(MATEDIALOG, matedialog, no)
+-if test x"$MATEDIALOG" = xno; then
+-  AC_MSG_ERROR([matedialog not found in your path - needed for dialogs])
++AC_PATH_PROG(ZENITY, matedialog, no)
++if test x"$ZENITY" = xno; then
++  AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
+ fi
+ 
+ AC_ARG_ENABLE(debug,
+diff --git a/src/core/util.c b/src/core/util.c
+index 9b29d2d..ac72100 100644
+--- a/src/core/util.c
++++ b/src/core/util.c
+@@ -559,7 +559,7 @@ meta_show_dialog (const char *type,
+                                  g_slist_length (columns)*2 +
+                                  g_slist_length (entries)));
+ 
+-  argvl[i++] = "matedialog";
++  argvl[i++] = "zenity";
+   argvl[i++] = type;
+   argvl[i++] = "--screen";
+   argvl[i++] = screen_number_text;
diff --git a/debian/patches/series b/debian/patches/series
index f4933e5..d3bb327 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+0001_use-zenity-instead-of-mate-dialogs.patch
 2001_omit-gfdl-licensed-theme-documentation.patch

-- 
marco Debian package