summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--COPYING2
-rw-r--r--NEWS.xml8
-rw-r--r--configure.ac2
-rw-r--r--doc/iiid.8.in2
4 files changed, 11 insertions, 3 deletions
diff --git a/COPYING b/COPYING
index cd9344f..9579d6d 100644
--- a/COPYING
+++ b/COPYING
@@ -1,19 +1,19 @@
1Copyright (c) 2009-2010 Klever Group (http://www.klever.net/) 1Copyright (c) 2009-2011 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 fbe55a1..10f18db 100644
--- a/NEWS.xml
+++ b/NEWS.xml
@@ -1,10 +1,18 @@
1<?xml version="1.0" encoding="us-ascii"?> 1<?xml version="1.0" encoding="us-ascii"?>
2<news> 2<news>
3 <version version="0.2" date="March ??th, 2011">
4 <ni>improved compatibility with Geo X2 card</ni>
5 <ni>extract and store .log files supplied for geotagging purpose</ni>
6 <ni>added script for post-processing uploaded photo (sort by exif
7 timestamp)</ni>
8 <ni>added utility to extract chunks from RIFF (video) files to assist in
9 automatic sorting of videos</ni>
10 </version>
3 <version version="0.1" date="April 5th, 2009"> 11 <version version="0.1" date="April 5th, 2009">
4 <ni>integrity digest verification</ni> 12 <ni>integrity digest verification</ni>
5 <ni>try to create upload directory if it doesn't exist</ni> 13 <ni>try to create upload directory if it doesn't exist</ni>
6 </version> 14 </version>
7 <version version="0.0" date="March 8th, 2009"> 15 <version version="0.0" date="March 8th, 2009">
8 <ni>Initial release</ni> 16 <ni>Initial release</ni>
9 </version> 17 </version>
10</news> 18</news>
diff --git a/configure.ac b/configure.ac
index a719cdd..d580f58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,25 +1,25 @@
1AC_INIT([iii], [0.1], [iii-bugs@klever.net]) 1AC_INIT([iii], [0.2], [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++ openssl libconfuse]) 15PKG_CHECK_MODULES([MODULES],[gsoap++ openssl 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
diff --git a/doc/iiid.8.in b/doc/iiid.8.in
index 63a941e..533ed18 100644
--- a/doc/iiid.8.in
+++ b/doc/iiid.8.in
@@ -60,47 +60,47 @@ present in the string, it is replaced with card mac address.
60The upload key as seen in Mac/Windows Settings.xml file. 60The upload key as seen in Mac/Windows Settings.xml file.
61.TP 61.TP
62\fBon-start-session\fR = "\fIlogger iii-StartSession ${EYEFI_MACADDRESS} ${EYEFI_TRANSFER_MODE} ${EYEFI_TRANSFERMODETIMESTAMP}\fR" 62\fBon-start-session\fR = "\fIlogger iii-StartSession ${EYEFI_MACADDRESS} ${EYEFI_TRANSFER_MODE} ${EYEFI_TRANSFERMODETIMESTAMP}\fR"
63The command to execute on \fBStartSession\fR request. The command receives some 63The command to execute on \fBStartSession\fR request. The command receives some
64information via environment variables. 64information via environment variables.
65.TP 65.TP
66\fBon-upload-photo\fR = "\fIlogger iii-UploadPhoto ${EYEFI_MACADDRESS} ${EYEFI_UPLOADED}\fR" 66\fBon-upload-photo\fR = "\fIlogger iii-UploadPhoto ${EYEFI_MACADDRESS} ${EYEFI_UPLOADED}\fR"
67The command to execute after successfull photo upload. The information about 67The command to execute after successfull photo upload. The information about
68the card mac address and uploaded file name is passed via environment 68the card mac address and uploaded file name is passed via environment
69variables. 69variables.
70.TP 70.TP
71\fBon-mark-last-photo-in-roll\fR = "\fIlogger iii-MarkLastPhotoInRoll ${EYEFI_MACADDRESS} ${EYEFI_MERGEDELTA}\fR" 71\fBon-mark-last-photo-in-roll\fR = "\fIlogger iii-MarkLastPhotoInRoll ${EYEFI_MACADDRESS} ${EYEFI_MERGEDELTA}\fR"
72The command to execute on \fBMarkLastPhotoInRoll\fR request. The information 72The command to execute on \fBMarkLastPhotoInRoll\fR request. The information
73about request is passed via environment variables. 73about request is passed via environment variables.
74.TP 74.TP
75\fBumask\fR = \fI002\fR 75\fBumask\fR = \fI002\fR
76The file mode creation mask. 76The file mode creation mask.
77 77
78.SH AUTHOR 78.SH AUTHOR
79 79
80Written by Michael Krelin <hacker@klever.net> 80Written by Michael Krelin <hacker@klever.net>
81 81
82.SH COPYRIGHT 82.SH COPYRIGHT
83 83
84Copyright (c) 2009 Klever Group (http://www.klever.net/) 84Copyright (c) 2009-2011 Klever Group (http://www.klever.net/)
85 85
86Permission is hereby granted, free of charge, to any person obtaining a copy of 86Permission is hereby granted, free of charge, to any person obtaining a copy of
87this software and associated documentation files (the "Software"), to deal in 87this software and associated documentation files (the "Software"), to deal in
88the Software without restriction, including without limitation the rights to 88the Software without restriction, including without limitation the rights to
89use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 89use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
90of the Software, and to permit persons to whom the Software is furnished to do 90of the Software, and to permit persons to whom the Software is furnished to do
91so, subject to the following conditions: 91so, subject to the following conditions:
92 92
93The above copyright notice and this permission notice shall be included in all 93The above copyright notice and this permission notice shall be included in all
94copies or substantial portions of the Software. 94copies or substantial portions of the Software.
95 95
96THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 96THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
97IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 97IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
98FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 98FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
99AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 99AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
100LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 100LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
101OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 101OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
102SOFTWARE. 102SOFTWARE.
103 103
104.SH BUGS 104.SH BUGS
105 105
106You tell me. Send reports to <iii-bugs@klever.net> 106You tell me. Send reports to <iii-bugs@klever.net>