[network-manager-vpnc/th/tmp: 59/59] all: merge branch 'master' into nm-1-2

[Thomas Haller <thaller src gnome org>]

commit 65a9064f7ef21c684e9be4a068fc531b15bee306
Merge: 86c8fff b2da16d
Author: Thomas Haller <thaller redhat com>
Date:   Wed Sep 7 15:41:36 2016 +0200

    all: merge branch 'master' into nm-1-2
    
    With the release of 1.2.0, we branched off 'nm-1-2' branch
    and bumped the version number on 'master' to 1.3.0.
    
    As of today, 'master' still only requires 1.2.0 API of libnm, libnma
    and NetworkManager. Note that VPN plugins are backward compatible so
    that it is very much supported to run an older VPN plugin against a
    newer NM version.
    That means, there is no reason for maintaining two upstream branches
    'master' and 'nm-1-2' which both provide a plugin that has essentially
    the same requirements w.r.t. the NetworkManager API.
    
    Merge 'master' into 'nm-1-2' and rewind the version number from 1.3.0
    to 1.2.5. There is now only one maintained branch of the plugin that
    works with libnm/libnma/NetworkManager >= 1.2.0.
    
    This means a user stuck with 1.2 can get the newest features from
    master, instead of a stale 'nm-1-2' branch. Yes, that also means
    that upstream doesn't provide a bugfix-only branch of 1.2.
    But then, this is a tiny VPN plugin and not glibc. If a new 1.2.x
    version has issues it is simply a bug. In this case it's the
    responsibility of the user/distributor to cherry-pick the fix
    or revert to a previously working version.
    
    Conflicts:
        .gitignore
        Makefile.am
        configure.ac
        po/POTFILES.in
        po/es.po
        po/pl.po
        po/pt_BR.po

 .gitignore                                         |   11 +
 Makefile.am                                        |   22 +-
 auth-dialog/Makefile.am                            |    1 +
 auth-dialog/main.c                                 |    9 +-
 configure.ac                                       |   87 +-
 m4/compiler_warnings.m4                            |   99 +-
 nm-test-helpers.h                                  |   51 -
 nm-vpnc-service.conf                               |    4 +-
 nm-vpnc-service.name.in                            |    1 +
 po/POTFILES.in                                     |    5 +-
 po/cs.po                                           |    2 +-
 po/es.po                                           |   49 +-
 po/pl.po                                           |  206 ++-
 po/pt_BR.po                                        |  209 ++-
 properties/Makefile.am                             |  141 ++-
 properties/libnm-vpn-plugin-vpnc-editor.ver        |    6 +
 properties/libnm-vpn-plugin-vpnc.ver               |    6 +
 properties/libnm-vpnc-properties.ver               |    6 +
 properties/nm-vpnc-editor-plugin.c                 |  906 +++++++++
 properties/{nm-vpnc.h => nm-vpnc-editor-plugin.h}  |   36 +-
 properties/nm-vpnc-editor.c                        | 1054 +++++++++++
 properties/{nm-vpnc.h => nm-vpnc-editor.h}         |   33 +-
 properties/nm-vpnc-helper.c                        |    8 +-
 properties/nm-vpnc.c                               | 1918 --------------------
 properties/tests/Makefile.am                       |   46 +-
 properties/tests/test-import-export.c              |  540 +++----
 shared/Makefile.am                                 |   10 +
 shared/README                                      |    9 +
 shared/nm-default.h                                |  130 ++
 .../nm-service-defines.h                           |    9 +-
 shared/nm-utils/gsystem-local-alloc.h              |  208 +++
 shared/nm-utils/nm-glib.h                          |  397 ++++
 shared/nm-utils/nm-macros-internal.h               |  606 ++++++
 shared/nm-utils/nm-shared-utils.c                  |  239 +++
 shared/nm-utils/nm-shared-utils.h                  |   66 +
 shared/nm-utils/nm-test-utils.h                    | 1753 ++++++++++++++++++
 shared/nm-utils/nm-vpn-plugin-macros.h             |   43 +
 shared/nm-utils/nm-vpn-plugin-utils.c              |  130 ++
 shared/nm-utils/nm-vpn-plugin-utils.h              |   42 +
 src/Makefile.am                                    |   22 +-
 src/nm-vpnc-service-vpnc-helper.c                  |   97 +-
 src/nm-vpnc-service.c                              |  238 ++-
 src/nm-vpnc-service.h                              |    8 +-
 src/test-vpnc-output.c                             |    9 +-
 src/utils.c                                        |    5 +-
 src/utils.h                                        |    2 -
 46 files changed, 6740 insertions(+), 2739 deletions(-)
---
diff --cc configure.ac
index d033799,0c8b8b2..5b3fe38
--- a/configure.ac
+++ b/configure.ac
@@@ -1,10 -1,10 +1,10 @@@
  AC_PREREQ(2.52)
  
  AC_INIT(NetworkManager-vpnc,
-         1.2.3,
 -        1.3.0,
++        1.2.5,
          https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager,
          NetworkManager-vpnc)
- AM_INIT_AUTOMAKE([subdir-objects no-dist-gzip dist-xz])
+ AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
  AM_MAINTAINER_MODE
  
  AC_CONFIG_MACRO_DIR([m4])