[brisk-menu] 01/03: debian/control: Update Build-Depends: to support meson.

[Vangelis Mouhtsis]

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

gnugr-guest pushed a commit to branch parrot/3.7
in repository brisk-menu.

commit e109c0a511b58512d1e1140d6388ef54a20aabf9
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Tue Nov 14 16:35:24 2017 +0000

    debian/control: Update Build-Depends: to support meson.
    
    	debian/control
    	.git/CHERRY_PICK_HEAD
    
    	modified:   debian/control
---
 debian/control | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 053fb7f..6cf92b1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,20 @@ Priority: optional
 Maintainer: MATE Packaging Team <pkg-mate-team at lists.alioth.debian.org>
 Uploaders: Martin Wimpress <code at flexion.org>,
            Mike Gabriel <sunweaver at debian.org>,
+<<<<<<< HEAD
 Build-Depends: autotools-dev,
                cdbs,
                debhelper (>= 10.3~),
+=======
+Build-Depends: debhelper (>= 10),
+>>>>>>> 780720f... debian/control: Update Build-Depends: to support meson.
                dpkg-dev (>= 1.16.1.1),
                libglib2.0-dev,
                libgtk-3-dev (>= 3.14),
                libmate-menu-dev (>= 1.16.0),
                libmate-panel-applet-dev (>= 1.16.0),
+               meson,
+               ninja-build,
                pkg-config,
 Standards-Version: 4.0.0
 Homepage: http://www.mate-desktop.org/
@@ -31,4 +37,4 @@ Description: Solus Project's Brisk Menu MATE Panel Applet
  .
  Brisk Menu is a modern desktop menu for the MATE Desktop Environment
  providing the MATE Desktop with a first-class application and system
- menu applet. 
+ menu applet.

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