summaryrefslogtreecommitdiffabout
Side-by-side diff
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
@@ -14,3 +14,3 @@ AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
-PKG_CHECK_MODULES([MODULES],[gsoap++ openssl libconfuse])
+PKG_CHECK_MODULES([MODULES],[gsoap++ libcrypto libconfuse])
PKG_CHECK_MODULES([UUID],[uuid],[have_uuid=true],[have_uuid=false])
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
@@ -5,3 +5,3 @@ Maintainer: Michael Krelin <hacker@klever.net>
Build-Depends: debhelper (>=7), gsoap, libssl-dev, libconfuse-dev, libarchive-dev, gettext
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
@@ -9,3 +9,3 @@ Package: iii
Architecture: any
-Depends: adduser, ${shlibs:Depends}
+Depends: adduser, ${shlibs:Depends}, ${misc:Depends}
Description: Eye-Fi Manager implementation
diff --git a/debian/iii.postinst b/debian/iii.postinst
index 20463a1..f52bf84 100755
--- a/debian/iii.postinst
+++ b/debian/iii.postinst
@@ -3,3 +3,3 @@ set -e
UG=eyefi
-P=eyekindo
+P=iii
H=/var/lib/$P
diff --git a/debian/iii.postrm b/debian/iii.postrm
index a2c66fa..6060c4f 100755
--- a/debian/iii.postrm
+++ b/debian/iii.postrm
@@ -1,2 +1,3 @@
#!/bin/sh
+set -e
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
@@ -2,3 +2,3 @@
# with eyefi card mac address.
-targetdir = "/var/lib/eyekindo/%s/"
+targetdir = "/var/lib/iii/%s/"
# the upload key as seen in Mac and (perhaps) windows Settings.xml file
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 49521e0..9650ec1 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -8,3 +8,2 @@
#include <autosprintf.h>
-#include <openssl/rand.h>
#include "eyekinfig.h"