[SCM] mate-desktop Debian package branch, master, updated. debian/1.8.0+dfsg1-5-5-g4de5fdb

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-desktop.git;a=commitdiff;h=52e02c9

The following commit has been merged in the master branch:
commit 52e02c95f42fcae38407e51041ef9925918822ec
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 18 23:35:12 2014 +0200

    debian/patches: Drop 1001_fix-pkgconfig.patch. Applied upstream.
---
 debian/patches/1001_fix-pkgconfig.patch | 33 ---------------------------------
 debian/patches/series                   |  1 -
 2 files changed, 34 deletions(-)

diff --git a/debian/patches/1001_fix-pkgconfig.patch b/debian/patches/1001_fix-pkgconfig.patch
deleted file mode 100644
index 4405276..0000000
--- a/debian/patches/1001_fix-pkgconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: mate-desktop-2.0.pc: Fix dependency specifications
-Author: Aaron M. Ucko <ucko at debian.org>
-Forwarded: https://github.com/mate-desktop/mate-desktop/issues/108
-Abstract:
- As it stands, mate-desktop-2.0.pc specifies
- .
-   Requires: gtk+-2.0 libstartup-notification-1.0 dconf
- .
- but libmate-desktop-dev's only -dev dependency is on
- libstartup-notification0-dev; this discrepancy makes eom FTBFS.
- .
- Judging by its headers' #include directives, I'd suggest specifying
- .
-   Requires: gdk-pixbuf-2.0 gtk+-2.0
-   Requires.private: dconf libstartup-notification-1.0
- .
- and
- .
-   Depends: ${misc:Depends}, libmate-desktop-2-17 (= ${binary:Version}),
-            libgdk-pixbuf2.0-dev, libgtk2.0-dev
-
---- a/libmate-desktop/mate-desktop-2.0.pc.in
-+++ b/libmate-desktop/mate-desktop-2.0.pc.in
-@@ -5,7 +5,8 @@
- 
- Name: mate-desktop-2.0
- Description: Utility library for loading .desktop files
--Requires: gtk+- at GTK_API_VERSION@ @STARTUP_NOTIFICATION_PACKAGE@ dconf
-+Requires: gdk-pixbuf- at GTK_API_VERSION@ gtk+- at GTK_API_VERSION@
-+Requires.private: dconf @STARTUP_NOTIFICATION_PACKAGE@
- Version: @VERSION@
- Libs: -L${libdir} -lmate-desktop-2
- Cflags: -I${includedir}/mate-desktop-2.0
diff --git a/debian/patches/series b/debian/patches/series
index 2bf66e1..c97dc73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 2001_omit-gfdl-licensed-user-guide.patch
-1001_fix-pkgconfig.patch

-- 
mate-desktop Debian package