[SCM] eom Debian package branch, master, updated. debian/1.8.0+dfsg1-2-7-geeb382f

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/eom.git;a=commitdiff;h=9ba7c05

The following commit has been merged in the master branch:
commit 9ba7c05500607310f738807ecb893bf6c8216073
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jun 4 01:12:47 2014 +0200

    Revert "debian/patches: Add 1002_missing-HAVE_DBUG-causing-type-conflict.patch. Resolve type conflict caused by missing HAVE_DBUS definition (as suggested by Michael Tautschnig)."
    
    This reverts commit efc3cf736a32e7064b33c2956639f6f60cf2e7c9.
---
 .../1002_missing-HAVE_DBUG-causing-type-conflict.patch       | 12 ------------
 debian/patches/series                                        |  1 -
 2 files changed, 13 deletions(-)

diff --git a/debian/patches/1002_missing-HAVE_DBUG-causing-type-conflict.patch b/debian/patches/1002_missing-HAVE_DBUG-causing-type-conflict.patch
deleted file mode 100644
index 950a7f9..0000000
--- a/debian/patches/1002_missing-HAVE_DBUG-causing-type-conflict.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Resolving type conflict caused by missing HAVE_DBUS definition
-Author: Michael Tautschnig <mt at debian.org>
---- a/bindings/python/eom.override
-+++ b/bindings/python/eom.override
-@@ -1,6 +1,7 @@
- %%
- headers
- #define NO_IMPORT
-+#include "config.h"
- #include "pygobject.h"
- #include <pygtk/pygtk.h>
- 
diff --git a/debian/patches/series b/debian/patches/series
index 13ad4df..057f77c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 1001_fix-hyphens-on-man-page.patch
-1002_missing-HAVE_DBUG-causing-type-conflict.patch
 2001_omit-gfdl-licensed-help-files.patch

-- 
eom Debian package