[marco] 03/10: Drop 0004_dont-switch-workspace-when-switching-to-sticky-window.patch. Applied upstream.

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository marco.

commit 341f7a3dac819f4d98b6b0914af58828525f4c5b
Author: Martin Wimpress <code at flexion.org>
Date:   Thu Jun 11 17:23:07 2015 +0100

    Drop 0004_dont-switch-workspace-when-switching-to-sticky-window.patch. Applied upstream.
---
 debian/changelog      | 12 ++++++++++++
 debian/patches/series |  1 -
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4e3fb45..af98bbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+marco (1.10.0-1+dfsg1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/patches:
+    + Drop 0004_dont-switch-workspace-when-switching-to-sticky-window.patch.
+    Applied upstream.
+  * debian/rules:
+    + Remove obsolete --disable-scrollkeeper
+    + Add --with-gtk=2.0
+
+ -- Martin Wimpress <martin at flexion.org>  Wed, 10 Jun 2015 05:09:47 +0100
+
 marco (1.8.3+dfsg1-4) unstable; urgency=medium
 
   * Re-upload to unstable.
diff --git a/debian/patches/series b/debian/patches/series
index 8117ac3..32ad0c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0004_dont-switch-workspace-when-switching-to-sticky-window.patch
 0006_correct-name-for-missing-icon.patch
 0007_correct-name-for-missing-icon-in-preview-widget.patch
 0008_glib243-keybindings-notifications-fix.patch

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