summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--configure.ac2
-rw-r--r--debian/compat2
-rw-r--r--debian/control4
-rwxr-xr-xdebian/iii.postinst2
-rwxr-xr-xdebian/iii.postrm1
-rw-r--r--debian/source/format1
-rw-r--r--doc/000000000000.conf2
-rw-r--r--src/eyefiservice.cc1
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
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++ 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
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
3Priority: optional 3Priority: optional
4Maintainer: Michael Krelin <hacker@klever.net> 4Maintainer: Michael Krelin <hacker@klever.net>
5Build-Depends: debhelper (>=7), gsoap, libssl-dev, libconfuse-dev, libarchive-dev, gettext 5Build-Depends: debhelper (>=7), gsoap, libssl-dev, libconfuse-dev, libarchive-dev, gettext
6Standards-Version: 3.8.0 6Standards-Version: 3.8.4
7 7
8Package: iii 8Package: iii
9Architecture: any 9Architecture: any
10Depends: adduser, ${shlibs:Depends} 10Depends: adduser, ${shlibs:Depends}, ${misc:Depends}
11Description: Eye-Fi Manager implementation 11Description: 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
2set -e 2set -e
3UG=eyefi 3UG=eyefi
4P=eyekindo 4P=iii
5H=/var/lib/$P 5H=/var/lib/$P
6 6
7if [ "$1" = configure ] ; then 7if [ "$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
2set -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.
3targetdir = "/var/lib/eyekindo/%s/" 3targetdir = "/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
5uploadkey = "e3e2c4a305cee6bce0ebb38a3259ac08" 5uploadkey = "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"