-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | debian/compat | 2 | ||||
-rw-r--r-- | debian/control | 4 | ||||
-rwxr-xr-x | debian/iii.postinst | 2 | ||||
-rwxr-xr-x | debian/iii.postrm | 1 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | doc/000000000000.conf | 2 | ||||
-rw-r--r-- | src/eyefiservice.cc | 1 |
8 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index d580f58..f79983e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -12,7 +12,7 @@ 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++ libcrypto 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 |
diff --git a/debian/compat b/debian/compat index b8626c4..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat | |||
@@ -1 +1 @@ | |||
4 | 5 | ||
diff --git a/debian/control b/debian/control index 02a6138..aaa8c78 100644 --- a/debian/control +++ b/debian/control | |||
@@ -3,11 +3,11 @@ Section: graphics | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Maintainer: Michael Krelin <hacker@klever.net> | 4 | Maintainer: Michael Krelin <hacker@klever.net> |
5 | Build-Depends: debhelper (>=7), gsoap, libssl-dev, libconfuse-dev, libarchive-dev, gettext | 5 | Build-Depends: debhelper (>=7), gsoap, libssl-dev, libconfuse-dev, libarchive-dev, gettext |
6 | Standards-Version: 3.8.0 | 6 | Standards-Version: 3.8.4 |
7 | 7 | ||
8 | Package: iii | 8 | Package: iii |
9 | Architecture: any | 9 | Architecture: any |
10 | Depends: adduser, ${shlibs:Depends} | 10 | Depends: adduser, ${shlibs:Depends}, ${misc:Depends} |
11 | Description: Eye-Fi Manager implementation | 11 | Description: Eye-Fi Manager implementation |
12 | Implementation of Eye-Fi manager service for Linux | 12 | Implementation of Eye-Fi manager service for Linux |
13 | 13 | ||
diff --git a/debian/iii.postinst b/debian/iii.postinst index 20463a1..f52bf84 100755 --- a/debian/iii.postinst +++ b/debian/iii.postinst | |||
@@ -1,7 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | set -e | 2 | set -e |
3 | UG=eyefi | 3 | UG=eyefi |
4 | P=eyekindo | 4 | P=iii |
5 | H=/var/lib/$P | 5 | H=/var/lib/$P |
6 | 6 | ||
7 | if [ "$1" = configure ] ; then | 7 | if [ "$1" = configure ] ; then |
diff --git a/debian/iii.postrm b/debian/iii.postrm index a2c66fa..6060c4f 100755 --- a/debian/iii.postrm +++ b/debian/iii.postrm | |||
@@ -1,3 +1,4 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | set -e | ||
2 | 3 | ||
3 | #DEBHELPER# | 4 | #DEBHELPER# |
diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- a/dev/null +++ b/debian/source/format | |||
@@ -0,0 +1 @@ | |||
3.0 (native) | |||
diff --git a/doc/000000000000.conf b/doc/000000000000.conf index d7b365f..01f8fae 100644 --- a/doc/000000000000.conf +++ b/doc/000000000000.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | # target directory for uploaded files, if the name contains %s, it is replaced | 1 | # target directory for uploaded files, if the name contains %s, it is replaced |
2 | # with eyefi card mac address. | 2 | # with eyefi card mac address. |
3 | targetdir = "/var/lib/eyekindo/%s/" | 3 | targetdir = "/var/lib/iii/%s/" |
4 | # the upload key as seen in Mac and (perhaps) windows Settings.xml file | 4 | # the upload key as seen in Mac and (perhaps) windows Settings.xml file |
5 | uploadkey = "e3e2c4a305cee6bce0ebb38a3259ac08" | 5 | uploadkey = "e3e2c4a305cee6bce0ebb38a3259ac08" |
6 | 6 | ||
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index 49521e0..9650ec1 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc | |||
@@ -6,7 +6,6 @@ | |||
6 | #include <syslog.h> | 6 | #include <syslog.h> |
7 | #include <sys/wait.h> | 7 | #include <sys/wait.h> |
8 | #include <autosprintf.h> | 8 | #include <autosprintf.h> |
9 | #include <openssl/rand.h> | ||
10 | #include "eyekinfig.h" | 9 | #include "eyekinfig.h" |
11 | #include "eyetil.h" | 10 | #include "eyetil.h" |
12 | #include "soapeyefiService.h" | 11 | #include "soapeyefiService.h" |