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

Mike Gabriel sunweaver at moszumanska.debian.org
Thu Apr 10 17:57:41 UTC 2014


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

The following commit has been merged in the master branch:
commit d56459c60ad3c5e0696020e66381a7dddcfe5d95
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Apr 10 19:54:32 2014 +0200

    debian/patches: Add 1001_fix-pkgconfig.patch. Fix dependency specifications for mate-desktop-2.0-pc. (Closes: #744086).
---
 debian/patches/1001_fix-pkgconfig.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/1001_fix-pkgconfig.patch b/debian/patches/1001_fix-pkgconfig.patch
new file mode 100644
index 0000000..3d68a36
--- /dev/null
+++ b/debian/patches/1001_fix-pkgconfig.patch
@@ -0,0 +1,32 @@
+Description: mate-desktop-2.0.pc: Fix dependency specifications
+Author: Aaron M. Ucko <ucko at debian.org>
+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 c97dc73..2bf66e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 2001_omit-gfdl-licensed-user-guide.patch
+1001_fix-pkgconfig.patch

-- 
mate-desktop Debian package



More information about the pkg-mate-commits mailing list