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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:45:56 UTC 2017


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

The following commit has been merged in the master branch:
commit ada018f3b883d40b7836adc3393d2c9c6ea84f51
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Nov 23 16:03:44 2015 +0000

    #1137.  Updated manpage to document -m- and -pV and Added regression detector for both new options to test suite.
---
 src/exiv2.1                 |   6 ++++--
 test/bugfixes-test.sh       |   9 +++++++++
 test/data/bugfixes-test.out | Bin 1843444 -> 1843966 bytes
 test/data/exiv2-bug1137.jpg | Bin 0 -> 8779 bytes
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/exiv2.1 b/src/exiv2.1
index eef9f5d..02d8c8a 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 "Nov 12, 2015"
+.TH EXIV2 1 "Nov 23, 2015"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -345,6 +345,8 @@ s : size in bytes
 .br
 v : plain data value
 .br
+V : plain data value AND the word 'set ' at the start of line (for use with exiv2 -m-)
+.br
 t : interpreted (translated) data
 .br
 h : hexdump of the data
@@ -413,7 +415,7 @@ Default filename format is %Y%m%d_%H%M%S.
 .B \-c 
Itxt
P
 JPEG comment string to set in the image ('modify' action). This option
 can also be used with the 'extract' and 'insert' actions to modify
-metadata on-the-fly.
+metadata on-the-fly.  -m- represents standard-input.
 .TP
 .B \-m 
Ifile
P
 Command file for the 'modify' action. This option can also be used
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 921e4c7..3d03583 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -430,6 +430,15 @@ source ./functions.source
 	copyTestFile                        $filename
 	runTest exiv2 -pv -g Lens           $filename
 	runTest exiv2 -pa -g Lens           $filename
+	
+	num=1137
+	filename=exiv2-bug$num.jpg
+	copyTestFile                        $filename
+	exiv2 -PkV --grep GPSL http://dev.exiv2.org/attachments/download/805/DSC_7154.jpg
+	exiv2 -pa $filename
+	exiv2 -PkV --grep GPSL http://dev.exiv2.org/attachments/download/805/DSC_7154.jpg | exiv2 -m- $filename
+	exiv2 -pa $filename
+	
 
 ) 3>&1 > $results 2>&1
 
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 7f73839..28f356e 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/exiv2-bug1137.jpg b/test/data/exiv2-bug1137.jpg
new file mode 100644
index 0000000..97ed37e
Binary files /dev/null and b/test/data/exiv2-bug1137.jpg differ

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list