[Bash-completion-commits] [SCM] debian-package branch, master, updated. debian/1.3-1-32-g653f34e
David Paleino
dapal at debian.org
Tue Apr 12 10:44:06 UTC 2011
The following commit has been merged in the master branch:
commit b247634b09e9fe60c9e18c4b279a3f0dac5043eb
Author: David Paleino <dapal at debian.org>
Date: Wed Apr 6 10:30:51 2011 +0200
Change completion directory layout (00-change_completions_layout.patch)
diff --git a/debian/changelog b/debian/changelog
index 9c8f562..4884ae3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bash-completion (1:1.3-2) UNRELEASED; urgency=low
+
+ * Change completion directory layout (00-change_completions_layout.patch)
+
+ -- David Paleino <dapal at debian.org> Wed, 06 Apr 2011 10:30:05 +0200
+
bash-completion (1:1.3-1) unstable; urgency=low
* New upstream release
diff --git a/debian/patches/00-change_completions_layout.patch b/debian/patches/00-change_completions_layout.patch
new file mode 100644
index 0000000..423a389
--- /dev/null
+++ b/debian/patches/00-change_completions_layout.patch
@@ -0,0 +1,381 @@
+---
+ Makefile.am | 10 ++-
+ Makefile.in | 82 ++++++++++++++++--------------
+ bash_completion.sh.in | 4 -
+ completions/Makefile.am | 5 +
+ completions/perl.in | 131 ++++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 7 +-
+ 6 files changed, 194 insertions(+), 45 deletions(-)
+
+--- bash-completion.orig/Makefile.am
++++ bash-completion/Makefile.am
+@@ -1,13 +1,17 @@
+ SUBDIRS = completions test
+
+-sysconf_DATA = bash_completion
++data_DATA = bash_completion
+
+ profiledir = $(sysconfdir)/profile.d
+ profile_DATA = bash_completion.sh
+
+ bash_completion.sh: bash_completion.sh.in Makefile
+- sed -e 's|@sysconfdir[@]|$(sysconfdir)|' <$(srcdir)/$@.in >$@
++ sed -e 's|@datadir[@]|$(datadir)|' <$(srcdir)/$@.in >$@
+
+ CLEANFILES = bash_completion.sh
+
+-EXTRA_DIST = CHANGES $(sysconf_DATA) bash_completion.sh.in
++EXTRA_DIST = CHANGES $(data_DATA) bash_completion.sh.in
++
++install-exec-hook:
++ $(MKDIR_P) $(DESTDIR)/$(sysconfdir)
++ $(LN_S) $(datadir)/bash_completion $(DESTDIR)/$(sysconfdir)
+--- bash-completion.orig/configure.ac
++++ bash-completion/configure.ac
+@@ -1,7 +1,10 @@
+ AC_PREREQ([2.59])
+ AC_INIT([bash-completion], [1.3])
+ AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip -Wall -Werror])
+-AC_SUBST(bashcompdir, $sysconfdir/bash_completion.d)
+-AC_SUBST(helpersdir, $sysconfdir/bash_completion.d/helpers)
++AC_SUBST(datadir, $datarootdir/bash-completion)
++AC_SUBST(bashcompdir, $datadir/completions)
++AC_SUBST(helpersdir, $datadir/helpers)
++AC_PROG_LN_S
++AC_PROG_MKDIR_P
+ AC_CONFIG_FILES([Makefile completions/Makefile completions/helpers/Makefile test/Makefile])
+ AC_OUTPUT
+--- bash-completion.orig/completions/Makefile.am
++++ bash-completion/completions/Makefile.am
+@@ -181,3 +181,8 @@ bashcomp_DATA = abook \
+
+ EXTRA_DIST = $(bashcomp_DATA) \
+ _mock _modules _subversion _yum _yum-utils
++
++perl: perl.in Makefile
++ sed -e 's|@helpersdir[@]|$(helpersdir)|' <$@.in >$@
++
++CLEANFILES: perl
+--- /dev/null
++++ bash-completion/completions/perl.in
+@@ -0,0 +1,131 @@
++# bash completion for perl
++
++have perl &&
++{
++_perlmodules()
++{
++ COMPREPLY=( $( compgen -P "$prefix" -W "$( $1 ${BASH_SOURCE[0]%/*}/helpers/perl modules $cur )" -- "$cur" ) )
++ __ltrim_colon_completions "$prefix$cur"
++}
++
++_perlfunctions()
++{
++ COMPREPLY=( $( compgen -P "$prefix" -W "$( ${BASH_SOURCE[0]%/*}/helpers/perl functions $cur )" -- "$cur" ) )
++}
++
++_perl()
++{
++ local cur prev prefix temp
++ local optPrefix optSuffix
++
++ COMPREPLY=()
++ _get_comp_words_by_ref -n : cur prev
++ prefix=""
++
++ # If option not followed by whitespace, reassign prev and cur
++ if [[ "$cur" == -?* ]]; then
++ temp=$cur
++ prev=${temp:0:2}
++ cur=${temp:2}
++ optPrefix=-P$prev
++ optSuffix=-S/
++ prefix=$prev
++ fi
++
++ case $prev in
++ -D|-e|-E|-i|-F|-l)
++ return 0
++ ;;
++ -I|-x)
++ local IFS=$'\n'
++ _compopt_o_filenames
++ COMPREPLY=( $( compgen -d $optPrefix $optSuffix -- "$cur" ) )
++ return 0
++ ;;
++ -m|-M)
++ temp="${cur#-}"
++ prefix="$prefix${cur%$temp}"
++ cur="$temp"
++ _perlmodules $1
++ return 0
++ ;;
++ -V)
++ if [[ $cur == :* ]]; then
++ temp="${cur##+(:)}"
++ prefix="$prefix${cur%$temp}"
++ local IFS=$'\n'
++ COMPREPLY=( $( compgen -P "$prefix" -W \
++ '$( $1 -MConfig -e "print join \"\\n\",
++ keys %Config::Config" 2>/dev/null )' -- "$temp" ) )
++ __ltrim_colon_completions "$prefix$temp"
++ fi
++ return 0
++ ;;
++ -d|-dt)
++ if [[ $cur == :* ]]; then
++ temp="${cur#:}"
++ prefix="$prefix${cur%$temp}"
++ cur="Devel::$temp"
++ _perlmodules $1
++ fi
++ return 0
++ ;;
++ esac
++
++ if [[ "$cur" == -* ]]; then
++ COMPREPLY=( $( compgen -W '-C -s -T -u -U -W -X -h -v -V -c -w -d \
++ -D -p -n -a -F -l -0 -I -m -M -P -S -x -i -e ' -- "$cur" ) )
++ else
++ _filedir
++ fi
++}
++complete -F _perl perl
++
++_perldoc()
++{
++ local cur prev prefix temp
++
++ COMPREPLY=()
++ _get_comp_words_by_ref -n : cur prev
++ prefix=""
++
++ # completing an option (may or may not be separated by a space)
++ if [[ "$cur" == -?* ]]; then
++ temp=$cur
++ prev=${temp:0:2}
++ cur=${temp:2}
++ prefix=$prev
++ fi
++
++ # complete builtin perl functions
++ case $prev in
++ -f)
++ _perlfunctions "$cur"
++ return 0
++ ;;
++ esac
++
++ if [[ "$cur" == -* ]]; then
++ COMPREPLY=( $( compgen -W '-h -v -t -u -m -l -F -X -f -q' -- "$cur" ))
++ else
++ # return available modules (unless it is clearly a file)
++ if [[ "$cur" != */* ]]; then
++ _perlmodules
++ COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W \
++ '$( PAGER=/bin/cat man perl | \
++ sed -ne "/perl.*Perl overview/,/perlwin32/p" | \
++ awk "\$NF=2 { print \$1}" | command grep perl )' -- "$cur" ) )
++ fi
++ _filedir 'p@(l|m|od)'
++ fi
++}
++complete -F _perldoc -o bashdefault perldoc
++}
++
++# Local variables:
++# mode: shell-script
++# sh-basic-offset: 4
++# sh-indent-comment: t
++# indent-tabs-mode: nil
++# End:
++# ex: ts=4 sw=4 et filetype=sh
+--- bash-completion.orig/Makefile.in
++++ bash-completion/Makefile.in
+@@ -75,8 +75,8 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-am__installdirs = "$(DESTDIR)$(profiledir)" "$(DESTDIR)$(sysconfdir)"
+-DATA = $(profile_DATA) $(sysconf_DATA)
++am__installdirs = "$(DESTDIR)$(datadir)" "$(DESTDIR)$(profiledir)"
++DATA = $(data_DATA) $(profile_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+@@ -139,6 +139,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MKDIR_P = @MKDIR_P@
+@@ -196,11 +197,11 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = completions test
+-sysconf_DATA = bash_completion
++data_DATA = bash_completion
+ profiledir = $(sysconfdir)/profile.d
+ profile_DATA = bash_completion.sh
+ CLEANFILES = bash_completion.sh
+-EXTRA_DIST = CHANGES $(sysconf_DATA) bash_completion.sh.in
++EXTRA_DIST = CHANGES $(data_DATA) bash_completion.sh.in
+ all: all-recursive
+
+ .SUFFIXES:
+@@ -238,46 +239,46 @@ $(top_srcdir)/configure: $(am__configur
+ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ $(am__aclocal_m4_deps):
+-install-profileDATA: $(profile_DATA)
++install-dataDATA: $(data_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(profiledir)" || $(MKDIR_P) "$(DESTDIR)$(profiledir)"
+- @list='$(profile_DATA)'; test -n "$(profiledir)" || list=; \
++ test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)"
++ @list='$(data_DATA)'; test -n "$(datadir)" || list=; \
+ 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)$(profiledir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(profiledir)" || exit $$?; \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(datadir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(datadir)" || exit $$?; \
+ done
+
+-uninstall-profileDATA:
++uninstall-dataDATA:
+ @$(NORMAL_UNINSTALL)
+- @list='$(profile_DATA)'; test -n "$(profiledir)" || list=; \
++ @list='$(data_DATA)'; test -n "$(datadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(profiledir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(profiledir)" && rm -f $$files
+-install-sysconfDATA: $(sysconf_DATA)
++ echo " ( cd '$(DESTDIR)$(datadir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(datadir)" && rm -f $$files
++install-profileDATA: $(profile_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
+- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
++ test -z "$(profiledir)" || $(MKDIR_P) "$(DESTDIR)$(profiledir)"
++ @list='$(profile_DATA)'; test -n "$(profiledir)" || list=; \
+ 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)$(sysconfdir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(profiledir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(profiledir)" || exit $$?; \
+ done
+
+-uninstall-sysconfDATA:
++uninstall-profileDATA:
+ @$(NORMAL_UNINSTALL)
+- @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
++ @list='$(profile_DATA)'; test -n "$(profiledir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(sysconfdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(sysconfdir)" && rm -f $$files
++ echo " ( cd '$(DESTDIR)$(profiledir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(profiledir)" && rm -f $$files
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -593,7 +594,7 @@ check: check-recursive
+ all-am: Makefile $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(profiledir)" "$(DESTDIR)$(sysconfdir)"; do \
++ for dir in "$(DESTDIR)$(datadir)" "$(DESTDIR)$(profiledir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-recursive
+@@ -643,14 +644,15 @@ info: info-recursive
+
+ info-am:
+
+-install-data-am: install-profileDATA
++install-data-am: install-dataDATA install-profileDATA
+
+ install-dvi: install-dvi-recursive
+
+ install-dvi-am:
+
+-install-exec-am: install-sysconfDATA
+-
++install-exec-am:
++ @$(NORMAL_INSTALL)
++ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ install-html: install-html-recursive
+
+ install-html-am:
+@@ -689,10 +691,10 @@ ps: ps-recursive
+
+ ps-am:
+
+-uninstall-am: uninstall-profileDATA uninstall-sysconfDATA
++uninstall-am: uninstall-dataDATA uninstall-profileDATA
+
+ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+- install-am install-strip tags-recursive
++ install-am install-exec-am install-strip tags-recursive
+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+@@ -701,19 +703,23 @@ uninstall-am: uninstall-profileDATA unin
+ distclean distclean-generic distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-data install-data-am \
+- install-dvi install-dvi-am install-exec install-exec-am \
+- install-html install-html-am install-info install-info-am \
+- install-man install-pdf install-pdf-am install-profileDATA \
+- install-ps install-ps-am install-strip install-sysconfDATA \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am uninstall-profileDATA \
+- uninstall-sysconfDATA
++ install-dataDATA install-dvi install-dvi-am install-exec \
++ install-exec-am install-exec-hook install-html install-html-am \
++ install-info install-info-am install-man install-pdf \
++ install-pdf-am install-profileDATA install-ps install-ps-am \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
++ tags-recursive uninstall uninstall-am uninstall-dataDATA \
++ uninstall-profileDATA
+
+
+ bash_completion.sh: bash_completion.sh.in Makefile
+- sed -e 's|@sysconfdir[@]|$(sysconfdir)|' <$(srcdir)/$@.in >$@
++ sed -e 's|@datadir[@]|$(datadir)|' <$(srcdir)/$@.in >$@
++
++install-exec-hook:
++ $(MKDIR_P) $(DESTDIR)/$(sysconfdir)
++ $(LN_S) $(datadir)/bash_completion $(DESTDIR)/$(sysconfdir)
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- bash-completion.orig/bash_completion.sh.in
++++ bash-completion/bash_completion.sh.in
+@@ -4,9 +4,9 @@
+ # Check for recent enough version of bash.
+ bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
+ if [ $bmajor -gt 3 ] || [ $bmajor -eq 3 -a $bminor -ge 2 ]; then
+- if shopt -q progcomp && [ -r @sysconfdir@/bash_completion ]; then
++ if shopt -q progcomp && [ -r @datadir@/bash_completion ]; then
+ # Source completion code.
+- . @sysconfdir@/bash_completion
++ . @datadir@/bash_completion
+ fi
+ fi
+ unset bash bmajor bminor
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ceac9ce
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+00-change_completions_layout.patch
--
debian-package
More information about the Bash-completion-commits
mailing list