New upstream version 1.5.2

1 files changed, 24 insertions, 24 deletions

diff --git a/Makefile.in b/Makefile.in
index dc8f442..7dd92c8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -159,9 +159,9 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(appdatadir)" \
+am__installdirs = "$(DESTDIR)$(metainfodir)" \
 	"$(DESTDIR)$(nmvpnservicedir)"
-DATA = $(appdata_DATA) $(nmvpnservice_DATA)
+DATA = $(metainfo_DATA) $(nmvpnservice_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -406,17 +406,17 @@ top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = properties auth-dialog po
 nmvpnservice_DATA = nm-strongswan-service.name
-appdatadir = $(datadir)/appdata
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = NetworkManager-strongswan.appdata.xml.in
+metainfodir = $(datadir)/metainfo
+metainfo_DATA = $(metainfo_in_files:.xml.in=.xml)
+metainfo_in_files = NetworkManager-strongswan.metainfo.xml.in
 EXTRA_DIST = \
     nm-strongswan-service.name.in  \
-    $(appdata_in_files)  \
+    $(metainfo_in_files)  \
     intltool-extract.in  \
     intltool-merge.in    \
     intltool-update.in
 
-CLEANFILES = $(nmvpnservice_DATA) $(appdata_DATA) *~
+CLEANFILES = $(nmvpnservice_DATA) $(metainfo_DATA) *~
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 ACLOCAL_AMFLAGS = -I m4
 all: config.h
@@ -480,27 +480,27 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool config.lt
-install-appdataDATA: $(appdata_DATA)
+install-metainfoDATA: $(metainfo_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+	@list='$(metainfo_DATA)'; test -n "$(metainfodir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(metainfodir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(metainfodir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(metainfodir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(metainfodir)" || exit $$?; \
 	done
 
-uninstall-appdataDATA:
+uninstall-metainfoDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
+	@list='$(metainfo_DATA)'; test -n "$(metainfodir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
+	dir='$(DESTDIR)$(metainfodir)'; $(am__uninstall_files_from_dir)
 install-nmvpnserviceDATA: $(nmvpnservice_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(nmvpnservice_DATA)'; test -n "$(nmvpnservicedir)" || list=; \
@@ -822,7 +822,7 @@ check: check-recursive
 all-am: Makefile $(DATA) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(nmvpnservicedir)"; do \
+	for dir in "$(DESTDIR)$(metainfodir)" "$(DESTDIR)$(nmvpnservicedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -881,7 +881,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-appdataDATA install-nmvpnserviceDATA
+install-data-am: install-metainfoDATA install-nmvpnserviceDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-recursive
@@ -928,7 +928,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-appdataDATA uninstall-nmvpnserviceDATA
+uninstall-am: uninstall-metainfoDATA uninstall-nmvpnserviceDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 .MAKE: $(am__recursive_targets) all install-am install-data-am \
@@ -941,16 +941,16 @@ uninstall-am: uninstall-appdataDATA uninstall-nmvpnserviceDATA
 	dist-xz dist-zip distcheck distclean distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags distcleancheck \
 	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-appdataDATA install-data \
-	install-data-am install-data-hook install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man \
+	info-am install install-am install-data install-data-am \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-metainfoDATA \
 	install-nmvpnserviceDATA install-pdf install-pdf-am install-ps \
 	install-ps-am install-strip installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-appdataDATA uninstall-hook \
+	uninstall-am uninstall-hook uninstall-metainfoDATA \
 	uninstall-nmvpnserviceDATA
 
 .PRECIOUS: Makefile