summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--COPYING2
-rw-r--r--NEWS.xml4
-rw-r--r--configure.ac2
3 files changed, 4 insertions, 4 deletions
diff --git a/COPYING b/COPYING
index 9579d6d..d01e680 100644
--- a/COPYING
+++ b/COPYING
@@ -1,19 +1,19 @@
1Copyright (c) 2009-2011 Klever Group (http://www.klever.net/) 1Copyright (c) 2009-2012 Klever Group (http://www.klever.net/)
2 2
3Permission is hereby granted, free of charge, to any person obtaining a copy of 3Permission is hereby granted, free of charge, to any person obtaining a copy of
4this software and associated documentation files (the "Software"), to deal in 4this software and associated documentation files (the "Software"), to deal in
5the Software without restriction, including without limitation the rights to 5the Software without restriction, including without limitation the rights to
6use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 6use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
7of the Software, and to permit persons to whom the Software is furnished to do 7of the Software, and to permit persons to whom the Software is furnished to do
8so, subject to the following conditions: 8so, subject to the following conditions:
9 9
10The above copyright notice and this permission notice shall be included in all 10The above copyright notice and this permission notice shall be included in all
11copies or substantial portions of the Software. 11copies or substantial portions of the Software.
12 12
13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 13THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 14IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 15FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 18OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19SOFTWARE. 19SOFTWARE.
diff --git a/NEWS.xml b/NEWS.xml
index e626a5c..2a73a8b 100644
--- a/NEWS.xml
+++ b/NEWS.xml
@@ -1,27 +1,27 @@
1<?xml version="1.0" encoding="us-ascii"?> 1<?xml version="1.0" encoding="us-ascii"?>
2<news> 2<news>
3 <version version="" date=""> 3 <version version="0.3" date="January 21st, 2012">
4 <ni>supports whatever file type card is willing to send now</ni> 4 <ni>supports whatever file type card is willing to send now</ni>
5 <ni>optimized integrity digest calculation memory usage</ni> 5 <ni>optimized integrity digest calculation memory usage</ni>
6 <ni>report the lack of config file for the card</ni> 6 <ni>report the lack of config file for the card</ni>
7 <ni>do some startup checks for config files</ni> 7 <ni>do some startup checks for config files</ni>
8 <ni>minor bugfixes</ni> 8 <ni>minor bugfixes and improvements</ni>
9 </version> 9 </version>
10 <version version="0.2" date="March 20th, 2011"> 10 <version version="0.2" date="March 20th, 2011">
11 <ni>extract and store .log files supplied for geotagging purpose</ni> 11 <ni>extract and store .log files supplied for geotagging purpose</ni>
12 <ni>added a sample script for geotagging photos based on the log file</ni> 12 <ni>added a sample script for geotagging photos based on the log file</ni>
13 <ni>improved compatibility with Geo X2 card</ni> 13 <ni>improved compatibility with Geo X2 card</ni>
14 <ni>added script for post-processing uploaded photo (sort by exif 14 <ni>added script for post-processing uploaded photo (sort by exif
15 timestamp)</ni> 15 timestamp)</ni>
16 <ni>added utility to extract chunks from RIFF (video) files to assist in 16 <ni>added utility to extract chunks from RIFF (video) files to assist in
17 automatic sorting of videos</ni> 17 automatic sorting of videos</ni>
18 <ni>minor internal changes</ni> 18 <ni>minor internal changes</ni>
19 </version> 19 </version>
20 <version version="0.1" date="April 5th, 2009"> 20 <version version="0.1" date="April 5th, 2009">
21 <ni>integrity digest verification</ni> 21 <ni>integrity digest verification</ni>
22 <ni>try to create upload directory if it doesn't exist</ni> 22 <ni>try to create upload directory if it doesn't exist</ni>
23 </version> 23 </version>
24 <version version="0.0" date="March 8th, 2009"> 24 <version version="0.0" date="March 8th, 2009">
25 <ni>Initial release</ni> 25 <ni>Initial release</ni>
26 </version> 26 </version>
27</news> 27</news>
diff --git a/configure.ac b/configure.ac
index 99d668d..c814b53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,75 +1,75 @@
1AC_INIT([iii], [0.2.1], [iii-bugs@klever.net]) 1AC_INIT([iii], [0.3], [iii-bugs@klever.net])
2AC_CONFIG_SRCDIR([src/iiid.cc]) 2AC_CONFIG_SRCDIR([src/iiid.cc])
3AC_CONFIG_HEADERS([config.h]) 3AC_CONFIG_HEADERS([config.h])
4AM_INIT_AUTOMAKE([dist-bzip2]) 4AM_INIT_AUTOMAKE([dist-bzip2])
5 5
6AC_PROG_INSTALL 6AC_PROG_INSTALL
7AC_PROG_CXX 7AC_PROG_CXX
8AC_PROG_CC 8AC_PROG_CC
9PKG_PROG_PKG_CONFIG 9PKG_PROG_PKG_CONFIG
10 10
11AC_HEADER_STDC 11AC_HEADER_STDC
12 12
13AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) 13AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
14 14
15PKG_CHECK_MODULES([MODULES],[gsoap++ libcrypto libconfuse]) 15PKG_CHECK_MODULES([MODULES],[gsoap++ libcrypto libconfuse])
16PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) 16PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false])
17AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) 17AM_CONDITIONAL([HAVE_UUID],[$have_uuid])
18if $have_uuid ; then 18if $have_uuid ; then
19 AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid]) 19 AC_DEFINE([HAVE_LIBUUID],,[defined in presence of libuuid])
20 AC_SUBST([UUID_UUID],[uuid]) 20 AC_SUBST([UUID_UUID],[uuid])
21fi 21fi
22 22
23AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false]) 23AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false])
24test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.]) 24test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.])
25 25
26notfound=false 26notfound=false
27AC_CHECK_HEADERS([archive.h],[ 27AC_CHECK_HEADERS([archive.h],[
28 AC_CHECK_LIB([archive],[archive_read_new],,[notfound=true]) 28 AC_CHECK_LIB([archive],[archive_read_new],,[notfound=true])
29],[notfound=true]) 29],[notfound=true])
30$notfound && AC_MSG_ERROR([no required libarchive library found. get one from http://people.freebsd.org/~kientzle/libarchive/]) 30$notfound && AC_MSG_ERROR([no required libarchive library found. get one from http://people.freebsd.org/~kientzle/libarchive/])
31 31
32notfound=false 32notfound=false
33AC_LANG_PUSH([C++]) 33AC_LANG_PUSH([C++])
34AC_CHECK_HEADERS([autosprintf.h],[ 34AC_CHECK_HEADERS([autosprintf.h],[
35 AC_CHECK_LIB([asprintf],[main],,[notfound=true]) 35 AC_CHECK_LIB([asprintf],[main],,[notfound=true])
36],[notfound=true]) 36],[notfound=true])
37$notfound && AC_MSG_ERROR([no autosprintf, part of gettext, found]) 37$notfound && AC_MSG_ERROR([no autosprintf, part of gettext, found])
38AC_LANG_POP([C++]) 38AC_LANG_POP([C++])
39 39
40nitpick=false 40nitpick=false
41AC_ARG_ENABLE([nitpicking], 41AC_ARG_ENABLE([nitpicking],
42 AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]), 42 AC_HELP_STRING([--enable-nitpicking],[make compiler somewhat overly fastidious about the code it deals with]),
43 [ test "$enableval" = "no" || nitpick=true ] 43 [ test "$enableval" = "no" || nitpick=true ]
44) 44)
45if $nitpick ; then 45if $nitpick ; then
46 CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \ 46 CPP_NITPICK="-pedantic -Wall -Wextra -Wundef -Wshadow \
47 -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \ 47 -Wunsafe-loop-optimizations -Wconversion -Wmissing-format-attribute \
48 -Wredundant-decls -ansi -Wlogical-op -Wmissing-noreturn" 48 -Wredundant-decls -ansi -Wlogical-op -Wmissing-noreturn"
49 C_NITPICK="$CPP_NITPICK" 49 C_NITPICK="$CPP_NITPICK"
50 CXX_NITPICK="$C_NITPICK" 50 CXX_NITPICK="$C_NITPICK"
51 51
52 CPPFLAGS="$CPPFLAGS $CPP_NITPICK" 52 CPPFLAGS="$CPPFLAGS $CPP_NITPICK"
53 CFLAGS="$CFLAGS $C_NITPICK" 53 CFLAGS="$CFLAGS $C_NITPICK"
54 CXXFLAGS="$CXXFLAGS $CXX_NITPICK" 54 CXXFLAGS="$CXXFLAGS $CXX_NITPICK"
55fi 55fi
56 56
57ndebug=true 57ndebug=true
58AC_ARG_ENABLE([debug], 58AC_ARG_ENABLE([debug],
59 AC_HELP_STRING([--enable-debug],[enable debugging code]), 59 AC_HELP_STRING([--enable-debug],[enable debugging code]),
60 [ test "$enableval" = "no" || ndebug=false ] 60 [ test "$enableval" = "no" || ndebug=false ]
61) 61)
62if $ndebug ; then 62if $ndebug ; then
63 CPPFLAGS_DEBUG="-DNDEBUG" 63 CPPFLAGS_DEBUG="-DNDEBUG"
64else 64else
65 CPPFLAGS_DEBUG="-DDEBUG" 65 CPPFLAGS_DEBUG="-DDEBUG"
66fi 66fi
67AC_SUBST([CPPFLAGS_DEBUG]) 67AC_SUBST([CPPFLAGS_DEBUG])
68 68
69AC_CONFIG_FILES([ 69AC_CONFIG_FILES([
70 Makefile 70 Makefile
71 src/Makefile 71 src/Makefile
72 doc/Makefile 72 doc/Makefile
73 doc/iiid.8 73 doc/iiid.8
74]) 74])
75AC_OUTPUT 75AC_OUTPUT