[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:44:11 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=5c59e68
The following commit has been merged in the master branch:
commit 5c59e6897f721bcf29b0634c862fff9d2f96de72
Author: Robin Mills <robin at clanmills.com>
Date: Thu Jun 26 01:04:50 2014 +0000
See #937 (DwC Darwin Core Support).
---
test/bugfixes-test.sh | 15 ++++
test/data/bugfixes-test.out | Bin 123600 -> 123626 bytes
test/data/exiv2.dc.dwc.i18n.jpg | Bin 0 -> 25304 bytes
test/data/exiv2.dc.dwc.i18n.txt | 174 ++++++++++++++++++++++++++++++++++++++++
test/functions.source | 1 +
5 files changed, 190 insertions(+)
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index dea8942..a09d70e 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -253,6 +253,21 @@ source ./functions.source
runTest exiv2 -q -pa -g dwc $filename
runTest exiv2 -q -PXkyctl -g Date $filename
+ num=937a
+ filename=exiv2.dc.dwc.i18n.jpg
+ dataname=exiv2.dc.dwc.i18n.txt
+ diffname=exiv2.dc.dwc.i18n.diff
+ printf "$num " >&3
+ echo '------>' Bug $num '<-------' >&2
+ copyTestFile $filename
+ copyTestFile $dataname
+ copyTestFile $diffname
+ runTest exiv2 -pa $filename | sort > $num-before.txt
+ exiv2 -m $dataname $filename
+ runTest exiv2 -pa $filename | sort > $num-after.txt
+ diff $num-before.txt $num-after.txt > $num.txt
+ diff $num.txt $diffname
+
) 3>&1 > $results 2>&1
printf "
"
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 73cf460..5c9c3fc 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/exiv2.dc.dwc.i18n.jpg b/test/data/exiv2.dc.dwc.i18n.jpg
new file mode 100644
index 0000000..18f18cd
Binary files /dev/null and b/test/data/exiv2.dc.dwc.i18n.jpg differ
diff --git a/test/data/exiv2.dc.dwc.i18n.txt b/test/data/exiv2.dc.dwc.i18n.txt
new file mode 100644
index 0000000..5b7f126
--- /dev/null
+++ b/test/data/exiv2.dc.dwc.i18n.txt
@@ -0,0 +1,174 @@
+set Xmp.dwc.Record/dwc:basisOfRecord "FossilSpecimen"
+set Xmp.dwc.Record/dwc:collectionCode "Mammals"
+set Xmp.dwc.Record/dwc:collectionID "urn:lsid:biocol.org:col:34818"
+set Xmp.dwc.Record/dwc:dataGeneralizations "Coordinates generalized"
+set Xmp.dwc.Record/dwc:datasetID "MVZ"
+set Xmp.dwc.Record/dwc:datasetName "Grinnell Resurvey"
+set Xmp.dwc.Record/dwc:dynamicProperties "targusLengthInMeters=0.014; weightInGrams=120"
+set Xmp.dwc.Record/dwc:informationWithheld "location information"
+set Xmp.dwc.Record/dwc:institutionCode "CDS"
+set Xmp.dwc.Record/dwc:institutionID "Charles Darwin"
+set Xmp.dwc.Record/dwc:ownerInstitutionCode "NPS"
+set Xmp.dwc.Occurrence/dwc:associatedMedia "http://arctos.database.museum/SpecimenImages/UAMObs/Mamm/2/P7291179.JPG"
+set Xmp.dwc.Occurrence/dwc:associatedOccurrences "sibling of"
+set Xmp.dwc.Occurrence/dwc:associatedReferences "Christopher J. 89(3):755-76"
+set Xmp.dwc.Occurrence/dwc:associatedSequences "GenBank:U34853.1"
+set Xmp.dwc.Occurrence/dwc:associatedTaxa "host:Quercus alba"
+set Xmp.dwc.Occurrence/dwc:behavior "roosting"
+set Xmp.dwc.Occurrence/dwc:catalogNumber "2008.1334"
+set Xmp.dwc.Occurrence/dwc:disposition "in collection"
+set Xmp.dwc.Occurrence/dwc:establishmentMeans "cultivated"
+set Xmp.dwc.Occurrence/dwc:individualCount "23"
+set Xmp.dwc.Occurrence/dwc:individualID "U.amer. 44"
+set Xmp.dwc.Occurrence/dwc:lifeStage "egg"
+set Xmp.dwc.Occurrence/dwc:occurrenceDetails "http://mvzarctos.berkeley.edu/guid/MVZ:Mamm:165861"
+set Xmp.dwc.Occurrence/dwc:occurrenceID "urn:lsid:nhm.ku.edu:Herps:32"
+set Xmp.dwc.Occurrence/dwc:occurrenceRemarks "found dead"
+set Xmp.dwc.Occurrence/dwc:occurrenceStatus "present"
+set Xmp.dwc.Occurrence/dwc:otherCatalogNumbers "FNMH:Mammal:1234"
+set Xmp.dwc.Occurrence/dwc:preparations "skin"
+set Xmp.dwc.Occurrence/dwc:previousIdentifications "Anthus sp.,"
+set Xmp.dwc.Occurrence/dwc:recordNumber "OPP 7101"
+set Xmp.dwc.Occurrence/dwc:recordedBy "Oliver P."
+set Xmp.dwc.Occurrence/dwc:reproductiveCondition "non-reproductive"
+set Xmp.dwc.Occurrence/dwc:sex "female"
+set Xmp.dwc.Event/dwc:day "31"
+set Xmp.dwc.Event/dwc:earliestDate "2012-09-03T00:00:00-06:00"
+set Xmp.dwc.Event/dwc:latestDate "2013-01-27T00:00:00-06:00"
+set Xmp.dwc.Event/dwc:endDayOfYear "366"
+set Xmp.dwc.Event/dwc:eventID "1234"
+set Xmp.dwc.Event/dwc:eventTime "01:41:33+03:00"
+set Xmp.dwc.Event/dwc:eventDate "1899-12-30"
+set Xmp.dwc.Event/dwc:fieldNotes "notes available"
+set Xmp.dwc.Event/dwc:fieldNumber "RV Sol"
+set Xmp.dwc.Event/dwc:habitat "oak savanna"
+set Xmp.dwc.Event/dwc:month "10"
+set Xmp.dwc.Event/dwc:samplingEffort "40 trap-nights"
+set Xmp.dwc.Event/dwc:samplingProtocol "Penguins from"
+set Xmp.dwc.Event/dwc:startDayOfYear "1"
+set Xmp.dwc.Event/dwc:verbatimEventDate "spring 1910"
+set Xmp.dwc.Event/dwc:year "1999"
+set Xmp.dwc.Event/dwc:eventRemarks "lang=es-es despues"
+set Xmp.dwc.Event/dwc:eventRemarks "lang=en-us after"
+set Xmp.dwc.Event/dwc:eventDate "1899-12-30T01:41:33+03:00"
+set Xmp.dwc.dctermsLocation/dwc:continent "Antarctica"
+set Xmp.dwc.dctermsLocation/dwc:coordinatePrecision "0.00001"
+set Xmp.dwc.dctermsLocation/dwc:coordinateUncertaintyInMeters "30"
+set Xmp.dwc.dctermsLocation/dwc:country "Denmark"
+set Xmp.dwc.dctermsLocation/dwc:countryCode "AR"
+set Xmp.dwc.dctermsLocation/dwc:county "Missoula"
+set Xmp.dwc.dctermsLocation/dwc:decimalLatitude "-41.0983423"
+set Xmp.dwc.dctermsLocation/dwc:decimalLongitude "-121.1761111"
+set Xmp.dwc.dctermsLocation/dwc:footprintSRS "GCS_WGS_1984"
+set Xmp.dwc.dctermsLocation/dwc:footprintSpatialFit "1"
+set Xmp.dwc.dctermsLocation/dwc:footprintWKT "POLYGON ((10"
+set Xmp.dwc.dctermsLocation/dwc:geodeticDatum "WGS84"
+set Xmp.dwc.dctermsLocation/dwc:georeferenceProtocol "MaNIS/HerpNet/ORNIS Georeferencing"
+set Xmp.dwc.dctermsLocation/dwc:georeferenceRemarks "assumed distance"
+set Xmp.dwc.dctermsLocation/dwc:georeferenceSources "USGS 1:24,000"
+set Xmp.dwc.dctermsLocation/dwc:georeferenceVerificationStatus "requires verification"
+set Xmp.dwc.dctermsLocation/dwc:georeferencedBy "Kristina Yamamoto"
+set Xmp.dwc.dctermsLocation/dwc:higherGeography "South America;"
+set Xmp.dwc.dctermsLocation/dwc:higherGeographyID "TGN:1002002"
+set Xmp.dwc.dctermsLocation/dwc:island "Isla Victoria"
+set Xmp.dwc.dctermsLocation/dwc:islandGroup "Alexander Archipelago"
+set Xmp.dwc.dctermsLocation/dwc:locality "25 km"
+set Xmp.dwc.dctermsLocation/dwc:locationAccordingTo "Getty Thesaurus"
+set Xmp.dwc.dctermsLocation/dwc:locationID "EBT3000"
+set Xmp.dwc.dctermsLocation/dwc:locationRemarks "under water"
+set Xmp.dwc.dctermsLocation/dwc:maximumDepthInMeters "100"
+set Xmp.dwc.dctermsLocation/dwc:maximumDistanceAboveSurfaceInMeters "1.5 meter"
+set Xmp.dwc.dctermsLocation/dwc:maximumElevationInMeters "200"
+set Xmp.dwc.dctermsLocation/dwc:minimumDepthInMeters "25.5"
+set Xmp.dwc.dctermsLocation/dwc:minimumDistanceAboveSurfaceInMeters "1.5 meter"
+set Xmp.dwc.dctermsLocation/dwc:minimumElevationInMeters "100"
+set Xmp.dwc.dctermsLocation/dwc:municipality "Holzminden"
+set Xmp.dwc.dctermsLocation/dwc:pointRadiusSpatialFit "1"
+set Xmp.dwc.dctermsLocation/dwc:stateProvince "Montana"
+set Xmp.dwc.dctermsLocation/dwc:verbatimCoordinateSystem "UTM"
+set Xmp.dwc.dctermsLocation/dwc:verbatimCoordinates "41 5"
+set Xmp.dwc.dctermsLocation/dwc:verbatimDepth "100-200 m"
+set Xmp.dwc.dctermsLocation/dwc:verbatimElevation "100-200 m"
+set Xmp.dwc.dctermsLocation/dwc:verbatimLatitude "41 5"
+set Xmp.dwc.dctermsLocation/dwc:verbatimLocality "25 km"
+set Xmp.dwc.dctermsLocation/dwc:verbatimLongitude "121 5"
+set Xmp.dwc.dctermsLocation/dwc:verbatimSRS "WGS84"
+set Xmp.dwc.dctermsLocation/dwc:waterBody "Indian Ocean"
+set Xmp.dwc.GeologicalContext/dwc:bed "Lava Dam"
+set Xmp.dwc.GeologicalContext/dwc:earliestAgeOrLowestStage "Atlantic"
+set Xmp.dwc.GeologicalContext/dwc:earliestEonOrLowestEonothem "Phanerozoic"
+set Xmp.dwc.GeologicalContext/dwc:earliestEpochOrLowestSeries "Pleistocene"
+set Xmp.dwc.GeologicalContext/dwc:earliestEraOrLowestErathem "Cenozoic"
+set Xmp.dwc.GeologicalContext/dwc:earliestPeriodOrLowestSystem "Neogene"
+set Xmp.dwc.GeologicalContext/dwc:formation "Notch Peak"
+set Xmp.dwc.GeologicalContext/dwc:geologicalContextID "1234"
+set Xmp.dwc.GeologicalContext/dwc:group "Notch Peak"
+set Xmp.dwc.GeologicalContext/dwc:highestBiostratigraphicZone "Atlantic"
+set Xmp.dwc.GeologicalContext/dwc:latestAgeOrHighestStage "Boreal"
+set Xmp.dwc.GeologicalContext/dwc:latestEonOrHighestEonothem "Proterozoic"
+set Xmp.dwc.GeologicalContext/dwc:latestEpochOrHighestSeries "Ibexian Series"
+set Xmp.dwc.GeologicalContext/dwc:latestPeriodOrHighestSystem "Tertiary"
+set Xmp.dwc.GeologicalContext/dwc:lithostratigraphicTerms "Supergroup"
+set Xmp.dwc.GeologicalContext/dwc:lowestBiostratigraphicZone "Boreal"
+set Xmp.dwc.GeologicalContext/dwc:member "Lava Dam"
+set Xmp.dwc.Identification/dwc:dateIdentified "2011-01-27T00:17:00-18:00"
+set Xmp.dwc.Identification/dwc:identificationID "1234"
+set Xmp.dwc.Identification/dwc:identificationQualifier "aff. agrifolia"
+set Xmp.dwc.Identification/dwc:identificationReferences "Aves del"
+set Xmp.dwc.Identification/dwc:identificationRemarks "Distinguished between"
+set Xmp.dwc.Identification/dwc:identifiedBy "James L."
+set Xmp.dwc.Identification/dwc:typeStatus "holotype of"
+set Xmp.dwc.Taxon/dwc:acceptedNameUsage "Tamias minimus"
+set Xmp.dwc.Taxon/dwc:acceptedNameUsageID "8fa58e08-08de-4ac1-b69c-1235340b7001"
+set Xmp.dwc.Taxon/dwc:class "Vertebrata"
+set Xmp.dwc.Taxon/dwc:family "Felidae"
+set Xmp.dwc.Taxon/dwc:genus "Puma"
+set Xmp.dwc.Taxon/dwc:higherClassification "Animalia;Chordata;Vertebrata;Mammalia;Theria;Eutheria"
+set Xmp.dwc.Taxon/dwc:infraspecificEpithet "concolor"
+set Xmp.dwc.Taxon/dwc:kingdom "Animalia"
+set Xmp.dwc.Taxon/dwc:nameAccordingTo "McCranie, J. comments"
+set Xmp.dwc.Taxon/dwc:nameAccordingToID "doi:10.1016/S0269-915X(97)80026-2"
+set Xmp.dwc.Taxon/dwc:namePublishedIn "Pearson O."
+set Xmp.dwc.Taxon/dwc:namePublishedInID "http://hdl.handle.net/10199/7"
+set Xmp.dwc.Taxon/dwc:namePublishedInYear "2059"
+set Xmp.dwc.Taxon/dwc:nomenclaturalCode "ICBN"
+set Xmp.dwc.Taxon/dwc:nomenclaturalStatus "nom. ambig."
+set Xmp.dwc.Taxon/dwc:order "Mammalia"
+set Xmp.dwc.Taxon/dwc:originalNameUsage "Gasterosteus saltatrix"
+set Xmp.dwc.Taxon/dwc:parentNameUsage "Rubiaceae"
+set Xmp.dwc.Taxon/dwc:parentNameUsageID "8fa58e08-08de-4ac1-b69c-1235340b7001"
+set Xmp.dwc.Taxon/dwc:phylum "Chordata"
+set Xmp.dwc.Taxon/dwc:scientificName "Ctenomys sociabilis"
+set Xmp.dwc.Taxon/dwc:scientificNameAuthorship "(Torr.) J.T."
+set Xmp.dwc.Taxon/dwc:scientificNameID "urn:lsid:ipni.org:names:37829-1:1.3"
+set Xmp.dwc.Taxon/dwc:specificEpithet "concolor"
+set Xmp.dwc.Taxon/dwc:subgenus "Puma"
+set Xmp.dwc.Taxon/dwc:taxonConceptID "8fa58e08-08de-4ac1-b69c-1235340b7001"
+set Xmp.dwc.Taxon/dwc:taxonID "8fa58e08-08de-4ac1-b69c-1235340b7001"
+set Xmp.dwc.Taxon/dwc:taxonRank "subspecies"
+set Xmp.dwc.Taxon/dwc:taxonRemarks "lang=en-us this name ..."
+set Xmp.dwc.Taxon/dwc:taxonomicStatus "invalid"
+set Xmp.dwc.Taxon/dwc:verbatimTaxonRank "Agamospecies"
+set Xmp.dwc.Taxon/dwc:vernacularName "lang=en-us Cougar"
+set Xmp.dwc.Taxon/dwc:vernacularName "lang=es-es Puma"
+set Xmp.dwc.MeasurementOrFact/dwc:measurementAccuracy "0.01"
+set Xmp.dwc.MeasurementOrFact/dwc:measurementDeterminedBy "Javier de"
+set Xmp.dwc.MeasurementOrFact/dwc:measurementDeterminedDate "2013-01-27T00:00:00-06:00"
+set Xmp.dwc.MeasurementOrFact/dwc:measurementID "1234"
+set Xmp.dwc.MeasurementOrFact/dwc:measurementMethod "barometric altimeter"
+set Xmp.dwc.MeasurementOrFact/dwc:measurementRemarks "tip of"
+set Xmp.dwc.MeasurementOrFact/dwc:measurementType "tail length"
+set Xmp.dwc.MeasurementOrFact/dwc:measurementUnit "mm"
+set Xmp.dwc.MeasurementOrFact/dwc:measurementValue "45"
+set Xmp.dwc.ResourceRelationship/dwc:relatedResourceID "1234"
+set Xmp.dwc.ResourceRelationship/dwc:relationshipAccordingTo "Julie Woodruff"
+set Xmp.dwc.ResourceRelationship/dwc:relationshipEstablishedDate "2013-01-27T00:00:00-06:00"
+set Xmp.dwc.ResourceRelationship/dwc:relationshipOfResource "duplicate of"
+set Xmp.dwc.ResourceRelationship/dwc:relationshipRemarks "pollinator captured"
+set Xmp.dwc.ResourceRelationship/dwc:resourceID "1234"
+set Xmp.dwc.ResourceRelationship/dwc:resourceRelationshipID "1234"
+set Xmp.dc.language "latin"
+set Xmp.dc.rights "lang=en-us Alan Pater CC"
+set Xmp.dc.rights "lang=es-es CC Alan Pater"
+
+
diff --git a/test/functions.source b/test/functions.source
index ab6863b..162d959 100644
--- a/test/functions.source
+++ b/test/functions.source
@@ -215,6 +215,7 @@ diffCheck()
{
test=$1
good=$2
+ if [ -z "$errors" ]; then let -a errors=0; fi
#run diff and check results
diff -q --binary $diffargs $test $good
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list