[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:07 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=d2f5abb
The following commit has been merged in the master branch:
commit d2f5abbac56828b96d972d6bc85586a410dde05b
Author: Robin Mills <robin at clanmills.com>
Date: Tue Apr 21 18:48:49 2015 +0000
#1054. exiv2json deep recursion and AltLang support. Regression detector.
---
Makefile | 22 +++++++++++-----------
config/Makefile.in | 22 +++++++++++-----------
samples/exiv2json.cpp | 2 +-
src/Makefile | 11 +++++++++++
test/bugfixes-test.sh | 11 +++++++++++
test/data/bugfixes-test.out | Bin 141360 -> 147792 bytes
6 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/Makefile b/Makefile
index c45b2f5..0689ff7 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@
# History: 15-Jan-04, ahu: created
#
# Description:
-# Simple top-level makefile that mainly forwards to makefiles in
+# Simple top-level makefile that mainly forwards to makefiles in
# subdirectories.
#
# Restrictions:
@@ -83,8 +83,8 @@ MAJOR=$(shell grep "define.*EXIV2_.*_VERSION .*\d*" src/version.hpp | grep MAJO
MINOR=$(shell grep "define.*EXIV2_.*_VERSION .*\d*" src/version.hpp | grep MINOR | sed -e 's/EXIV2//g' | tr -dC [:digit:])
VERSION=exiv2-$(MAJOR).$(MINOR)
tarball:
- @rm -rf /tmp/$(VERSION)
- @rm -rf /tmp/$(VERSION).tar
+ @rm -rf /tmp/$(VERSION)
+ @rm -rf /tmp/$(VERSION).tar
@rm -rf /tmp/$(VERSION).tar.gz
@rm -rf $(VERSION).tar.gz
svn export -q . /tmp/$(VERSION)
@@ -103,9 +103,9 @@ configure:
config:
cd config && $(MAKE) -f config.make $(MAKECMDGOALS)
-xmpsdk: src/svn_version.h config/config.mk
+xmpsdk: src/svn_version.h config/config.mk
if test "x$(ENABLE_XMP)" = "x1"; then cd xmpsdk/src && $(MAKE) $@; fi;
-
+
src/svn_version.h:
cd src && $(MAKE) svn_version.h
@@ -119,8 +119,8 @@ mostlyclean clean: config/config.mk
rm -rf test/tmp include/exiv2/exv_conf.h src/svn_version.h
mkdir test/tmp
-# `make distclean' also removes files created by configuring
-# the program. Running `make all distclean' prepares the project
+# `make distclean' also removes files created by configuring
+# the program. Running `make all distclean' prepares the project
# for packaging.
distclean: clean
rm -f config.log config.status libtool
@@ -133,16 +133,16 @@ maintainer-clean: distclean
rm -f configure
-cd test && $(MAKE) $(MAKECMDGOALS)
-config/config.mk:
+config/config.mk:
$(error File config/config.mk does not exist. Did you run ./configure?)
rebuild:
make distclean
make config
./configure
- make
+ make -j
sudo make install
- make samples
-
+ make -j samples
+
# That's all Folks!
##
diff --git a/config/Makefile.in b/config/Makefile.in
index 0681270..49dcc12 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -36,7 +36,7 @@
# History: 15-Jan-04, ahu: created
#
# Description:
-# Simple top-level makefile that mainly forwards to makefiles in
+# Simple top-level makefile that mainly forwards to makefiles in
# subdirectories.
#
# Restrictions:
@@ -83,8 +83,8 @@ MAJOR=$(shell grep "define.*EXIV2_.*_VERSION .*\d*" src/version.hpp | grep MAJO
MINOR=$(shell grep "define.*EXIV2_.*_VERSION .*\d*" src/version.hpp | grep MINOR | sed -e 's/EXIV2//g' | tr -dC [:digit:])
VERSION=exiv2-$(MAJOR).$(MINOR)
tarball:
- @rm -rf /tmp/$(VERSION)
- @rm -rf /tmp/$(VERSION).tar
+ @rm -rf /tmp/$(VERSION)
+ @rm -rf /tmp/$(VERSION).tar
@rm -rf /tmp/$(VERSION).tar.gz
@rm -rf $(VERSION).tar.gz
svn export -q . /tmp/$(VERSION)
@@ -103,9 +103,9 @@ configure:
config:
cd config && $(MAKE) -f config.make $(MAKECMDGOALS)
-xmpsdk: src/svn_version.h config/config.mk
+xmpsdk: src/svn_version.h config/config.mk
if test "x$(ENABLE_XMP)" = "x1"; then cd xmpsdk/src && $(MAKE) $@; fi;
-
+
src/svn_version.h:
cd src && $(MAKE) svn_version.h
@@ -119,8 +119,8 @@ mostlyclean clean: config/config.mk
rm -rf test/tmp include/exiv2/exv_conf.h src/svn_version.h
mkdir test/tmp
-# `make distclean' also removes files created by configuring
-# the program. Running `make all distclean' prepares the project
+# `make distclean' also removes files created by configuring
+# the program. Running `make all distclean' prepares the project
# for packaging.
distclean: clean
rm -f config.log config.status libtool
@@ -133,16 +133,16 @@ maintainer-clean: distclean
rm -f configure
-cd test && $(MAKE) $(MAKECMDGOALS)
-config/config.mk:
+config/config.mk:
$(error File config/config.mk does not exist. Did you run ./configure?)
rebuild:
make distclean
make config
./configure
- make
+ make -j
sudo make install
- make samples
-
+ make -j samples
+
# That's all Folks!
##
diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp
index 6fb433f..317598c 100644
--- a/samples/exiv2json.cpp
+++ b/samples/exiv2json.cpp
@@ -268,7 +268,7 @@ try {
Jzon::Object root;
- if ( option == 'a' || option == 'f' ) {
+ if ( option == 'f' ) { // only report filesystem when requested
const char* FS="FS";
Jzon::Object fs ;
root.Add(FS,fs) ;
diff --git a/src/Makefile b/src/Makefile
index 376fded..2411886 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -191,6 +191,12 @@ EXIFPOBJ = $(SAMPLEDIR)$(EXIFPRINT:.cpp=.o)
EXIFPBIN = $(EXIFPRINT:.cpp=)
EXIFPEXE = $(EXIFPRINT:.cpp=$(EXEEXT))
+# exiv2json application
+EXIV2JSON = exiv2json.cpp
+EXIVJOBJ = $(SAMPLEDIR)$(EXIV2JSON:.cpp=.o)
+EXIVJBIN = $(EXIV2JSON:.cpp=)
+EXIVJEXE = $(EXIV2JSON:.cpp=$(EXEEXT))
+
# cmdfiletest application
REMOTETEST = remotetest.cpp
REMOTETOBJ = $(SAMPLEDIR)$(REMOTETEST:.cpp=.o)
@@ -206,6 +212,7 @@ DEP = $(CCSRC:%.cpp=$(DEPDIR)/%.d) \
$(CONNTEST:%.cpp=$(DEPDIR)/%.d) \
$(EXIFPRINT:%.cpp=$(DEPDIR)/%.d) \
$(REMOTETEST:%.cpp=$(DEPDIR)/%.d) \
+ $(EXIV2JSON:%.cpp=$(DEPDIR)/%.d) \
$(EXIVCSRC:%.c=$(DEPDIR)/%.d)
endif
@@ -299,6 +306,10 @@ $(EXIFPBIN): lib $(EXIFPOBJ)
mkdir -pv ../bin 2>&1 > /dev/null
@$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(EXIFPOBJ) -rpath $(libdir)
+$(EXIVJBIN): lib $(EXIVJOBJ)
+ mkdir -pv ../bin 2>&1 > /dev/null
+ @$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(EXIVJOBJ) -rpath $(libdir)
+
$(REMOTETBIN): lib $(REMOTETOBJ)
mkdir -pv ../bin 2>&1 > /dev/null
@$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(REMOTETOBJ) -rpath $(libdir)
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index b0c538b..6ff9d32 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -336,6 +336,17 @@ source ./functions.source
runTest exiv2 -PE -K ImageWidth $filename
runTest exiv2 -PE -K Exif.Image.ImageWidth $filename
+ num=1054
+ filename1=exiv2-bug${num}-1.jpg
+ filename2=exiv2-bug${num}-2.jpg
+ printf "$num " >&3
+ echo '------>' Bug $num '<-------' >&2
+ copyTestFile BlueSquare.xmp $filename1
+ copyTestFile exiv2-bug784.jpg $filename2
+ runTest exiv2json $filename1
+ runTest exiv2json x $filename1
+ runTest exiv2json $filename2
+
num=1058
filename=exiv2-bug$num.jpg
printf "$num " >&3
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 354e038..02d8ce7 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list