diff options
| author | Gabriel F. T. Gomes <gabriel@inconstante.eti.br> | 2018-11-02 16:19:06 -0300 |
|---|---|---|
| committer | Gabriel F. T. Gomes <gabriel@inconstante.eti.br> | 2018-11-02 16:19:06 -0300 |
| commit | 32b4dc89e47bd20920ea84929d445d0f0812706c (patch) | |
| tree | 28fc9c2093ac2293861176e61715e79c36cfb72f /debian | |
| parent | 985bca1882f9993df458421445ac334b94caf603 (diff) | |
| download | bash-completion-32b4dc89e47bd20920ea84929d445d0f0812706c.tar.gz | |
Incorporate NMU (bash-completion 1:2.8-1.1)
Emmanouil Kampitakis prepared an NMU (versioned as 1:2.8-1.1) [1] and
uploaded it to Debian [2]. This patch incorporates the changes provided
by the NMU.
Thanks to Emmanouil Kampitakis.
[1] https://bugs.debian.org/910128#26
[2] https://bugs.debian.org/910128#36
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/99-use-install-data-hook.patch | 31 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 39 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ea31e628..dd49c326 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,13 @@ bash-completion (1:2.8-2) UNRELEASED; urgency=low -- Gabriel F. T. Gomes <gabriel@inconstante.eti.br> Fri, 02 Nov 2018 13:28:00 -0300 +bash-completion (1:2.8-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use install-data-hook, not install-data-local (Closes: #910128) + + -- Emmanouil Kampitakis <info+debian@kampitakis.de> Sat, 27 Oct 2018 21:53:12 +0000 + bash-completion (1:2.8-1) unstable; urgency=low * Update upstream sources. diff --git a/debian/patches/99-use-install-data-hook.patch b/debian/patches/99-use-install-data-hook.patch new file mode 100644 index 00000000..d20e2e34 --- /dev/null +++ b/debian/patches/99-use-install-data-hook.patch @@ -0,0 +1,31 @@ +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi> +Date: Fri, 25 May 2018 17:38:59 +0200 +Subject: [PATCH] completions/Makefile.am: Use install-data-hook, not + install-data-local +Bug-Debian: https://bugs.debian.org/910128 +Forwarded: https://github.com/scop/bash-completion/issues/212 +Origin: https://github.com/scop/bash-completion/commit/ee6b37ad7ff5b309cbb9b886a871252abd9398fa + +-hook is run after the main rule, while -local might end up before. +https://www.gnu.org/software/automake/manual/html_node/Extending.html#index-hook-targets + +Closes #212 +--- + completions/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: bash-completion-2.8/completions/Makefile.am +=================================================================== +--- bash-completion-2.8.orig/completions/Makefile.am ++++ bash-completion-2.8/completions/Makefile.am +@@ -993,8 +993,8 @@ symlinks: $(targetdir) $(DATA) + all-local: targetdir = . + all-local: symlinks + +-install-data-local: targetdir = $(DESTDIR)$(bashcompdir) +-install-data-local: symlinks ++install-data-hook: targetdir = $(DESTDIR)$(bashcompdir) ++install-data-hook: symlinks + + check-local: + ret=0 diff --git a/debian/patches/series b/debian/patches/series index f3332d32..09d794ad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 05-list-held-packages-in-dpkg.patch 06-xpdf_support_compressed_pdf.patch 07-dpkg_support_raw-extract_vextract.patch +99-use-install-data-hook.patch |