This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 3792aa3620a51c8e01ca6284544e51c9396762a9
Author: Rene Engelhard <r...@debian.org>
Date: Wed Feb 3 12:03:23 2016 +0100
the bash-completion path is actually fixed in master; use that
---
changelog | 11 +++++++----
patches/bash-completion-dir.diff | 22 ++++++++++++++++++++++
patches/series | 1 +
rules | 3 ---
scripts/gid2pkgdirs.sh | 2 +-
5 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/changelog b/changelog
index c75e27c..c823e29 100644
--- a/changelog
+++ b/changelog
@@ -1,12 +1,15 @@
libreoffice (1:5.0.5~rc1-2) UNRELEASED; urgency=medium
+ * debian/patches/bash-completion-dir.diff: add from master;
+ install bash completion to "new" /usr/share/bash-completion/completions
+
* debian/rules:
- update/clean up up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the
openjdks and add openjdk-8-jre
- * debian/scripts/gid2pkgdirs.sh,
- debian/libreoffice-common.{post,pre}{rm,inst}.in:
- install bash completion to "new" /usr/share/bash-completion/completions,
- thanks lintian, rm_conffile /etc/bash_completion.d/libreoffice.sh
+ * debian/libreoffice-common.{post,pre}{rm,inst}.in:
+ rm_conffile /etc/bash_completion.d/libreoffice.sh
+ * debian/scripts/gid2pkgdirs.sh: adapt for bash_completion move and install
+ without .sh
-- Rene Engelhard <r...@debian.org> Tue, 02 Feb 2016 19:37:16 +0100
diff --git a/patches/bash-completion-dir.diff b/patches/bash-completion-dir.diff
new file mode 100644
index 0000000..8b08672
--- /dev/null
+++ b/patches/bash-completion-dir.diff
@@ -0,0 +1,22 @@
+diff --git a/bin/distro-install-desktop-integration
b/bin/distro-install-desktop-integration
+index ed31d5b..e9332aa 100755
+--- a/bin/distro-install-desktop-integration
++++ b/bin/distro-install-desktop-integration
+@@ -178,12 +178,12 @@ ln -sf $INSTALLDIR/program/soffice
$DESTDIR$PREFIXDIR/bin/soffice
+ test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice"
>>$DESTDIR/gid_Module_Root_Brand
+
+ # create bash completion
+-mkdir -p $DESTDIR/etc/bash_completion.d
+-./bin/generate-bash-completion bin/bash-completion.in
$DESTDIR/etc/bash_completion.d/$INSTALLDIRNAME.sh
+-test -f $DESTDIR/gid_Module_Root_Brand && echo
"/etc/bash_completion.d/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
++mkdir -p $DESTDIR/usr/share/bash-completion/completions
++./bin/generate-bash-completion bin/bash-completion.in
$DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
++test -f $DESTDIR/gid_Module_Root_Brand && echo
"/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh"
>>$DESTDIR/gid_Module_Root_Brand
+ if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
+- ./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in
$DESTDIR/etc/bash_completion.d/ooffice.sh
+- test -f $DESTDIR/gid_Module_Root_Brand && echo
"/etc/bash_completion.d/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
++ ./bin/generate-bash-completion --compat-oowrappers bin/bash-completion.in
$DESTDIR/usr/share/bash-completion/completions/ooffice.sh
++ test -f $DESTDIR/gid_Module_Root_Brand && echo
"/usr/share/bash-completion/completions/ooffice.sh"
>>$DESTDIR/gid_Module_Root_Brand
+ fi
+
+ echo "Install $OOINSTDIR/basis$VERSION/program/java-set-classpath";
diff --git a/patches/series b/patches/series
index 5c53ede..1e83637 100644
--- a/patches/series
+++ b/patches/series
@@ -31,3 +31,4 @@ rsc-no-error-about-unknown-switch.diff
liborcus-0.9.1.diff
debian-branding.diff
icu-56.diff
+bash-completion-dir.diff
diff --git a/rules b/rules
index 52b89cd..29962af 100755
--- a/rules
+++ b/rules
@@ -2033,9 +2033,6 @@ endif
# prepare install/dir files for dh
for i in `cd $(CURDIR)/debian/tmp/pkg; ls -1 | xargs`; do \
echo "$${i}/usr/* usr" > debian/$$i.install; \
- if [ "$$i" = "libreoffice-common" ]; then \
- echo "$${i}/etc/* etc" >> debian/$$i.install; \
- fi; \
(cd debian/tmp/pkg/$$i; find . -type d | sed -e "s,\./,,") \
> debian/$$i.dirs; \
done
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index 6a5f961..d5d60e2 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -152,7 +152,7 @@ fi &&
);
mkdir -p pkg/libreoffice-common/usr/share/bash-completion/completions
-mv etc/bash_completion.d/libreoffice$BINSUFFIX.sh \
+mv usr/share/bash-completion/completions/libreoffice$BINSUFFIX.sh \
pkg/libreoffice-common/usr/share/bash-completion/completions/libreoffice$BINSUFFIX
mv .$OOINSTBASE/program/java-set-classpath \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
