[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=f7ebfea

The following commit has been merged in the master branch:
commit f7ebfea8e7a02908c77cf5e8e6db429b23946513
Author: asp <alan.pater at gmail.com>
Date:   Sun Apr 26 22:51:37 2015 +0000

    #1061 manpage: reg namespace example, description amplification
---
 config/Doxyfile |  4 +++-
 src/exiv2.1     | 18 ++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/config/Doxyfile b/config/Doxyfile
index eec701d..374de91 100644
--- a/config/Doxyfile
+++ b/config/Doxyfile
@@ -700,8 +700,10 @@ RECURSIVE              = NO
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = ../src/getopt_win32.c \
+EXCLUDE                = ../include/exiv2/Jzon.h \
+                         ../src/getopt_win32.c \
                          ../src/getopt_win32.h \
+                         ../src/Jzon.cpp \
                          ../src/localtime.c \
                          ../src/private.h \
                          ../src/timegm.h \
diff --git a/src/exiv2.1 b/src/exiv2.1
index 562f4b5..343eec2 100644
--- a/src/exiv2.1
+++ b/src/exiv2.1
@@ -28,8 +28,13 @@ exiv2 \- Image metadata manipulation tool
 .\" 
I<whatever>
P escape sequences to invode bold face and italics,
 .\" respectively.
 .B exiv2
-is a program to read and write Exif, IPTC and XMP image metadata and
-image comments. The following image formats are supported:
+is a program to read and write Exif, IPTC, XMP metadata and
+image comments and can read many vendor makernote tags. The program 
+optionally converts between Exif tags, XMP properties and IPTC
+datasets as recommended by the Exif Standard, the IPTC Standard,
+the XMP specification and Metadata Working Group guidelines.
+.br
+The following image formats are supported:
 .TS
 lB lB lB lB lB
 _	_	_	_	_
@@ -441,7 +446,12 @@ or given on the command line, as in
    exiv2 \-M"add Iptc.Application2.Credit String Mr. Smith" image.jpg
 .fi
 .sp 1
-Note the quotes. Multiple 
B\-m
P and 
B\-M
P options can be combined.
+Note the quotes. Multiple 
B\-m
P and 
B\-M
P options can be combined,
+and a non-standard XMP namespace registered.
+.sp 1
+.nf
+   exiv2 \-M"reg myprefix http://ns.myprefix.me/" \-M"add Xmp.myprefix.Whom Mr. Smith" \-M"set Exif.Image.Artist Mr. Smith" image.jpg
+.fi
 .sp 1
 When writing Exif, IPTC and XMP metadata,
 .B exiv2
@@ -564,7 +574,7 @@ To remove all language specifications, delete the key:
 .br
     exiv2 -M'del Xmp.dc.title' X.jpg
 .TP
-An additional command is available to register XMP namespaces:
+To register additional XMP namespaces, combine the command with:
 .TP
 .nf
 
Breg
P 
Iprefix
P 
Inamespace
P

-- 
exiv2 packaging