diff options
-rw-r--r-- | debian/changelog | 10 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rw-r--r-- | debian/patches/use_libnm.pc.diff | 78 |
3 files changed, 9 insertions, 80 deletions
diff --git a/debian/changelog b/debian/changelog index daaff37..1751cd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,17 @@ +network-manager-strongswan (1.4.4-1) UNRELEASED; urgency=medium + + * new upstream version 1.4.4: + * improved German translation + * libnm.pc change included, local patch has been dropped + + -- Harald Dunkel <harri@afaics.de> Thu, 10 May 2018 18:55:05 +0200 + network-manager-strongswan (1.4.3-2) unstable; urgency=medium * new upstream version 1.4.3 * drop deprecated libnm-glib/libnm-gtk libraries (Closes: #887951) * Don't rely on NetworkManager.pc for paths when building without - libnm-glib + libnm-glib. Patch provided by upstream. * skip revision 1.4.3-1, due to problems discovered during review. -- Harald Dunkel <harri@afaics.de> Mon, 30 Apr 2018 16:44:16 +0200 diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index cae45e2..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -use_libnm.pc.diff diff --git a/debian/patches/use_libnm.pc.diff b/debian/patches/use_libnm.pc.diff deleted file mode 100644 index 0cff7e4..0000000 --- a/debian/patches/use_libnm.pc.diff +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 2b022bf87..9b8c6765a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,7 +2,6 @@ AUTOMAKE_OPTIONS = foreign - - SUBDIRS = properties auth-dialog po - --nmvpnservicedir = $(prefix)/lib/NetworkManager/VPN - nmvpnservice_DATA = nm-strongswan-service.name - - @INTLTOOL_DESKTOP_RULE@ -diff --git a/configure.ac b/configure.ac -index 1d3b4c9d1..1d774931c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -48,17 +48,27 @@ PKG_CHECK_MODULES(LIBSECRET, libsecret-1) - - AC_ARG_WITH( - [charon], -- AS_HELP_STRING([--with-charon=file],[path to the strongSwan charon NetworkManager backend"]), -+ AS_HELP_STRING([--with-charon=file],[path to the strongSwan charon NetworkManager backend]), - [AC_SUBST(charon, "$withval")], - [AC_SUBST(charon, "${libexecdir}/ipsec/charon-nm")] - ) -+AC_ARG_WITH( -+ [nm-libexecdir], -+ AS_HELP_STRING([--nm-libexecdir=path],[use custom path where the auth dialog is installed]), -+ [nm_libexecdir="$withval"], [] -+) -+AC_ARG_WITH( -+ [nm-plugindir], -+ AS_HELP_STRING([--nm-plugindir=path],[use custom path where the NM plugin is installed]), -+ [nm_plugindir="$withval"], [] -+) - AC_ARG_ENABLE( - [nm-absolute-paths], - AS_HELP_STRING([--enable-nm-absolute-paths],[use absolute paths for NM plugins in the .name file]) - ) - AC_ARG_WITH( - [libnm-glib], -- AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-strongswan without libnm-glib comatibility]), -+ AS_HELP_STRING([--without-libnm-glib], [build NetworkManager-strongswan without libnm-glib comatibility]), - [with_libnm_glib=no], - [with_libnm_glib=yes] - ) -@@ -73,15 +83,29 @@ PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0) - if test x"$with_libnm_glib" != xno; then - PKG_CHECK_MODULES(LIBNM_GLIB, NetworkManager >= 1.1.0 libnm-util libnm-glib libnm-glib-vpn) - PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.1.0) -+ if test -z "$nm_libexecdir"; then -+ nm_libexecdir=$($PKG_CONFIG --variable=libgnome_serverdir NetworkManager) -+ fi -+ if test -z "$nm_plugindir"; then -+ nm_plugindir=$($PKG_CONFIG --variable=plugindir NetworkManager) -+ fi -+else -+ if test -z "$nm_libexecdir"; then -+ nm_libexecdir=$($PKG_CONFIG --variable=exec_prefix libnm)/lib/NetworkManager -+ fi -+ if test -z "$nm_plugindir"; then -+ nm_plugindir=$($PKG_CONFIG --variable=libdir libnm)/NetworkManager -+ fi - fi - --nm_libexecdir=$($PKG_CONFIG --variable=libgnome_serverdir NetworkManager) - AC_SUBST(nm_libexecdir) --nm_plugindir=$($PKG_CONFIG --variable=plugindir NetworkManager) - AC_SUBST(nm_plugindir) - test x"$enable_nm_absolute_paths" = x"yes" && nm_plugindir_abs="$(nm_plugindir)/" - AC_SUBST(nm_plugindir_abs) - -+nmvpnservicedir=$($PKG_CONFIG --variable=vpnservicedir libnm) -+AC_SUBST(nmvpnservicedir) -+ - NM_COMPILER_WARNINGS - - AC_CONFIG_FILES([ |