[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=5a36dea

The following commit has been merged in the master branch:
commit 5a36dea37d4669702102f13e4fc91394652d11ae
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Dec 29 17:57:37 2015 +0000

    #1061.  Added exiv2samples.1 and associate autotools and CMake installer support.  Work in progress.
---
 samples/CMakeLists.txt                |  4 ++++
 src/exiv2.1 => samples/exiv2samples.1 | 21 +++++++++++++--------
 src/Makefile                          |  3 ++-
 src/exiv2.1                           |  9 ++++++---
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index f283144..6b07398 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -71,6 +71,10 @@ SET_TARGET_PROPERTIES( exiv2json PROPERTIES OUTPUT_NAME exiv2json )
 TARGET_LINK_LIBRARIES( exiv2json exiv2lib )
 INSTALL( TARGETS exiv2json ${INSTALL_TARGET_STANDARD_ARGS} )
 
+# ******************************************************************************
+# Man page
+INSTALL( FILES exiv2samples.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 )
+
 # That's all Folks!
 ##
 
diff --git a/src/exiv2.1 b/samples/exiv2samples.1
similarity index 97%
copy from src/exiv2.1
copy to samples/exiv2samples.1
index 0714663..6396045 100644
--- a/src/exiv2.1
+++ b/samples/exiv2samples.1
@@ -1,9 +1,9 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.\" @(#) $Id$
+.\" @(#) $Id: exiv2.1 4075 2015-12-08 09:27:38Z robinwmills $
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH EXIV2 1 "Dec 8, 2015"
+.TH EXIV2SAMPLES 1 "Dec 29, 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -17,7 +17,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-exiv2 \- Image metadata manipulation tool
+exiv2 sample applications\- Image metadata manipulation tool
 .SH SYNOPSIS
 .B exiv2
 [
Ioptions
P] [
Iaction
P] 
Ifile
P ...
@@ -29,10 +29,15 @@ exiv2 \- Image metadata manipulation tool
 .\" respectively.
 .B exiv2
 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.
+image comments and can read many vendor makernote tags.  Users
+who build exiv2 and its library also build some sample and test applications.
+.br
+The samples are:
+.br
+.nf
+exiv2json	Format metadata in json
+exifprint	Print the metadata in one or more images
+.fi
 .br
 The following image formats are supported:
 .TS
@@ -226,7 +231,7 @@ can be used to grep info for several keys.  When the library is build with C++11
 keys are matched using std::regex::extended.  When build without C++11, keys are
 processed with the system regular expression engine:  see man 3 regex.  Platforms which do not support
 regex use key for a substring match.  You can determine the availability of regex
-using the command: exiv2 -v -V -g have_regex -g cplusplus.  
+using the command: exiv2 -v -V -g have_regex -g cplusplus.
 
 .nf
 exiv2 \-g Date \-pt R.jpg
diff --git a/src/Makefile b/src/Makefile
index 8a1b674..d16962f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -279,6 +279,7 @@ install: $(EXIV2EXE) install-lib
 	$(INSTALL_DIRS) $(DESTDIR)$(mandir)
 	$(INSTALL_DIRS) $(DESTDIR)$(man1dir)
 	$(INSTALL_DATA) exiv2.1 $(DESTDIR)$(man1dir)/exiv2.1
+	$(INSTALL_DATA) $(top_srcdir)/samples/exiv2samples.1 $(DESTDIR)$(man1dir)/exiv2samples.1
 
 uninstall-header:
 	@list='$(HDR)'; for p in $$list; do \
@@ -295,7 +296,7 @@ uninstall-lib: uninstall-header
 	-rmdir $(DESTDIR)$(libdir)
 
 uninstall: uninstall-lib
-	$(RM) $(DESTDIR)$(man1dir)/exiv2.1
+	$(RM) $(DESTDIR)$(man1dir)/exiv2.1 $(DESTDIR)$(man1dir)/exiv2samples.1
 	-rmdir $(DESTDIR)$(man1dir)
 	-rmdir $(DESTDIR)$(mandir)
 	@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(bindir)/$(EXIV2EXE)
diff --git a/src/exiv2.1 b/src/exiv2.1
index 0714663..a242811 100644
--- a/src/exiv2.1
+++ b/src/exiv2.1
@@ -3,7 +3,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH EXIV2 1 "Dec 8, 2015"
+.TH EXIV2 1 "Dec 29, 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -29,7 +29,7 @@ exiv2 \- Image metadata manipulation tool
 .\" respectively.
 .B exiv2
 is a program to read and write Exif, IPTC, XMP metadata and
-image comments and can read many vendor makernote tags. The program 
+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.
@@ -226,7 +226,7 @@ can be used to grep info for several keys.  When the library is build with C++11
 keys are matched using std::regex::extended.  When build without C++11, keys are
 processed with the system regular expression engine:  see man 3 regex.  Platforms which do not support
 regex use key for a substring match.  You can determine the availability of regex
-using the command: exiv2 -v -V -g have_regex -g cplusplus.  
+using the command: exiv2 -v -V -g have_regex -g cplusplus.
 
 .nf
 exiv2 \-g Date \-pt R.jpg
@@ -646,6 +646,9 @@ requirements of the target format. Some tags copied like this may not
 make sense in the target image.
 .SH SEE ALSO
 .TP
+.I man exiv2samples
+Information about the sample applications included in the exiv2 code distribution
+.TP
 .I http://www.exiv2.org/sample.html#modify
 Sample command files.
 .TP

-- 
exiv2 packaging