[mate-user-share] 02/04: debian/patches: Drop 0001_build-use-correct-macros-to-fix-cross-build.patch. Applied upstream.

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch ubuntu/bionic
in repository mate-user-share.

commit 6f09a5d0e590814e267e36ac8a982c2bfef98f9b
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Thu Jan 25 21:50:00 2018 +0000

    debian/patches: Drop 0001_build-use-correct-macros-to-fix-cross-build.patch. Applied upstream.
---
 ...ild-use-correct-macros-to-fix-cross-build.patch | 50 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 51 deletions(-)

diff --git a/debian/patches/0001_build-use-correct-macros-to-fix-cross-build.patch b/debian/patches/0001_build-use-correct-macros-to-fix-cross-build.patch
deleted file mode 100644
index e49333a..0000000
--- a/debian/patches/0001_build-use-correct-macros-to-fix-cross-build.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4a48e270808eb51d40a071ba43d1e37433109142 Mon Sep 17 00:00:00 2001
-From: monsta <monsta at inbox.ru>
-Date: Sat, 13 Jan 2018 22:23:36 +0300
-Subject: [PATCH] build: use correct macros to fix cross-build
-
-patch by Helmut Grohne
-https://bugs.debian.org/886578
----
- configure.ac | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fe1d0a9..a2f6370 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,7 +24,7 @@ AC_PROG_MAKE_SET
- AM_DISABLE_STATIC
- AM_PROG_LIBTOOL
- AC_PATH_XTRA
--AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+PKG_PROG_PKG_CONFIG
- 
- AC_TYPE_PID_T
- AC_TYPE_SIGNAL
-@@ -53,13 +53,13 @@ AC_SUBST(HTTPD)
- 
- BLUETOOTH_PKG="mate-bluetooth-1.0 >= 1.2.0"
- AC_ARG_ENABLE(bluetooth, AS_HELP_STRING([--disable-bluetooth],[compile without bluetooth support]),,enable_bluetooth=no)
--if test "x$enable_bluetooth" = "xyes"; then
-+AS_IF([test "x$enable_bluetooth" = "xyes"],[
-  PKG_CHECK_MODULES(BLUETOOTH, $BLUETOOTH_PKG)
-  AC_DEFINE(HAVE_BLUETOOTH, 1, [Set to true if mate-bluetooth support is available])
--else
-+],[
-  BLUETOOTH_PKG=""
-  AC_MSG_WARN([Bluetooth support is disabled.])
--fi
-+])
- AM_CONDITIONAL(USE_BLUETOOTH, [test "$enable_bluetooth" = "yes"])
- 
- GLIB_REQUIRED_VERSION=2.36.0
-@@ -144,7 +144,7 @@ AC_ARG_WITH(cajadir,
- PKG_CHECK_MODULES(EXTENSION,
- 		   libcaja-extension >= 1.17.1 $BLUETOOTH_PKG)
- if test "${ac_with_cajadir}" = ""; then
--	ac_with_cajadir=`pkg-config --variable=extensiondir libcaja-extension`
-+	ac_with_cajadir=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
- fi
- AC_SUBST(CAJADIR)
- AC_MSG_NOTICE([installing caja plugin in ${ac_with_cajadir}])
diff --git a/debian/patches/series b/debian/patches/series
index 5a6dfe8..355bda0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001_build-use-correct-macros-to-fix-cross-build.patch
 1001_apache-config.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-user-share.git