Merging upstream version 1.22.5.

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

1 files changed, 72 insertions, 61 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 1cec205..8d39d24 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -2,68 +2,9 @@
 
 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 =
+CLEANFILES =
 
-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 \
-	dpkg-scansources.pl \
-	dpkg-shlibdeps.pl \
-	dpkg-source.pl \
-	dpkg-vendor.pl \
-	$(test_scripts) \
-	$(test_data) \
-	# EOL
-
-dist_zshcompletions_DATA = \
-	completion/zsh/_dpkg-parsechangelog \
-	# EOL
-
-CLEANFILES = \
-	$(test_data_objects) \
-	$(sbin_SCRIPTS) \
-	$(bin_SCRIPTS) \
-	# EOL
-
-perllibdir = $(PERL_LIBDIR)
 nobase_dist_perllib_DATA = \
 	Dpkg/Arch.pm \
 	Dpkg/BuildAPI.pm \
@@ -156,6 +97,67 @@ EXTRA_DIST += \
 	Test/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
+
+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 \
+	dpkg-scansources.pl \
+	dpkg-shlibdeps.pl \
+	dpkg-source.pl \
+	dpkg-vendor.pl \
+	# EOL
+
+CLEANFILES += \
+	$(sbin_SCRIPTS) \
+	$(bin_SCRIPTS) \
+	# 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 =
 
@@ -422,6 +424,11 @@ test_data = \
 	t/origins/ubuntu \
 	# EOL
 
+EXTRA_DIST += \
+	$(test_scripts) \
+	$(test_data) \
+	# EOL
+
 test_data_objects = \
 	t/Dpkg_Shlibs/libobjdump.basictags-amd64.so \
 	t/Dpkg_Shlibs/libobjdump.basictags-i386.so \
@@ -430,6 +437,10 @@ test_data_objects = \
 	t/Dpkg_Shlibs/libobjdump.spacesyms.so \
 	# EOL
 
+CLEANFILES += \
+	$(test_data_objects) \
+	# EOL
+
 $(srcdir)/t/Dpkg_Shlibs/libobjdump.basictags-amd64.so: $(srcdir)/t/Dpkg_Shlibs/basictags.c
 	$(CC) $(CFLAGS) -shared -fPIC -Wl,-soname -Wl,libbasictags.so.1 $< \
 	  -DAMD64 -o $@