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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:43:24 UTC 2017


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

The following commit has been merged in the master branch:
commit 2512d6fa24aafd7af55025e42641763be1a74bcf
Author: vog <vog at notjusthosting.com>
Date:   Fri Sep 14 16:36:27 2012 +0000

    Issue #847: Add more test cases
---
 ...p.eps => eps-flat_minimal_xmp-no-pagesetup.eps} |  2 -
 ...> eps-flat_minimal_xmp-no-pagesetup.eps.delxmp} |  0
 ...> eps-flat_minimal_xmp-no-pagesetup.eps.newxmp} |  2 +-
 ...p.xmp => eps-flat_minimal_xmp-no-pagesetup.xmp} |  0
 ...al_xmp-no-pagesetup_non-flexible-embedding.eps} |  7 +--
 ...no-pagesetup_non-flexible-embedding.eps.delxmp} |  1 -
 ...no-pagesetup_non-flexible-embedding.eps.newxmp} |  1 -
 ...al_xmp-no-pagesetup_non-flexible-embedding.xmp} |  0
 test/data/eps/eps-test.out                         | 52 ++++++++++++++++++++++
 9 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/test/data/eps/eps-flat_minimal_xmp.eps b/test/data/eps/eps-flat_minimal_xmp-no-pagesetup.eps
similarity index 98%
copy from test/data/eps/eps-flat_minimal_xmp.eps
copy to test/data/eps/eps-flat_minimal_xmp-no-pagesetup.eps
index 025f7ca..b6c11b8 100644
--- a/test/data/eps/eps-flat_minimal_xmp.eps
+++ b/test/data/eps/eps-flat_minimal_xmp-no-pagesetup.eps
@@ -8,7 +8,6 @@
 %%EndComments
 %%Page: 1 1
 %%EndPageComments
-%%BeginPageSetup
 %Exiv2BeginXMP: Before %%EndPageSetup
 /currentdistillerparams where
 {pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse
@@ -34,7 +33,6 @@
 [/Document 1 dict begin
     /Metadata {Exiv2_metadata_stream} def currentdict end /BDC Exiv2_pdfmark
 %Exiv2EndXMP
-%%EndPageSetup
 10 setlinewidth
 10 10 moveto
 0 90 rlineto 90 0 rlineto 0 -90 rlineto closepath
diff --git a/test/data/eps/eps-flat_minimal_xmp-garbage-before-endmarker.eps.delxmp b/test/data/eps/eps-flat_minimal_xmp-no-pagesetup.eps.delxmp
similarity index 100%
copy from test/data/eps/eps-flat_minimal_xmp-garbage-before-endmarker.eps.delxmp
copy to test/data/eps/eps-flat_minimal_xmp-no-pagesetup.eps.delxmp
diff --git a/test/data/eps/eps-flat_minimal-eof.eps.newxmp b/test/data/eps/eps-flat_minimal_xmp-no-pagesetup.eps.newxmp
similarity index 100%
copy from test/data/eps/eps-flat_minimal-eof.eps.newxmp
copy to test/data/eps/eps-flat_minimal_xmp-no-pagesetup.eps.newxmp
index f9f1be0..4c7d721 100644
--- a/test/data/eps/eps-flat_minimal-eof.eps.newxmp
+++ b/test/data/eps/eps-flat_minimal_xmp-no-pagesetup.eps.newxmp
@@ -8,7 +8,6 @@
 %%EndComments
 %%Page: 1 1
 %%EndPageComments
-%%BeginPageSetup
 %Exiv2BeginXMP: Before %%EndPageSetup
 /currentdistillerparams where
 {pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse
@@ -57,6 +56,7 @@
 [/Document 1 dict begin
     /Metadata {Exiv2_metadata_stream} def currentdict end /BDC Exiv2_pdfmark
 %Exiv2EndXMP
+%%BeginPageSetup
 %%EndPageSetup
 10 setlinewidth
 10 10 moveto
diff --git a/test/data/eps/eps-flat_empty-xmp.xmp b/test/data/eps/eps-flat_minimal_xmp-no-pagesetup.xmp
similarity index 100%
copy from test/data/eps/eps-flat_empty-xmp.xmp
copy to test/data/eps/eps-flat_minimal_xmp-no-pagesetup.xmp
diff --git a/test/data/eps/eps-flat_minimal_xmp.eps b/test/data/eps/eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps
similarity index 92%
copy from test/data/eps/eps-flat_minimal_xmp.eps
copy to test/data/eps/eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps
index 025f7ca..d5344d6 100644
--- a/test/data/eps/eps-flat_minimal_xmp.eps
+++ b/test/data/eps/eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps
@@ -7,8 +7,6 @@
 %Exiv2Website: http://www.exiv2.org/
 %%EndComments
 %%Page: 1 1
-%%EndPageComments
-%%BeginPageSetup
 %Exiv2BeginXMP: Before %%EndPageSetup
 /currentdistillerparams where
 {pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse
@@ -21,7 +19,7 @@
 [{Exiv2_metadata_stream} 2 dict begin
     /Type /Metadata def /Subtype /XML def currentdict end /PUT Exiv2_pdfmark
 [{Exiv2_metadata_stream}
-    currentfile 0 (% &&end XMP packet marker&&)
+    currentfile 0 (% &&non-standard end XMP packet marker&&)
     /SubFileDecode filter Exiv2_metafile_pdfmark
 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
 <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="TEST">
@@ -30,11 +28,10 @@
     </rdf:RDF>
 </x:xmpmeta>
 <?xpacket end="w"?>
-% &&end XMP packet marker&&
+% &&non-standard end XMP packet marker&&
 [/Document 1 dict begin
     /Metadata {Exiv2_metadata_stream} def currentdict end /BDC Exiv2_pdfmark
 %Exiv2EndXMP
-%%EndPageSetup
 10 setlinewidth
 10 10 moveto
 0 90 rlineto 90 0 rlineto 0 -90 rlineto closepath
diff --git a/test/data/eps/eps-flat_minimal_xmp-garbage-before-endmarker.eps.delxmp b/test/data/eps/eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps.delxmp
similarity index 94%
copy from test/data/eps/eps-flat_minimal_xmp-garbage-before-endmarker.eps.delxmp
copy to test/data/eps/eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps.delxmp
index b9791e5..e961d51 100644
--- a/test/data/eps/eps-flat_minimal_xmp-garbage-before-endmarker.eps.delxmp
+++ b/test/data/eps/eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps.delxmp
@@ -7,7 +7,6 @@
 %Exiv2Website: http://www.exiv2.org/
 %%EndComments
 %%Page: 1 1
-%%EndPageComments
 %%BeginPageSetup
 %%EndPageSetup
 10 setlinewidth
diff --git a/test/data/eps/eps-flat_minimal-eof.eps.newxmp b/test/data/eps/eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps.newxmp
similarity index 99%
copy from test/data/eps/eps-flat_minimal-eof.eps.newxmp
copy to test/data/eps/eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps.newxmp
index f9f1be0..c8b588f 100644
--- a/test/data/eps/eps-flat_minimal-eof.eps.newxmp
+++ b/test/data/eps/eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps.newxmp
@@ -7,7 +7,6 @@
 %Exiv2Website: http://www.exiv2.org/
 %%EndComments
 %%Page: 1 1
-%%EndPageComments
 %%BeginPageSetup
 %Exiv2BeginXMP: Before %%EndPageSetup
 /currentdistillerparams where
diff --git a/test/data/eps/eps-flat_empty-xmp.xmp b/test/data/eps/eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.xmp
similarity index 100%
copy from test/data/eps/eps-flat_empty-xmp.xmp
copy to test/data/eps/eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.xmp
diff --git a/test/data/eps/eps-test.out b/test/data/eps/eps-test.out
index bbfbf7f..839b580 100644
--- a/test/data/eps/eps-test.out
+++ b/test/data/eps/eps-test.out
@@ -680,6 +680,58 @@ Exit code: 0
 Command: exiv2 -f -ex eps-flat_minimal_xmp-in-page_exiftool-8.56.eps
 Exit code: 0
 
+-----> eps-flat_minimal_xmp-no-pagesetup.eps <-----
+
+Command: exiv2 -u -pa eps-flat_minimal_xmp-no-pagesetup.eps
+Xmp.test.test                                XmpText     4  TEST
+Exit code: 253
+
+Command: exiv2 -dx eps-flat_minimal_xmp-no-pagesetup.eps
+Exit code: 0
+
+Command: exiv2 -f -ex eps-flat_minimal_xmp-no-pagesetup.eps
+Exit code: 0
+
+Restore: eps-flat_minimal_xmp-no-pagesetup.eps
+
+Command: exiv2 -f -eX eps-flat_minimal_xmp-no-pagesetup.eps
+Exit code: 0
+
+Command: exiv2 -ix eps-flat_minimal_xmp-no-pagesetup.eps
+Exit code: 0
+
+Command: (2) exiv2 -ix eps-flat_minimal_xmp-no-pagesetup.eps
+Exit code: 0
+
+Command: exiv2 -f -ex eps-flat_minimal_xmp-no-pagesetup.eps
+Exit code: 0
+
+-----> eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps <-----
+
+Command: exiv2 -u -pa eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps
+Xmp.test.test                                XmpText     4  TEST
+Exit code: 253
+
+Command: exiv2 -dx eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps
+Exit code: 0
+
+Command: exiv2 -f -ex eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps
+Exit code: 0
+
+Restore: eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps
+
+Command: exiv2 -f -eX eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps
+Exit code: 0
+
+Command: exiv2 -ix eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps
+Exit code: 0
+
+Command: (2) exiv2 -ix eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps
+Exit code: 0
+
+Command: exiv2 -f -ex eps-flat_minimal_xmp-no-pagesetup_non-flexible-embedding.eps
+Exit code: 0
+
 -----> eps-flat_minimal_xmp-readonly.eps <-----
 
 Command: exiv2 -u -pa eps-flat_minimal_xmp-readonly.eps

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list