From d58947f6173fc2ebec5ac8734e2daa27b0e2e3fc Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl debian org>
Date: Fri, 22 Jan 2016 00:28:28 +0100
Subject: [PATCH] Revert "Install a desktop file for nm-vpnc-auth-dialog"

This reverts commit ae326938797b93dbc07df07296f9b00c5b042f69.

The plugin uses supports-external-ui-mode=true nowadays. This means
gnome-shell no longer needs to start nm-vpnc-auth-dialog but uses
builtin dialogs to prompt for authentication.
---
 acinclude.m4                                  | 40 ---------------------------
 auth-dialog/Makefile.am                       | 15 +---------
 auth-dialog/nm-vpnc-auth-dialog.desktop.in.in |  7 -----
 configure.ac                                  |  3 --
 4 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 acinclude.m4
 delete mode 100644 auth-dialog/nm-vpnc-auth-dialog.desktop.in.in

diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 0c71173..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,40 +0,0 @@
-dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-dnl
-dnl example
-dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
-
-AC_DEFUN([AS_AC_EXPAND],
-[
-  EXP_VAR=[$1]
-  FROM_VAR=[$2]
-
-  dnl first expand prefix and exec_prefix if necessary
-  prefix_save=$prefix
-  exec_prefix_save=$exec_prefix
-
-  dnl if no prefix given, then use /usr/local, the default prefix
-  if test "x$prefix" = "xNONE"; then
-    prefix=$ac_default_prefix
-  fi
-  dnl if no exec_prefix given, then use prefix
-  if test "x$exec_prefix" = "xNONE"; then
-    exec_prefix=$prefix
-  fi
-
-  full_var="$FROM_VAR"
-  dnl loop until it doesn't change anymore
-  while true; do
-    new_full_var="`eval echo $full_var`"
-    if test "x$new_full_var"="x$full_var"; then break; fi
-    full_var=$new_full_var
-  done
-
-  dnl clean up
-  full_var=$new_full_var
-  AC_SUBST([$1], "$full_var")
-
-  dnl restore prefix and exec_prefix
-  prefix=$prefix_save
-  exec_prefix=$exec_prefix_save
-])
diff --git a/auth-dialog/Makefile.am b/auth-dialog/Makefile.am
index 580e1a6..9add74a 100644
--- a/auth-dialog/Makefile.am
+++ b/auth-dialog/Makefile.am
@@ -19,18 +19,5 @@ nm_vpnc_auth_dialog_LDADD = \
 	$(LIBNMA_LIBS) \
 	$(LIBSECRET_LIBS)
 
- INTLTOOL_DESKTOP_RULE@
-desktopdir = $(datadir)/applications
-desktop_in_in_files = nm-vpnc-auth-dialog.desktop.in.in
-desktop_in_files = nm-vpnc-auth-dialog.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+CLEANFILES = *~
 
-EXTRA_DIST = \
-	$(desktop_in_in_files)
-
-CLEANFILES = \
-	*~ \
-	$(desktop_DATA)
-
-DISTCLEANFILES = \
-	$(desktop_in_files)
diff --git a/auth-dialog/nm-vpnc-auth-dialog.desktop.in.in b/auth-dialog/nm-vpnc-auth-dialog.desktop.in.in
deleted file mode 100644
index 75c2f08..0000000
--- a/auth-dialog/nm-vpnc-auth-dialog.desktop.in.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-_Name=Network
-_Comment=Request VPN authentication
-Exec= LIBEXECDIR@/nm-vpnc-auth-dialog
-Terminal=false
-Type=Application
-NoDisplay=true
diff --git a/configure.ac b/configure.ac
index 7b42058..847a4bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,13 +117,10 @@ if ! test x"$ac_distver" = x""; then
   AC_DEFINE_UNQUOTED(DIST_VERSION, "$ac_distver", [Define the distribution version string])
 fi
 
-AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
-
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
 auth-dialog/Makefile
-auth-dialog/nm-vpnc-auth-dialog.desktop.in
 properties/Makefile
 properties/tests/Makefile
 properties/tests/pcf/Makefile
-- 
2.7.0