This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit c5b3fcc44bc231feabe0b403e18460031458931c
Author: Rene Engelhard <r...@debian.org>
Date: Thu Feb 4 13:27:29 2016 +0100
move bash_completion rm_conffile to .maintscript
---
changelog | 2 +-
libreoffice-common.maintscript | 1 +
libreoffice-common.postinst.in | 1 -
libreoffice-common.postrm.in | 1 -
libreoffice-common.preinst.in | 1 -
5 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/changelog b/changelog
index c823e29..5fb02ef 100644
--- a/changelog
+++ b/changelog
@@ -6,7 +6,7 @@ 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/libreoffice-common.{post,pre}{rm,inst}.in:
+ * debian/libreoffice-common.maintscript:
rm_conffile /etc/bash_completion.d/libreoffice.sh
* debian/scripts/gid2pkgdirs.sh: adapt for bash_completion move and install
without .sh
diff --git a/libreoffice-common.maintscript b/libreoffice-common.maintscript
new file mode 100644
index 0000000..d680c68
--- /dev/null
+++ b/libreoffice-common.maintscript
@@ -0,0 +1 @@
+rm_conffile "/etc/bash_completion.d/libreoffice.sh" 1:5.0.5~rc2-1
$DPKG_MAINTSCRIPT_PACKAGE
diff --git a/libreoffice-common.postinst.in b/libreoffice-common.postinst.in
index 1276802..a736474 100644
--- a/libreoffice-common.postinst.in
+++ b/libreoffice-common.postinst.in
@@ -17,7 +17,6 @@ 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 631f96b..5aec23d 100644
--- a/libreoffice-common.postrm.in
+++ b/libreoffice-common.postrm.in
@@ -7,7 +7,6 @@ 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 b8748ae..da39b95 100755
--- a/libreoffice-common.preinst.in
+++ b/libreoffice-common.preinst.in
@@ -15,7 +15,6 @@ 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
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
