r13495 - in /desktop/unstable/nautilus/debian: changelog control control.in patches/21_nautilus_xmp.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Mon Nov 19 13:13:09 2007
New Revision: 13495

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13495
Log:
* debian/patches/21_nautilus_xmp.patch,
  debian/control.in:
  + Build against exempi 1.99.5. Patch by Michael Biebl. (Closes: #450486)

Added:
    desktop/unstable/nautilus/debian/patches/21_nautilus_xmp.patch
Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/control
    desktop/unstable/nautilus/debian/control.in

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=13495&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Mon Nov 19 13:13:09 2007
@@ -1,3 +1,11 @@
+nautilus (2.20.0-3) unstable; urgency=low
+
+  * debian/patches/21_nautilus_xmp.patch,
+    debian/control.in:
+    + Build against exempi 1.99.5. Patch by Michael Biebl. (Closes: #450486)
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 19 Nov 2007 14:10:18 +0100
+
 nautilus (2.20.0-2) unstable; urgency=high
 
   * Build-dep against libglib2.0-dev >= 2.14; fixes crashes when mixing the

Modified: desktop/unstable/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control?rev=13495&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control (original)
+++ desktop/unstable/nautilus/debian/control Mon Nov 19 13:13:09 2007
@@ -33,9 +33,9 @@
                libgnome2-dev (>= 2.14.0),
                libpango1.0-dev (>= 1.1.2),
                x11proto-core-dev,
-	       libtrackerclient-dev (>= 0.0.1),
-	       libexempi-dev (>= 1.99.2),
-	       intltool (>= 0.35.0)
+               libtrackerclient-dev (>= 0.0.1),
+               libexempi-dev (>= 1.99.5),
+               intltool (>= 0.35.0)
 Standards-Version: 3.7.2
 
 Package: nautilus

Modified: desktop/unstable/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control.in?rev=13495&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control.in (original)
+++ desktop/unstable/nautilus/debian/control.in Mon Nov 19 13:13:09 2007
@@ -33,9 +33,9 @@
                libgnome2-dev (>= 2.14.0),
                libpango1.0-dev (>= 1.1.2),
                x11proto-core-dev,
-	       libtrackerclient-dev (>= 0.0.1),
-	       libexempi-dev (>= 1.99.2),
-	       intltool (>= 0.35.0)
+               libtrackerclient-dev (>= 0.0.1),
+               libexempi-dev (>= 1.99.5),
+               intltool (>= 0.35.0)
 Standards-Version: 3.7.2
 
 Package: nautilus

Added: desktop/unstable/nautilus/debian/patches/21_nautilus_xmp.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/21_nautilus_xmp.patch?rev=13495&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/21_nautilus_xmp.patch (added)
+++ desktop/unstable/nautilus/debian/patches/21_nautilus_xmp.patch Mon Nov 19 13:13:09 2007
@@ -1,0 +1,13 @@
+diff --git a/src/nautilus-image-properties-page.c b/src/nautilus-image-properties-page.c
+index 8744103..56120ed 100644
+--- a/src/nautilus-image-properties-page.c
++++ b/src/nautilus-image-properties-page.c
+@@ -266,7 +266,7 @@ append_xmp_value_pair(GString *string, XmpPtr xmp, const char * ns, const char *
+ {
+ 	uint32_t options;
+ 	XmpStringPtr  value = xmp_string_new();
+-	if(xmp_get_property_and_bits(xmp, ns, propname, value, &options)) {
++	if(xmp_get_property(xmp, ns, propname, value, &options)) {
+ 		if(XMP_IS_PROP_SIMPLE(options)) {
+ 			g_string_append_printf(string, "<b>%s:</b> %s\n", descr, xmp_string_cstr(value));
+ 		}