[Pkg-cli-apps-commits] [monodevelop] 01/01: Merge branch 'master' into master-experimental

[Iain Lane]

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

laney pushed a commit to branch master-experimental
in repository monodevelop.

commit 56bc4ea94e1dab9f97f0ff35f8a3f37852a20574
Merge: 19879be d20876b
Author: Iain Lane <laney at debian.org>
Date:   Thu Jun 19 12:06:31 2014 +0100

    Merge branch 'master' into master-experimental

 debian/changelog                    | 15 ++++++++++
 debian/control                      |  2 +-
 debian/patches/no_libmetacity.patch | 59 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 4 files changed, 76 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 7b1aff4,c92d594..fc924e2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,18 +1,27 @@@
 +monodevelop (4.0.12+dfsg-3~exp1) experimental; urgency=medium
 +
 +  * [c665d03] Added debian/gbp.conf to not rely on uploader's ~/.gbp.conf for a
 +    consistent debian/changelog
 +  * [4877eb0] Rebuild against Mono 3.2 (from experimental)
 +  * [1cd3d45] Changed debian-branch to master-experimental in debian/gbp.conf
 +
 + -- Mirco Bauer <meebey at debian.org>  Tue, 21 Jan 2014 05:22:05 +0100
 +
+ monodevelop (4.0.12+dfsg-2.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload, with maintainer’s permission.
+ 
+   [ Mirco Bauer ]
+   * [c665d03] Added debian/gbp.conf to not rely on uploader's
+     ~/.gbp.conf for a consistent debian/changelog
+ 
+   [ Dmitry Shachnev ]
+   * [a426228] Build without libmetacity support (closes: #751597).
+     The current libmetacity code does not work anyway (as it relies on
+     removed gconf schema), and it is not compatible with Metacity 3.x.
+ 
+  -- Dmitry Shachnev <mitya57 at gmail.com>  Thu, 19 Jun 2014 12:48:20 +0400
+ 
  monodevelop (4.0.12+dfsg-2) unstable; urgency=low
  
    * [622568c] Use OS-provided Mono.Addins, not bundled project

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