From 2de928dc64b59a31326e05487f3bd9c428e0ffaa Mon Sep 17 00:00:00 2001
From: thunder2 <retroshare.project@gmail.com>
Date: Mon, 3 Dec 2012 16:20:44 +0000
Subject: [PATCH] Moved new files for ops_open from util to openpgpsdk.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5935 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 openpgpsdk/src/openpgpsdk.pro                   | 8 ++++----
 openpgpsdk/src/openpgpsdk/create.c              | 2 +-
 openpgpsdk/src/openpgpsdk/crypto.c              | 2 +-
 openpgpsdk/src/openpgpsdk/keyring.c             | 2 +-
 openpgpsdk/src/{util => openpgpsdk}/opsdir.c    | 0
 openpgpsdk/src/{util => openpgpsdk}/opsdir.h    | 0
 openpgpsdk/src/{util => openpgpsdk}/opsstring.c | 0
 openpgpsdk/src/{util => openpgpsdk}/opsstring.h | 0
 openpgpsdk/src/openpgpsdk/readerwriter.c        | 2 +-
 openpgpsdk/src/openpgpsdk/signature.c           | 2 +-
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename openpgpsdk/src/{util => openpgpsdk}/opsdir.c (100%)
 rename openpgpsdk/src/{util => openpgpsdk}/opsdir.h (100%)
 rename openpgpsdk/src/{util => openpgpsdk}/opsstring.c (100%)
 rename openpgpsdk/src/{util => openpgpsdk}/opsstring.h (100%)

diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro
index 536f808fd..c7b58edbd 100644
--- a/openpgpsdk/src/openpgpsdk.pro
+++ b/openpgpsdk/src/openpgpsdk.pro
@@ -68,8 +68,8 @@ HEADERS += openpgpsdk/writer.h \
            openpgpsdk/armour.h \
            openpgpsdk/parse_local.h \
            openpgpsdk/keyring_local.h \
-           util/opsdir.h \
-           util/opsstring.h
+           openpgpsdk/opsdir.h \
+           openpgpsdk/opsstring.h
 
 SOURCES += openpgpsdk/accumulate.c \
            openpgpsdk/compress.c \
@@ -108,5 +108,5 @@ SOURCES += openpgpsdk/accumulate.c \
            openpgpsdk/writer_memory.c \
            openpgpsdk/writer_skey_checksum.c \
            openpgpsdk/writer_stream_encrypt_se_ip.c \
-           util/opsdir.c \
-           util/opsstring.c
+           openpgpsdk/opsdir.c \
+           openpgpsdk/opsstring.c
diff --git a/openpgpsdk/src/openpgpsdk/create.c b/openpgpsdk/src/openpgpsdk/create.c
index ed36067f5..c03896d5a 100644
--- a/openpgpsdk/src/openpgpsdk/create.c
+++ b/openpgpsdk/src/openpgpsdk/create.c
@@ -40,7 +40,7 @@
 #ifndef WIN32
 #include <unistd.h>
 #endif
-#include <util/opsdir.h>
+#include <openpgpsdk/opsdir.h>
 
 #include <openpgpsdk/writer.h>
 #include <openpgpsdk/final.h>
diff --git a/openpgpsdk/src/openpgpsdk/crypto.c b/openpgpsdk/src/openpgpsdk/crypto.c
index 3218fc507..d6c2382ab 100644
--- a/openpgpsdk/src/openpgpsdk/crypto.c
+++ b/openpgpsdk/src/openpgpsdk/crypto.c
@@ -33,7 +33,7 @@
 #include <fcntl.h>
 
 #include <openpgpsdk/final.h>
-#include <util/opsdir.h>
+#include <openpgpsdk/opsdir.h>
 
 /**
 \ingroup Core_MPI
diff --git a/openpgpsdk/src/openpgpsdk/keyring.c b/openpgpsdk/src/openpgpsdk/keyring.c
index ae705928d..807c2734c 100644
--- a/openpgpsdk/src/openpgpsdk/keyring.c
+++ b/openpgpsdk/src/openpgpsdk/keyring.c
@@ -46,7 +46,7 @@
 #include <assert.h>
 
 #include <openpgpsdk/final.h>
-#include <util/opsdir.h>
+#include <openpgpsdk/opsdir.h>
 
 /**
    \ingroup HighLevel_Keyring
diff --git a/openpgpsdk/src/util/opsdir.c b/openpgpsdk/src/openpgpsdk/opsdir.c
similarity index 100%
rename from openpgpsdk/src/util/opsdir.c
rename to openpgpsdk/src/openpgpsdk/opsdir.c
diff --git a/openpgpsdk/src/util/opsdir.h b/openpgpsdk/src/openpgpsdk/opsdir.h
similarity index 100%
rename from openpgpsdk/src/util/opsdir.h
rename to openpgpsdk/src/openpgpsdk/opsdir.h
diff --git a/openpgpsdk/src/util/opsstring.c b/openpgpsdk/src/openpgpsdk/opsstring.c
similarity index 100%
rename from openpgpsdk/src/util/opsstring.c
rename to openpgpsdk/src/openpgpsdk/opsstring.c
diff --git a/openpgpsdk/src/util/opsstring.h b/openpgpsdk/src/openpgpsdk/opsstring.h
similarity index 100%
rename from openpgpsdk/src/util/opsstring.h
rename to openpgpsdk/src/openpgpsdk/opsstring.h
diff --git a/openpgpsdk/src/openpgpsdk/readerwriter.c b/openpgpsdk/src/openpgpsdk/readerwriter.c
index a5434a0e7..493b9b318 100644
--- a/openpgpsdk/src/openpgpsdk/readerwriter.c
+++ b/openpgpsdk/src/openpgpsdk/readerwriter.c
@@ -32,7 +32,7 @@
 
 #include <openpgpsdk/readerwriter.h>
 #include <openpgpsdk/callback.h>
-#include <util/opsdir.h>
+#include <openpgpsdk/opsdir.h>
 
 #include "parse_local.h"
 
diff --git a/openpgpsdk/src/openpgpsdk/signature.c b/openpgpsdk/src/openpgpsdk/signature.c
index 875d3dde3..af94d6854 100644
--- a/openpgpsdk/src/openpgpsdk/signature.c
+++ b/openpgpsdk/src/openpgpsdk/signature.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 
 #include <openpgpsdk/final.h>
-#include <util/opsdir.h>
+#include <openpgpsdk/opsdir.h>
 
 #include <openssl/dsa.h>