[libreoffice] 01/01: install bash completion to "new" /usr/share/bash-completion/completions, thanks lintian, rm_conffile /etc/bash_completion.d/libreoffice.sh
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 8d9f930782cacc1a7803a73bbba58437612b5650
Author: Rene Engelhard <rene@debian.org>
Date: Tue Feb 2 19:37:42 2016 +0100
install bash completion to "new" /usr/share/bash-completion/completions, thanks lintian, rm_conffile /etc/bash_completion.d/libreoffice.sh
---
changelog | 6 +++++-
libreoffice-common.postinst.in | 1 +
libreoffice-common.postrm.in | 1 +
libreoffice-common.preinst.in | 1 +
scripts/gid2pkgdirs.sh | 4 ++--
5 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index 2f4bddb..c75e27c 100644
--- a/changelog
+++ b/changelog
@@ -3,8 +3,12 @@ libreoffice (1:5.0.5~rc1-2) UNRELEASED; urgency=medium
* 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
- -- Rene Engelhard <rene@debian.org> Tue, 26 Jan 2016 09:35:18 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 02 Feb 2016 19:37:16 +0100
libreoffice (1:5.0.5~rc1-1) unstable; urgency=medium
diff --git a/libreoffice-common.postinst.in b/libreoffice-common.postinst.in
index a736474..1276802 100644
--- a/libreoffice-common.postinst.in
+++ b/libreoffice-common.postinst.in
@@ -17,6 +17,7 @@ fi
if [ "$1" = "configure" ]; then
dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/ooffice.sh" 1:3.3.0~rc4-2 libreoffice-common -- "$@"
+ dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/libreoffice.sh" 1:5.0.5~rc2-1 libreoffice-common -- "$@"
dpkg-maintscript-helper mv_conffile \
"/etc/openoffice/psprint.conf" "/etc/libreoffice/psprint.conf" "" libreoffice-common -- "$@"
diff --git a/libreoffice-common.postrm.in b/libreoffice-common.postrm.in
index 5aec23d..631f96b 100644
--- a/libreoffice-common.postrm.in
+++ b/libreoffice-common.postrm.in
@@ -7,6 +7,7 @@ set -e
case "$1" in
remove|abort-install|abort-upgrade)
dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/ooffice.sh" 1:3.3.0~rc4-2 libreoffice-common -- "$@"
+ dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/libreoffice.sh" 1:5.0.5~rc2-1 libreoffice-common -- "$@"
dpkg-maintscript-helper mv_conffile \
"/etc/openoffice/psprint.conf" "/etc/libreoffice/psprint.conf" "" libreoffice-common -- "$@"
diff --git a/libreoffice-common.preinst.in b/libreoffice-common.preinst.in
index da39b95..b8748ae 100755
--- a/libreoffice-common.preinst.in
+++ b/libreoffice-common.preinst.in
@@ -15,6 +15,7 @@ case "$1" in install|upgrade)
fi
dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/ooffice.sh" 1:3.3.0~rc4-2 libreoffice-common -- "$@"
+ dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/libreoffice.sh" 1:5.0.5~rc2-1 libreoffice-common -- "$@"
if [ -n "$2" ] && dpkg --compare-versions "$2" lt "1:3.3.0-3"; then
if [ -d /share ]; then
rm -f /share/config/javasettingsunopkginstall.xml
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index b01b750..6a5f961 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -151,9 +151,9 @@ fi &&
-exec mv {} $OODESTDIR/pkg/libreoffice-core/$OOINSTBASE/program \;
);
-mkdir -p pkg/libreoffice-common/etc/bash_completion.d
+mkdir -p pkg/libreoffice-common/usr/share/bash-completion/completions
mv etc/bash_completion.d/libreoffice$BINSUFFIX.sh \
- pkg/libreoffice-common/etc/bash_completion.d
+ pkg/libreoffice-common/usr/share/bash-completion/completions/libreoffice$BINSUFFIX
mv .$OOINSTBASE/program/java-set-classpath \
pkg/libreoffice-common/$OOINSTBASE/program
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: