[marco] 01/02: Merge branch 'debian/experimental'

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository marco.

commit 5c16a916f57975f90f48fa1f1d127434633763f0
Merge: 760e4c3 7d3e111
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 24 17:20:51 2015 +0200

    Merge branch 'debian/experimental'
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

 debian/changelog                                   |  46 ++++++++-
 debian/control                                     |  73 +++++++-------
 debian/copyright                                   |   4 +-
 debian/libmarco-dev.install                        |   2 +-
 debian/marco-common.install                        |   5 +-
 ...workspace-when-switching-to-sticky-window.patch |  40 --------
 .../0006_correct-name-for-missing-icon.patch       |  32 -------
 ...t-name-for-missing-icon-in-preview-widget.patch |  39 --------
 ...008_glib243-keybindings-notifications-fix.patch | 106 ---------------------
 ...x-notifications-of-workspace-name-changes.patch |  25 -----
 ...01_omit-gfdl-licensed-theme-documentation.patch |  20 ----
 debian/patches/series                              |   6 --
 debian/rules                                       |  31 +-----
 debian/watch                                       |   1 -
 14 files changed, 91 insertions(+), 339 deletions(-)

diff --cc debian/changelog
index 4e3fb45,63ac4b4..f151d73
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,47 +1,47 @@@
+ marco (1.10.2-1) UNRELEASED; urgency=low
+ 
+   * New upstream release.
+   * debian/patches/2001_omit-gfdl-licensed-theme-documentation.patch:
 -    + Remove because Marco documentation is dfsg compliant.
++    + Remove because Marco documentation is DFSG compliant.
+   * debian/marco-common.install:
+     + Add usr/share/help.
+   * debian/rules:
 -    + Remove dfsg suffix.
++    + Remove +dfsg1 suffix.
+   * debian/watch:
 -    + Remove dfsg suffix.
++    + Remove +dfsg1 suffix.
+   * debian/copyright:
+     + Update copyright attributions.
+ 
+  -- Martin Wimpress <code at flexion.org>  wed, 29 Jul 2015 16:16:16 +0100
+ 
+ marco (1.10.1+dfsg1-1~exp1) experimental; urgency=low
+ 
+   [ Martin Wimpress ]
+   * New upstream release.
+   * debian/patches:
+     + Drop 0004_dont-switch-workspace-when-switching-to-sticky-window.patch.
+     Applied upstream.
+     + Drop 0006_correct-name-for-missing-icon.patch. Applied upstream.
+     + Drop 0007_correct-name-for-missing-icon-in-preview-widget.patch.
+     Applied upstream.
+     + Drop 0009_fix-notifications-of-workspace-name-changes.patch. Applied
+     upstream.
+   * debian/rules:
+     + Remove obsolete --disable-scrollkeeper
+     + Add --with-gtk=2.0
+ 
+   [ Mike Gabriel ]
+   * debian/control:
+     + Versioned D: mate-common (>= 1.10).
+   * debian/patches:
+     + Drop 0008_glib243-keybindings-notifications-fix.patch. Applied upsream.
+   * debian/rules:
+     + Create orig tarball in ../ instead of $(CURDIR).
+   * debian/copyright:
+     + Drop src/ui/themewidget.{c,h}, not present anymore.
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Tue, 16 Jun 2015 04:28:53 +0200
+ 
  marco (1.8.3+dfsg1-4) unstable; urgency=medium
  
    * Re-upload to unstable.

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