[brisk-menu] 01/01: debian/changelog: upload to parrot/testing (parrot/0.5.0-0parrot1).

[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 b223f1066ebe07e4e65a1dfb10f633a8956eb20d
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date:   Thu Nov 16 13:18:11 2017 +0200

    debian/changelog: upload to parrot/testing (parrot/0.5.0-0parrot1).
---
 debian/changelog | 20 ++++++++++++++++++++
 debian/control   |  6 ------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bba2731..b3f640f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+brisk-menu (0.5.0-0parrot1) testing; urgency=medium
+
+  [ Martin Wimpress ]
+  * New upstream release.
+  * debian/control:
+    + Add B-D: libnotify-dev.
+    + Update Build-Depends: to support meson.
+  * debian/rules:
+    + Migrate to Meson.
+
+  [ Mike Gabriel ]
+  * debian/control:
+    + Bump Standards-Version: to 4.1.1. No changes needed.
+  * debian/copyright:
+    + Refresh autogenerated copyright.in file.
+    + Update copyright attributions.
+
+-- Vangelis Mouhtsis <vangelis at gnugr.org> Thu, 16 Nov 2017 08:52:30 +0300
+
 brisk-menu (0.4.5-1) UNRELEASED; urgency=medium
 
   [ Martin Wimpress ]
@@ -13,6 +32,7 @@ brisk-menu (0.4.5-1) UNRELEASED; urgency=medium
     + Bump Standards-Version: to 4.0.0. No changes needed.
   * debian/rules:
     + Add new block for DEB_DH_MISSING_ARGS.
+  *
 
  -- Vangelis Mouhtsis <vangelis at gnugr.org>  Mon, 10 Jul 2017 10:48:43 +0300
 
diff --git a/debian/control b/debian/control
index 02e7cda..52b1e49 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,7 @@ 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),

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