[network-manager-libreswan] shared: reimport shared files and reorganize

[Thomas Haller <thaller src gnome org>]

commit 14fae6faa650f31c34d9515903e47f7f83bf22dc
Author: Thomas Haller <thaller redhat com>
Date:   Thu Jun 16 13:19:35 2016 +0200

    shared: reimport shared files and reorganize
    
    The shared files got reorganized and the directory
    "shared/nm-vpn" got merged with "shared/nm-utils".
    Update the VPN plugin to do the same.
    
    Also, reimport and update the shared files with their
    latest version, fix the include paths and reword
    "shared/README".

 po/POTFILES.in                                     |    2 +-
 properties/nm-libreswan-editor-plugin.c            |    2 +-
 shared/Makefile.am                                 |    7 ++--
 shared/README                                      |   31 +++++--------------
 shared/{nm-vpn => nm-utils}/nm-vpn-plugin-macros.h |    0
 shared/{nm-vpn => nm-utils}/nm-vpn-plugin-utils.c  |    0
 shared/{nm-vpn => nm-utils}/nm-vpn-plugin-utils.h  |    0
 src/nm-libreswan-service-helper.c                  |    2 +-
 src/nm-libreswan-service.c                         |    2 +-
 9 files changed, 16 insertions(+), 30 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 089b619..7d394a6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,5 +7,5 @@ properties/nm-libreswan-editor.c
 src/nm-libreswan-service.c
 shared/utils.c
 shared/nm-utils/nm-shared-utils.c
-shared/nm-vpn/nm-vpn-plugin-utils.c
+shared/nm-utils/nm-vpn-plugin-utils.c
 [type: gettext/glade]properties/nm-libreswan-dialog.ui
diff --git a/properties/nm-libreswan-editor-plugin.c b/properties/nm-libreswan-editor-plugin.c
index ca7fb87..76f305b 100644
--- a/properties/nm-libreswan-editor-plugin.c
+++ b/properties/nm-libreswan-editor-plugin.c
@@ -37,7 +37,7 @@
 #ifdef NM_VPN_OLD
 #include "nm-libreswan-editor.h"
 #else
-#include "nm-vpn/nm-vpn-plugin-utils.h"
+#include "nm-utils/nm-vpn-plugin-utils.h"
 #endif
 
 #define LIBRESWAN_PLUGIN_NAME    _("IPsec based VPN")
diff --git a/shared/Makefile.am b/shared/Makefile.am
index c718518..b1e828e 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -48,9 +48,9 @@ libnm_vpn_editor_utils_shared_la_CPPFLAGS = \
     -I$(top_srcdir)/shared
 
 libnm_vpn_editor_utils_shared_la_SOURCES = \
-    nm-vpn/nm-vpn-plugin-utils.c \
-    nm-vpn/nm-vpn-plugin-utils.h \
-    nm-vpn/nm-vpn-plugin-macros.h
+    nm-utils/nm-vpn-plugin-utils.c \
+    nm-utils/nm-vpn-plugin-utils.h \
+    nm-utils/nm-vpn-plugin-macros.h
 
 libnm_vpn_editor_utils_shared_la_LIBADD = \
     $(LIBNM_LIBS) \
@@ -59,6 +59,7 @@ libnm_vpn_editor_utils_shared_la_LIBADD = \
 ###############################################################################
 
 EXTRA_DIST = \
+    README \
     nm-utils/gsystem-local-alloc.h \
     nm-utils/nm-glib.h \
     nm-utils/nm-macros-internal.h \
diff --git a/shared/README b/shared/README
index 960117d..3fe41ef 100644
--- a/shared/README
+++ b/shared/README
@@ -1,24 +1,9 @@
-The files in the "shared/" directory are supposed to be shared
-across NetworkManager related projects (reuse-by-copying).
-
-(1) the files
-    shared/nm-utils/gsystem-local-alloc.h
-    shared/nm-utils/nm-glib.h
-    shared/nm-utils/nm-macros-internal.h
-    shared/nm-utils/nm-shared-utils.c
-    shared/nm-utils/nm-shared-utils.h
-are copied as-is from NetworkManager
-  
https://cgit.freedesktop.org/NetworkManager/NetworkManager/tree/shared?id=9770024f63b85da604f1134a8bc8dc968278dcd1
-
-2) the files
-    shared/nm-vpn/nm-vpn-plugin-utils.c
-    shared/nm-vpn/nm-vpn-plugin-utils.h
-    shared/nm-vpn/nm-vpn-plugin-macros.h
-are copied as-is from nm-openvpn
-  
https://git.gnome.org/browse/network-manager-openvpn/tree/shared?id=3d0ac3ca94b4bf24f77306cef5a95172ddaf5fc4
-
-
-Do *not* modify these files locally so that they don't diverge.
-Fix/extend them in their respective origin first, and re-import
-the files as a whole.
+The files in the "shared/" directory are used by all components
+inside the VPN plugin repository (src, properties, auth-dialog).
+
+The files in shared/nm-utils are copied from NetworkManager
+repository and used as is:
+Do *not* modify these files locally so that they don't diverge
+from their original. Fix/extend them in their respective origin
+first, and re-import the files as a whole.
 
diff --git a/shared/nm-vpn/nm-vpn-plugin-macros.h b/shared/nm-utils/nm-vpn-plugin-macros.h
similarity index 100%
rename from shared/nm-vpn/nm-vpn-plugin-macros.h
rename to shared/nm-utils/nm-vpn-plugin-macros.h
diff --git a/shared/nm-vpn/nm-vpn-plugin-utils.c b/shared/nm-utils/nm-vpn-plugin-utils.c
similarity index 100%
rename from shared/nm-vpn/nm-vpn-plugin-utils.c
rename to shared/nm-utils/nm-vpn-plugin-utils.c
diff --git a/shared/nm-vpn/nm-vpn-plugin-utils.h b/shared/nm-utils/nm-vpn-plugin-utils.h
similarity index 100%
rename from shared/nm-vpn/nm-vpn-plugin-utils.h
rename to shared/nm-utils/nm-vpn-plugin-utils.h
diff --git a/src/nm-libreswan-service-helper.c b/src/nm-libreswan-service-helper.c
index d871fd2..4c4f3c8 100644
--- a/src/nm-libreswan-service-helper.c
+++ b/src/nm-libreswan-service-helper.c
@@ -27,7 +27,7 @@
 
 #include "nm-libreswan-helper-service-dbus.h"
 #include "nm-utils/nm-shared-utils.h"
-#include "nm-vpn/nm-vpn-plugin-macros.h"
+#include "nm-utils/nm-vpn-plugin-macros.h"
 
 extern char **environ;
 
diff --git a/src/nm-libreswan-service.c b/src/nm-libreswan-service.c
index a6cd9bf..e3c91f5 100644
--- a/src/nm-libreswan-service.c
+++ b/src/nm-libreswan-service.c
@@ -54,7 +54,7 @@
 #include "nm-libreswan-helper-service-dbus.h"
 #include "utils.h"
 #include "nm-utils/nm-shared-utils.h"
-#include "nm-vpn/nm-vpn-plugin-macros.h"
+#include "nm-utils/nm-vpn-plugin-macros.h"
 
 #if !defined(DIST_VERSION)
 # define DIST_VERSION VERSION