-rw-r--r-- | COPYING | 2 | ||||
-rw-r--r-- | NEWS.xml | 8 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | doc/iiid.8.in | 2 |
4 files changed, 11 insertions, 3 deletions
@@ -1,19 +1,19 @@ | |||
1 | Copyright (c) 2009-2010 Klever Group (http://www.klever.net/) | 1 | Copyright (c) 2009-2011 Klever Group (http://www.klever.net/) |
2 | 2 | ||
3 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 3 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
4 | this software and associated documentation files (the "Software"), to deal in | 4 | this software and associated documentation files (the "Software"), to deal in |
5 | the Software without restriction, including without limitation the rights to | 5 | the Software without restriction, including without limitation the rights to |
6 | use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies | 6 | use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies |
7 | of the Software, and to permit persons to whom the Software is furnished to do | 7 | of the Software, and to permit persons to whom the Software is furnished to do |
8 | so, subject to the following conditions: | 8 | so, subject to the following conditions: |
9 | 9 | ||
10 | The above copyright notice and this permission notice shall be included in all | 10 | The above copyright notice and this permission notice shall be included in all |
11 | copies or substantial portions of the Software. | 11 | copies or substantial portions of the Software. |
12 | 12 | ||
13 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | 13 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
14 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 14 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
15 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | 15 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
16 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | 16 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
17 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | 17 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
18 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 18 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
19 | SOFTWARE. | 19 | SOFTWARE. |
@@ -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 @@ | |||
1 | AC_INIT([iii], [0.1], [iii-bugs@klever.net]) | 1 | AC_INIT([iii], [0.2], [iii-bugs@klever.net]) |
2 | AC_CONFIG_SRCDIR([src/iiid.cc]) | 2 | AC_CONFIG_SRCDIR([src/iiid.cc]) |
3 | AC_CONFIG_HEADERS([config.h]) | 3 | AC_CONFIG_HEADERS([config.h]) |
4 | AM_INIT_AUTOMAKE([dist-bzip2]) | 4 | AM_INIT_AUTOMAKE([dist-bzip2]) |
5 | 5 | ||
6 | AC_PROG_INSTALL | 6 | AC_PROG_INSTALL |
7 | AC_PROG_CXX | 7 | AC_PROG_CXX |
8 | AC_PROG_CC | 8 | AC_PROG_CC |
9 | PKG_PROG_PKG_CONFIG | 9 | PKG_PROG_PKG_CONFIG |
10 | 10 | ||
11 | AC_HEADER_STDC | 11 | AC_HEADER_STDC |
12 | 12 | ||
13 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) | 13 | AC_PATH_PROG([XSLTPROC],[xsltproc],[true]) |
14 | 14 | ||
15 | PKG_CHECK_MODULES([MODULES],[gsoap++ openssl libconfuse]) | 15 | PKG_CHECK_MODULES([MODULES],[gsoap++ openssl libconfuse]) |
16 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) | 16 | PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false]) |
17 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) | 17 | AM_CONDITIONAL([HAVE_UUID],[$have_uuid]) |
18 | if $have_uuid ; then | 18 | if $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]) |
21 | fi | 21 | fi |
22 | 22 | ||
23 | AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false]) | 23 | AC_PATH_PROG([SOAPCPP2],[soapcpp2],[false]) |
24 | test "$SOAPCPP2" = "false" && AC_MSG_ERROR([no soapcpp2 tool, part of gsoap package, found.]) | 24 | test "$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. | |||
60 | The upload key as seen in Mac/Windows Settings.xml file. | 60 | The 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" |
63 | The command to execute on \fBStartSession\fR request. The command receives some | 63 | The command to execute on \fBStartSession\fR request. The command receives some |
64 | information via environment variables. | 64 | information 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" |
67 | The command to execute after successfull photo upload. The information about | 67 | The command to execute after successfull photo upload. The information about |
68 | the card mac address and uploaded file name is passed via environment | 68 | the card mac address and uploaded file name is passed via environment |
69 | variables. | 69 | variables. |
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" |
72 | The command to execute on \fBMarkLastPhotoInRoll\fR request. The information | 72 | The command to execute on \fBMarkLastPhotoInRoll\fR request. The information |
73 | about request is passed via environment variables. | 73 | about request is passed via environment variables. |
74 | .TP | 74 | .TP |
75 | \fBumask\fR = \fI002\fR | 75 | \fBumask\fR = \fI002\fR |
76 | The file mode creation mask. | 76 | The file mode creation mask. |
77 | 77 | ||
78 | .SH AUTHOR | 78 | .SH AUTHOR |
79 | 79 | ||
80 | Written by Michael Krelin <hacker@klever.net> | 80 | Written by Michael Krelin <hacker@klever.net> |
81 | 81 | ||
82 | .SH COPYRIGHT | 82 | .SH COPYRIGHT |
83 | 83 | ||
84 | Copyright (c) 2009 Klever Group (http://www.klever.net/) | 84 | Copyright (c) 2009-2011 Klever Group (http://www.klever.net/) |
85 | 85 | ||
86 | Permission is hereby granted, free of charge, to any person obtaining a copy of | 86 | Permission is hereby granted, free of charge, to any person obtaining a copy of |
87 | this software and associated documentation files (the "Software"), to deal in | 87 | this software and associated documentation files (the "Software"), to deal in |
88 | the Software without restriction, including without limitation the rights to | 88 | the Software without restriction, including without limitation the rights to |
89 | use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies | 89 | use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies |
90 | of the Software, and to permit persons to whom the Software is furnished to do | 90 | of the Software, and to permit persons to whom the Software is furnished to do |
91 | so, subject to the following conditions: | 91 | so, subject to the following conditions: |
92 | 92 | ||
93 | The above copyright notice and this permission notice shall be included in all | 93 | The above copyright notice and this permission notice shall be included in all |
94 | copies or substantial portions of the Software. | 94 | copies or substantial portions of the Software. |
95 | 95 | ||
96 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | 96 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
97 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 97 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
98 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | 98 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
99 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | 99 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
100 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | 100 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
101 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 101 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
102 | SOFTWARE. | 102 | SOFTWARE. |
103 | 103 | ||
104 | .SH BUGS | 104 | .SH BUGS |
105 | 105 | ||
106 | You tell me. Send reports to <iii-bugs@klever.net> | 106 | You tell me. Send reports to <iii-bugs@klever.net> |