--- exiv2-0.18.2.orig/debian/presubj +++ exiv2-0.18.2/debian/presubj @@ -0,0 +1,9 @@ +If you know that the bug you want to report is in the "upstream" +code then please file a bug report in the exiv2 bug tracking system +(on the web at http://dev.robotbattle.com/bugs/main_page.php). + +If you feel that the bug is one that other Debian users should +know about then you are welcome to file a report in the Debian BTS +as well. Please keep in mind, however, that managing bug reports +is part of the maintainers' workload. + --- exiv2-0.18.2.orig/debian/libexiv2-5.install +++ exiv2-0.18.2/debian/libexiv2-5.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/lib*.so.* --- exiv2-0.18.2.orig/debian/control +++ exiv2-0.18.2/debian/control @@ -0,0 +1,67 @@ +Source: exiv2 +Section: graphics +Priority: optional +Maintainer: Debian KDE Extras Team +Uploaders: KELEMEN Peter , Mark Purcell , Fathi Boudra +Build-Depends: debhelper (>= 7), quilt, chrpath, + autotools-dev, libexpat1-dev, zlib1g-dev, + libexpat1-dev, + doxygen, graphviz, python, xsltproc +Standards-Version: 3.8.2 +Homepage: http://www.exiv2.org +Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/exiv2/trunk +Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/exiv2/trunk + +Package: exiv2 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: EXIF/IPTC metadata manipulation tool + Exiv2 can: + . + * print the Exif metadata of JPEG, TIFF and several RAW image formats as + summary info, interpreted values, or the plain data for each tag + * print the IPTC metadata of JPEG images + * print, set and delete the JPEG comment of JPEG images + * set, add and delete Exif and IPTC metadata of JPEG images + * adjust the Exif timestamp (that's how it all started...) + * rename Exif image files according to the Exif timestamp + * extract, insert and delete Exif metadata, IPTC metadata and JPEG comments + * extract, insert and delete the thumbnail image embedded in the Exif metadata + * fix the Exif ISO setting of picture taken with Nikon cameras + +Package: libexiv2-5 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: exiv2 +Description: EXIF/IPTC metadata manipulation library + Exiv2 library supports: + * full read and write access to the EXIF and IPTC metadata of an image + through Exiv2 keys and standard C++ iterators + * a smart IPTC implementation that does not affect data that programs like + Photoshop store in the same image segment + * EXIF MakerNote support: + o MakerNote tags can be accessed just like any other EXIF metadata + o a sophisticated write algorithm avoids corrupting the MakerNote: + * extract and delete methods for EXIF thumbnails (both, JPEG and TIFF + thumbnails) + * set methods for EXIF thumbnails (JPEG only, TIFF thumbnails can be set from + individual tags) + * complete API documentation (by Doxygen) + * generic lower-level classes to access IFD (Image File Directory) data + structures + +Package: libexiv2-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, libexiv2-5 (= ${binary:Version}), pkg-config +Suggests: libexiv2-doc +Description: EXIF/IPTC metadata manipulation library - development files + Exiv2 C++ header files. + +Package: libexiv2-doc +Depends: ${misc:Depends} +Section: doc +Architecture: all +Description: EXIF/IPTC metadata manipulation library - HTML documentation + Exiv2 HTML documentation. --- exiv2-0.18.2.orig/debian/copyright +++ exiv2-0.18.2/debian/copyright @@ -0,0 +1,102 @@ +This package was debianized by KELEMEN Peter on +Wed, 8 Jun 2005 14:39:56 +0200. + +It was downloaded from http://www.exiv2.org + +Upstream Author: + + Andreas HUGGEL + +Copyright: + + (C) 2004-2008 Andreas Huggel + +Copyright for XMP sdk: + + (C) 2005-2007 Adobe Systems Incorporated + +Copyright for MD5 algorithm tcode: + + (C) 1991-2, RSA Data Security, Inc. + +exiv2 license: + + Exiv2 is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your + option) any later version. + + Alternatively, Exiv2 is also available with a commercial license, + which allows it to be used in closed-source projects. Contact me for + more information. + + Exiv2 is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +XMP sdk license: + + NOTICE: Adobe permits you to use, modify, and distribute this file in + accordance with the terms of the Adobe license agreement accompanying it. + +Copyright (c) 1999 - 2007, Adobe Systems Incorporated + +The BSD License + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +* Neither the name of Adobe Systems Incorporated, nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +MD5 algorithm license: + +Copyright (C) 1991-2, RSA Data Security, Inc. + +License to copy and use this software is granted provided that it is +identified as the "RSA Data Security, Inc. MD5 Message-Digest +Algorithm" in all material mentioning or referencing this software or +this function. + +License is also granted to make and use derivative works provided that +such works are identified as "derived from the RSA Data Security, +Inc. MD5 Message-Digest Algorithm" in all material mentioning or +referencing the derived work. + +RSA Data Security, Inc. makes no representations concerning either the +merchantability of this software or the suitability of this software +for any particular purpose. It is provided "as is" without express or +implied warranty of any kind. + +These notices must be retained in any copies of any part of this +documentation and/or software. + --- exiv2-0.18.2.orig/debian/changelog +++ exiv2-0.18.2/debian/changelog @@ -0,0 +1,341 @@ +exiv2 (0.18.2-1) unstable; urgency=low + + * New upstream release + + [Ryan Kavanagh] + + * Add lintian overrides: + - libexiv2-dev: extended-description-is-probably-too-short + * Fix a typo in README.Debian (s/enviroment/environment/) + * Fix hyphens as minus signs in the manpage, 00_hyphens_used_as_minus.diff + + [Fathi Boudra] + + * Bump Standards-Version from 3.8.1 to 3.8.2 (no changes needed) + * Add quilt build dependency + * Remove cdbs build dependency - use dh and rewrite debian/rules + + -- Fathi Boudra Thu, 09 Jul 2009 18:50:32 -0400 + +exiv2 (0.18.1-1) unstable; urgency=low + + * New upstream release + - (Closes: #525535): "[libexiv2-5] New upstream version 0.18.1" + - write-support for Adobe Photoshop PSD images + - read-support for Panasonic RW2 images + - Panasonic and Nikon makernote update + * Upload to unstable - discussed on debian-release + - libexiv2-5 library transition + * Fix: package-lacks-versioned-build-depends-on-debhelper + * Add ${misc:Depends} + + -- Mark Purcell Wed, 29 Apr 2009 21:53:40 +1000 + +exiv2 (0.18-1) experimental; urgency=low + + * New upstream release + - Closes: #426274 - "Setting "Exif.Image.DateTime Date" error" + - Closes: #505023 - "FTBFS with GCC 4.4: missing #include" + + -- Mark Purcell Fri, 19 Dec 2008 07:39:10 +1100 + +exiv2 (0.18~pre2-1) experimental; urgency=low + + * New upstream release + * NEW package libexiv2-5 - match upstream soname + * Update Standards Version 3.8.0 - no changes + + -- Mark Purcell Sat, 08 Nov 2008 10:46:51 +1100 + +exiv2 (0.17.1-1) unstable; urgency=medium + + * New upstream release + - Library transition cleared on debian-release/ d-d-a + * Version 0.17 also fixes: + - CVE-2008-2696: DoS via metadata in images (Closes: #486328) + - crashes when fed with wrong file (Closes: #485670) + * Urgency medium for CVE fix + * debian/patches/gcc4.3.diff unecessary for gcc-4.3 + * Add /usr/share/bug/exiv2/presubj message for reportbug(1) + + -- Mark Purcell Sat, 21 Jun 2008 08:23:53 +1000 + +exiv2 (0.17-1) experimental; urgency=low + + * New upstream release + * Switch to simple-patchsys.mk + * Refresh & merge gcc4.3 patches + * New Package: libexiv2-4 - soname bump + * Add Build-Depends: libexpat1-dev + * Upload to experimental to clear NEW processing + + -- Mark Purcell Tue, 10 Jun 2008 23:05:33 +1000 + +exiv2 (0.16-4) unstable; urgency=low + + [Ana Beatriz Guerrero Lopez] + + * Team upload to address FTBFS with GCC 4.3. + * Apply patch by Cyril Brulebois to fix FTBFS with GCC 4.3. + (Closes: #466901) + + -- Debian KDE Extras Team Sun, 23 Mar 2008 15:42:16 +0100 + +exiv2 (0.16-3) unstable; urgency=low + + * Remove Conflicts/Replaces libexiv2-0 for libexiv2-2. (Closes: #463852) + + -- Fathi Boudra Tue, 05 Feb 2008 00:52:35 +0100 + +exiv2 (0.16-2) unstable; urgency=low + + * Remove Conflicts/Replaces libexiv2-0 for libexiv2-2. (Closes: #463852) + + -- Fathi Boudra Mon, 04 Feb 2008 15:39:20 +0100 + +exiv2 (0.16-1) unstable; urgency=low + + * New upstream release (Closes: #441524, #455633, #461009) + * Remove patches, merged upstream: + * CVE-2007-6353 + * Rev 1124 pull + * Add 01_gcc4.3.diff patch. Missing std:: removal not merged upstream yet + * Bump compat to 6 + * Update copyright file + * Add myself in Uploaders field + * Clean up build dependencies: + * Remove g++ and dpkg-dev + * Add quilt and libexpat1-dev + * Bump debhelper to 6 + * Bump Standard-Version to 3.7.3 + * Use Homepage field + * Add Conflicts/Replaces libexiv2-0 for libexiv2-2 + * Clean up rules + * Add clean target (Closes: 442560) + * Build with --no-undefined and --as-needed linker flags + + -- Fathi Boudra Wed, 16 Jan 2008 09:17:08 +0100 + +exiv2 (0.15-2) unstable; urgency=high + + [Ana Beatriz Guerrero Lopez] + * Team upload to fix security bug. + * Add patch to fix integer overflow in EXIF parsing. + CVE-2007-6353 (Closes: #456760) + + -- Debian KDE Extras Team Mon, 17 Dec 2007 19:13:11 +0100 + +exiv2 (0.15-1) unstable; urgency=low + + * New upstream release + - maintenance release, support for Minolta G500 RAW files + + -- Mark Purcell Sun, 22 Jul 2007 12:20:57 +0100 + +exiv2 (0.14-2) unstable; urgency=medium + + * DebConf7 release :-) + * Urgency medium as this fixes a number of crashes in digikam et al + * Pull in upstream fixes for jpeg/tiff MSC makernote crashes + (rev 1106/1124) + + -- Mark Purcell Tue, 19 Jun 2007 12:55:55 +0100 + +exiv2 (0.14-1) unstable; urgency=low + + * new upstream release (Closes: #414372) + + [ Achim Bohnet ] + * 0.14 changed API: rename libexiv2-0.12 to libexiv2-0 accordingly. + * libexiv2-dev: exiv2 has no exiv2-config script anymore. + * debian/control: + + Etch does not have a libexiv2 package. So remove Replaces/Conflict. + + libexiv2-dev: No need to depend on ${shlibs:Depends}, ${misc:Depends} + * debian/exiv2.1 removed: included upstream. + * debian/libexiv2-0: install message catalogs + + [ Mark Purcell ] + * FTBFS with GCC 4.3: missing #includes (Closes: #417176) + * Build-Depends: doxygen, graphviz, python, xsltproc + * Reinstate libexiv2-doc, better to build with doxygen than other tarball + * Add build/libexiv2-doc:: to debian/rules + * Rework debian/libexiv2-dev.install + * Rework debian/libexiv2-doc.docs + * Rework debian/libexiv2-0.install + + -- Mark Purcell Wed, 09 May 2007 22:28:37 +0100 + +exiv2 (0.12-1) unstable; urgency=low + + * Maintainer: Debian KDE Extras Team + * Switch to cdbs + * Add debian/watch + * Ack NMU fix: + - library package needs to be renamed (libstdc++ allocator change) + (Closes: #339163) + + -- Mark Purcell Wed, 14 Mar 2007 08:12:49 +0000 + +exiv2 (0.10-1.4) unstable; urgency=high + + * Non-Maintainer upload. Again :-( + * High-urgency upload for RC bugfix + * Apply Steve Langasek patch to overcome crashes on invalid input + - Image with corrupted metadata crashes Exiv2 (Closes: #401660) + * Move usr/lib/*.la libtool linkage information file to -dev package + - file conflict with libexiv2-0.10 (Closes: #405805) + * Move usr/lib/*.so development linkage file to -dev package + * Include upstream exiv2.pc in -dev package + - exiv2.pc is missing (Closes: #396060) + * Add libexiv2-dev Depends: pkg-config + + -- Mark Purcell Sun, 21 Jan 2007 21:06:27 +0000 + +exiv2 (0.12-0.2) experimental; urgency=low + + * Non-maintainer upload. (NMU) + * Add Build-Depends: zlib1g-dev, thanks Kurt + - FTBFS: checking zlib in /usr... failed (Closes: #405916) + + -- Mark Purcell Sun, 7 Jan 2007 12:22:39 +0000 + +exiv2 (0.12-0.1) experimental; urgency=medium + + * Non-mantainer upload. (NMU) + * Urgency medium as this fixes RC bugs + * New upstream bugfix release + - Image with corrupted metadata crashes Exiv2 (Closes: #401660) + - new upstream release 0.12 (Closes: #389711) + * Include upstream exiv2.pc in debian package + - exiv2.pc is missing (Closes: #396060) + * Bump soname + - file conflict with libexiv2 (Closes: #386934) + + -- Mark Purcell Sat, 23 Dec 2006 18:42:30 +1100 + +exiv2 (0.10-1.3) unstable; urgency=low + + * NMU. + * debian/rules dh_makeshlibs -V (Closes: #386899) + + -- Mark Purcell Thu, 21 Sep 2006 06:37:22 +0100 + +exiv2 (0.10-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix overly strict shlibs line. Closes: #386899 + * Also adding conflict,replaces from libexiv2-0.10 to libexiv2. + + -- Andreas Barth Mon, 11 Sep 2006 20:04:40 +0200 + +exiv2 (0.10-1.1) unstable; urgency=medium + + [ David Schmitt ] + * Non-maintainer upload. + * Medium-urgency upload for RC bugfix. + * Change package name from libexiv2 to libexiv2-0.10 to encode the full + SONAME as well as for the C++ mt allocator ABI change, and conflict/replace + libexiv2 accordingly. Closes: #339163, #382867. + * Remove unnecessary libexiv2.{postinst,postrm} scripts, as they don't do + anything that debhelper doesn't already do for us. + * replace shlibs.local by dh_makeshlibs -V + * make package bin-NMU-able by using ${binary:Version} and B-D on dpkg-dev + (>= 1.13.19) + + [ Andreas Barth ] + * Uploading NMU. + + -- Andreas Barth Sun, 10 Sep 2006 09:09:55 +0200 + +exiv2 (0.10-1) unstable; urgency=low + + * New Upstream Release. (Fixes: #370151) + + -- KELEMEN Peter Tue, 14 Jun 2006 00:02:57 +0200 + +exiv2 (0.9.1-1) unstable; urgency=low + + * New Upstream Release. + * debian/control: -dev Suggests: -doc. + + -- KELEMEN Peter Sat, 4 Feb 2006 07:45:00 +0100 + +exiv2 (0.9-1) unstable; urgency=low + + * New Upstream Release. + * debian/rules: Ship with upstream documentation by default. + * debian/control: relax build dependencies. + + -- KELEMEN Peter Fri, 27 Jan 2006 20:41:35 +0100 + +exiv2 (0.7-10) unstable; urgency=low + + * C++ allocator change. (Closes: #339163) + + -- KELEMEN Peter Fri, 18 Nov 2005 00:08:45 +0100 + +exiv2 (0.7-9) unstable; urgency=low + + * Added missing Build-Depends: sharutils (Closes: #328376) + * Standards-Version: 3.6.2 (no changes) + + -- KELEMEN Peter Thu, 15 Sep 2005 14:54:32 +0200 + +exiv2 (0.7-8) unstable; urgency=low + + * Upload to unstable. + + -- KELEMEN Peter Wed, 14 Sep 2005 15:11:33 +0200 + +exiv2 (0.7-7) experimental; urgency=low + + * Upload to Debian archive. + + -- KELEMEN Peter Mon, 18 Jul 2005 00:18:51 +0200 + +exiv2 (0.7-6) experimental; urgency=low + + * g++-4.0 rebuild. + + -- KELEMEN Peter Mon, 11 Jul 2005 03:36:38 +0200 + +exiv2 (0.7-5) experimental; urgency=low + + * fix multiple copyrights + * strengthen lib deps + + -- KELEMEN Peter Sun, 19 Jun 2005 16:24:51 +0200 + +exiv2 (0.7-4) experimental; urgency=low + + * doc fixes + + -- KELEMEN Peter Sun, 19 Jun 2005 14:43:46 +0200 + +exiv2 (0.7-3) experimental; urgency=low + + * Make the package non-native. + * Build with g++-4.0. + + -- KELEMEN Peter Sat, 18 Jun 2005 19:34:44 +0200 + +exiv2 (0.7-2) experimental; urgency=low + + * static libray to -dev + * clean up -doc + * cmd.txt as example in exiv2 + + -- KELEMEN Peter Thu, 16 Jun 2005 20:48:55 +0200 + +exiv2 (0.7-1) experimental; urgency=low + + * New upstream release. + + -- KELEMEN Peter Thu, 16 Jun 2005 10:46:37 +0200 + +exiv2 (0.6.2-1) experimental; urgency=low + + * Initial release. (Closes: #312490) + + -- KELEMEN Peter Wed, 8 Jun 2005 14:39:56 +0200 + --- exiv2-0.18.2.orig/debian/libexiv2-dev.install +++ exiv2-0.18.2/debian/libexiv2-dev.install @@ -0,0 +1,6 @@ +debian/tmp/usr/include/* +debian/tmp/usr/lib/pkgconfig/* +debian/tmp/usr/lib/*.la +debian/tmp/usr/share/locale/* +debian/tmp/usr/lib/lib*.a +debian/tmp/usr/lib/lib*.so --- exiv2-0.18.2.orig/debian/libexiv2-doc.docs +++ exiv2-0.18.2/debian/libexiv2-doc.docs @@ -0,0 +1,3 @@ +doc/html +doc/include +doc/index.html --- exiv2-0.18.2.orig/debian/compat +++ exiv2-0.18.2/debian/compat @@ -0,0 +1 @@ +7 --- exiv2-0.18.2.orig/debian/rules +++ exiv2-0.18.2/debian/rules @@ -0,0 +1,43 @@ +#!/usr/bin/make -f + +FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz +UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz +URL = http://www.exiv2.org/$(UPFILENAME) + +%: + dh --with quilt $@ + +override_dh_auto_configure: + dh_auto_configure -- --disable-rpath + +override_dh_clean: + dh_clean + rm -rf doc/html + +override_dh_install: + [ ! -f Makefile ] || $(MAKE) doc + dh_install --list-missing + find $(CURDIR)/debian -type f -name exiv2 | xargs /usr/bin/chrpath -d + +override_dh_installdocs: + dh_installdocs -A -Xcmd.txt -XMakefile -Xtemplates -XChangeLog + +override_dh_installchangelogs: + dh_installchangelogs -A doc/ChangeLog + +override_dh_compress: + dh_compress -X.xls -X.js -X.idx -X.xml -X.php + +get-orig-source: + @@dh_testdir + @@[ -d ../tarballs/. ]||mkdir -p ../tarballs + @@echo Downloading $(UPFILENAME) from $(URL) ... + @@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL) + +print-version: + @@echo DEB_SOURCE_PACKAGE: $(DEB_SOURCE_PACKAGE) + @@echo DEB_VERSION: $(DEB_VERSION) + @@echo DEB_NO_EPOCH_VERSION: $(DEB_NOEPOCH_VERSION) + @@echo DEB_UPSTREAM_VERSION: $(DEB_UPSTREAM_VERSION) + @@echo FILENAME: $(FILENAME) + @@echo URL: $(URL) --- exiv2-0.18.2.orig/debian/docs +++ exiv2-0.18.2/debian/docs @@ -0,0 +1 @@ +README --- exiv2-0.18.2.orig/debian/watch +++ exiv2-0.18.2/debian/watch @@ -0,0 +1,6 @@ +# See uscan(1) for format + +# Compulsory line, this is a version 3 file +version=3 + +http://www.exiv2.org/download.html exiv2-(.*[\d])\.tar\.gz debian svn-upgrade --- exiv2-0.18.2.orig/debian/exiv2.examples +++ exiv2-0.18.2/debian/exiv2.examples @@ -0,0 +1 @@ +doc/cmd.txt --- exiv2-0.18.2.orig/debian/exiv2.install +++ exiv2-0.18.2/debian/exiv2.install @@ -0,0 +1,2 @@ +debian/tmp/usr/bin/exiv2 +debian/presubj /usr/share/bug/exiv2/ --- exiv2-0.18.2.orig/debian/exiv2.manpages +++ exiv2-0.18.2/debian/exiv2.manpages @@ -0,0 +1 @@ +debian/tmp/usr/share/man/man1/exiv2.1 --- exiv2-0.18.2.orig/debian/libexiv2-dev.lintian-overrides +++ exiv2-0.18.2/debian/libexiv2-dev.lintian-overrides @@ -0,0 +1 @@ +libexiv2-dev: extended-description-is-probably-too-short --- exiv2-0.18.2.orig/debian/patches/series +++ exiv2-0.18.2/debian/patches/series @@ -0,0 +1 @@ +00_hyphens_used_as_minus.diff --- exiv2-0.18.2.orig/debian/patches/00_hyphens_used_as_minus.diff +++ exiv2-0.18.2/debian/patches/00_hyphens_used_as_minus.diff @@ -0,0 +1,60 @@ +--- a/src/exiv2.1 ++++ b/src/exiv2.1 +@@ -171,17 +171,17 @@ Print mode for the 'print' action. Possi + .br + s : print a summary of the Exif metadata (the default) + .br +-a : print Exif, IPTC and XMP metadata (shortcut for -Pkyct) ++a : print Exif, IPTC and XMP metadata (shortcut for \-Pkyct) + .br +-t : interpreted (translated) Exif tags (-PEkyct) ++t : interpreted (translated) Exif tags (\-PEkyct) + .br +-v : plain Exif tag values (-PExgnycv) ++v : plain Exif tag values (\-PExgnycv) + .br +-h : hexdump of the Exif data (-PExgnycsh) ++h : hexdump of the Exif data (\-PExgnycsh) + .br +-i : IPTC datasets (-PIkyct) ++i : IPTC datasets (\-PIkyct) + .br +-x : XMP properties (-PXkyct) ++x : XMP properties (\-PXkyct) + .br + c : JPEG comment + .br +@@ -256,7 +256,7 @@ images and a modifier to generate an XMP + p[[, ...]] : Extract preview images. The optional comma separated + list of preview image numbers is used to determine which preview images + to extract. The available preview images and their numbers are displayed +-with the 'print' option -pp. ++with the 'print' option \-pp. + .br + X : Extract metadata to an XMP sidecar file .xmp. The remaining + extract targets determine what metadata to extract to the sidecar +@@ -393,13 +393,13 @@ ignored (comments). Remaining lines are + exiv2 *.jpg + Prints a summary of the Exif information for all JPEG files in the directory. + .TP +-exiv2 -pi image.jpg ++exiv2 \-pi image.jpg + Prints the IPTC metadata of the image. + .TP + exiv2 rename img_1234.jpg + Renames img_1234.jpg (taken on 13\-Nov\-05 at 22:58:31) to 20051113_225831.jpg + .TP +-exiv2 -r':basename:_%Y%m' rename img_1234.jpg ++exiv2 \-r':basename:_%Y%m' rename img_1234.jpg + Renames img_1234.jpg to img_1234_200511.jpg + .TP + exiv2 \-et img1.jpg img2.jpg +@@ -441,7 +441,7 @@ and GPSLatitudeRef contains either 'N' o + latitude respectively. + .TP + .nf +-exiv2 insert -l/tmp -S.CRW /data/*.JPG ++exiv2 insert \-l/tmp \-S.CRW /data/*.JPG + .fi + Copy all metadata from CRW files in the /tmp directory to JPG files + with corresponding basenames in the /data directory. Note that this