Merging upstream version 1.22.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 86 insertions, 55 deletions

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index c0d7c6d..8b0a61f 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -127,8 +127,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/dpkg-arch.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(dist_zshcompletions_DATA) \
-	$(nobase_dist_perllib_DATA) $(am__DIST_COMMON)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_bashcompletions_DATA) \
+	$(dist_zshcompletions_DATA) $(nobase_dist_perllib_DATA) \
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = Build.PL README.cpan
@@ -161,8 +162,8 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \
-	"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(zshcompletionsdir)" \
-	"$(DESTDIR)$(perllibdir)"
+	"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(bashcompletionsdir)" \
+	"$(DESTDIR)$(zshcompletionsdir)" "$(DESTDIR)$(perllibdir)"
 SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -194,7 +195,8 @@ am__can_run_installinfo = \
 man3dir = $(mandir)/man3
 NROFF = nroff
 MANS = $(man3_MANS)
-DATA = $(dist_zshcompletions_DATA) $(nobase_dist_perllib_DATA)
+DATA = $(dist_bashcompletions_DATA) $(dist_zshcompletions_DATA) \
+	$(nobase_dist_perllib_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -393,6 +395,7 @@ ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+aclocaldir = @aclocaldir@
 admindir = @admindir@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -400,6 +403,7 @@ am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 backupsdir = @backupsdir@
+bashcompletionsdir = @bashcompletionsdir@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -411,6 +415,7 @@ datadir = @datadir@
 datarootdir = @datarootdir@
 devlibdir = @devlibdir@
 docdir = @docdir@
+docspecdir = @docspecdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
@@ -428,10 +433,14 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 logdir = @logdir@
 mandir = @mandir@
+methodsdir = @methodsdir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+perllibdir = @perllibdir@
 pkgconfdir = @pkgconfdir@
+pkgconfigdir = @pkgconfigdir@
+polkitactionsdir = @polkitactionsdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -446,51 +455,15 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 zshcompletionsdir = @zshcompletionsdir@
 SUBDIRS = mk po
-sbin_SCRIPTS = \
-	dpkg-fsys-usrunmess \
-	# EOL
-
-bin_SCRIPTS = \
-	dpkg-architecture \
-	dpkg-buildflags \
-	dpkg-buildapi \
-	dpkg-buildpackage \
-	dpkg-buildtree \
-	dpkg-checkbuilddeps \
-	dpkg-distaddfile \
-	dpkg-genbuildinfo \
-	dpkg-genchanges \
-	dpkg-gencontrol \
-	dpkg-gensymbols \
-	dpkg-mergechangelogs \
-	dpkg-name \
-	dpkg-parsechangelog \
-	dpkg-scanpackages \
-	dpkg-scansources \
-	dpkg-shlibdeps \
-	dpkg-source \
-	dpkg-vendor \
-	# EOL
-
-EXTRA_DIST = dpkg-architecture.pl dpkg-buildapi.pl dpkg-buildflags.pl \
-	dpkg-buildpackage.pl dpkg-buildtree.pl dpkg-checkbuilddeps.pl \
-	dpkg-distaddfile.pl dpkg-fsys-usrunmess.pl \
-	dpkg-genbuildinfo.pl dpkg-genchanges.pl dpkg-gencontrol.pl \
-	dpkg-gensymbols.pl dpkg-mergechangelogs.pl dpkg-name.pl \
-	dpkg-parsechangelog.pl dpkg-scanpackages.pl \
+EXTRA_DIST = Test/Dpkg.pm dpkg-architecture.pl dpkg-buildapi.pl \
+	dpkg-buildflags.pl dpkg-buildpackage.pl dpkg-buildtree.pl \
+	dpkg-checkbuilddeps.pl dpkg-distaddfile.pl \
+	dpkg-fsys-usrunmess.pl dpkg-genbuildinfo.pl dpkg-genchanges.pl \
+	dpkg-gencontrol.pl dpkg-gensymbols.pl dpkg-mergechangelogs.pl \
+	dpkg-name.pl dpkg-parsechangelog.pl dpkg-scanpackages.pl \
 	dpkg-scansources.pl dpkg-shlibdeps.pl dpkg-source.pl \
-	dpkg-vendor.pl $(test_scripts) $(test_data) Test/Dpkg.pm # EOL
-dist_zshcompletions_DATA = \
-	completion/zsh/_dpkg-parsechangelog \
-	# EOL
-
-CLEANFILES = \
-	$(test_data_objects) \
-	$(sbin_SCRIPTS) \
-	$(bin_SCRIPTS) \
-	# EOL
-
-perllibdir = $(PERL_LIBDIR)
+	dpkg-vendor.pl $(test_scripts) $(test_data) # EOL
+CLEANFILES = $(sbin_SCRIPTS) $(bin_SCRIPTS) $(test_data_objects) # EOL
 nobase_dist_perllib_DATA = \
 	Dpkg/Arch.pm \
 	Dpkg/BuildAPI.pm \
@@ -579,6 +552,39 @@ nobase_dist_perllib_DATA = \
 	Dpkg.pm \
 	# EOL
 
+sbin_SCRIPTS = \
+	dpkg-fsys-usrunmess \
+	# EOL
+
+bin_SCRIPTS = \
+	dpkg-architecture \
+	dpkg-buildflags \
+	dpkg-buildapi \
+	dpkg-buildpackage \
+	dpkg-buildtree \
+	dpkg-checkbuilddeps \
+	dpkg-distaddfile \
+	dpkg-genbuildinfo \
+	dpkg-genchanges \
+	dpkg-gencontrol \
+	dpkg-gensymbols \
+	dpkg-mergechangelogs \
+	dpkg-name \
+	dpkg-parsechangelog \
+	dpkg-scanpackages \
+	dpkg-scansources \
+	dpkg-shlibdeps \
+	dpkg-source \
+	dpkg-vendor \
+	# EOL
+
+dist_bashcompletions_DATA = \
+	# EOL
+
+dist_zshcompletions_DATA = \
+	completion/zsh/_dpkg-parsechangelog \
+	# EOL
+
 
 # Keep it even if empty to have man3dir correctly set
 man3_MANS = 
@@ -988,6 +994,27 @@ uninstall-man3:
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir)
+install-dist_bashcompletionsDATA: $(dist_bashcompletions_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_bashcompletions_DATA)'; test -n "$(bashcompletionsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bashcompletionsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bashcompletionsdir)" || 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)$(bashcompletionsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(bashcompletionsdir)" || exit $$?; \
+	done
+
+uninstall-dist_bashcompletionsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_bashcompletions_DATA)'; test -n "$(bashcompletionsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(bashcompletionsdir)'; $(am__uninstall_files_from_dir)
 install-dist_zshcompletionsDATA: $(dist_zshcompletions_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(dist_zshcompletions_DATA)'; test -n "$(zshcompletionsdir)" || list=; \
@@ -1196,7 +1223,7 @@ check: check-recursive
 all-am: Makefile $(SCRIPTS) $(MANS) $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(zshcompletionsdir)" "$(DESTDIR)$(perllibdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(bashcompletionsdir)" "$(DESTDIR)$(zshcompletionsdir)" "$(DESTDIR)$(perllibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -1250,8 +1277,9 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-data-local install-dist_zshcompletionsDATA \
-	install-man install-nobase_dist_perllibDATA
+install-data-am: install-data-local install-dist_bashcompletionsDATA \
+	install-dist_zshcompletionsDATA install-man \
+	install-nobase_dist_perllibDATA
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-recursive
@@ -1296,9 +1324,10 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-binSCRIPTS uninstall-dist_zshcompletionsDATA \
-	uninstall-local uninstall-man \
-	uninstall-nobase_dist_perllibDATA uninstall-sbinSCRIPTS
+uninstall-am: uninstall-binSCRIPTS uninstall-dist_bashcompletionsDATA \
+	uninstall-dist_zshcompletionsDATA uninstall-local \
+	uninstall-man uninstall-nobase_dist_perllibDATA \
+	uninstall-sbinSCRIPTS
 
 uninstall-man: uninstall-man3
 
@@ -1312,6 +1341,7 @@ uninstall-man: uninstall-man3
 	dvi-am html html-am info info-am install install-am \
 	install-binSCRIPTS install-data install-data-am \
 	install-data-hook install-data-local \
+	install-dist_bashcompletionsDATA \
 	install-dist_zshcompletionsDATA install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-man3 \
@@ -1321,6 +1351,7 @@ uninstall-man: uninstall-man3
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-binSCRIPTS \
+	uninstall-dist_bashcompletionsDATA \
 	uninstall-dist_zshcompletionsDATA uninstall-local \
 	uninstall-man uninstall-man3 uninstall-nobase_dist_perllibDATA \
 	uninstall-sbinSCRIPTS