This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 25542c064a7a72f319be4a4f936e0fb9efdd2e7c
Author: Rene Engelhard <r...@debian.org>
Date: Wed Feb 3 23:57:34 2016 +0100
move rm_conffile to .maintscript and remove obsolete cruft (3.4, OOo->LO)
---
changelog | 4 ++-
libreoffice-common.maintscript | 1 +
libreoffice-common.postinst.in | 16 ---------
libreoffice-common.postrm.in | 9 -----
libreoffice-common.preinst.in | 78 ------------------------------------------
libreoffice-core.preinst.in | 15 --------
6 files changed, 4 insertions(+), 119 deletions(-)
diff --git a/changelog b/changelog
index fa78e04..74032d0 100644
--- a/changelog
+++ b/changelog
@@ -8,10 +8,12 @@ libreoffice (1:5.1.1~rc1~git20160203-1) UNRELEASED;
urgency=medium
* debian/patches/tdf96653.diff: backport tdf#96653 fix from master
(fix (PNG) images in PDF export), closes: #813586
- * 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
+ * debian/libreoffice-common.{pre,post}{rm,inst}.in: remove long obsolete
+ (3.4, OOo->LO) maintainer script snippets
-- Rene Engelhard <r...@debian.org> Sat, 19 Dec 2015 01:50:15 +0100
diff --git a/libreoffice-common.maintscript b/libreoffice-common.maintscript
new file mode 100644
index 0000000..f89b47b
--- /dev/null
+++ b/libreoffice-common.maintscript
@@ -0,0 +1 @@
+rm_conffile "/etc/bash_completion.d/libreoffice.sh" 1:5.1.1~rc1-1
$DPKG_MAINTSCRIPT_PACKAGE
diff --git a/libreoffice-common.postinst.in b/libreoffice-common.postinst.in
index b09f224..897f046 100644
--- a/libreoffice-common.postinst.in
+++ b/libreoffice-common.postinst.in
@@ -15,21 +15,5 @@ if [ "$1" = "triggered" ]; then
done
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.1-1~rc1-1 libreoffice-common -- "$@"
-
- dpkg-maintscript-helper mv_conffile \
- "/etc/openoffice/psprint.conf" "/etc/libreoffice/psprint.conf"
"" libreoffice-common -- "$@"
- dpkg-maintscript-helper mv_conffile \
- "/etc/openoffice/sofficerc" "/etc/libreoffice/sofficerc" ""
libreoffice-common -- "$@"
- dpkg-maintscript-helper mv_conffile \
- "/etc/openoffice/soffice.sh" "/etc/libreoffice/soffice.sh" ""
libreoffice-common -- "$@"
-
- # try to remove, hopefully empty now
- rmdir /etc/openoffice 2>/dev/null || true
-
-fi
-
#DEBHELPER#
diff --git a/libreoffice-common.postrm.in b/libreoffice-common.postrm.in
index d31dd3a..c4471b5 100644
--- a/libreoffice-common.postrm.in
+++ b/libreoffice-common.postrm.in
@@ -6,15 +6,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.1.1~rc1-1 libreoffice-common -- "$@"
-
- dpkg-maintscript-helper mv_conffile \
- "/etc/openoffice/psprint.conf"
"/etc/libreoffice/psprint.conf" "" libreoffice-common -- "$@"
- dpkg-maintscript-helper mv_conffile \
- "/etc/openoffice/sofficerc"
"/etc/libreoffice/sofficerc" "" libreoffice-common -- "$@"
- dpkg-maintscript-helper mv_conffile \
- "/etc/openoffice/soffice.sh"
"/etc/libreoffice/soffice.sh" "" libreoffice-common -- "$@"
rm -rf /`echo @OODIR@ | sed -e
s,usr/,var/,g`/share/prereg/bundled
rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/share/prereg/ ||
true
rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/share/ || true
diff --git a/libreoffice-common.preinst.in b/libreoffice-common.preinst.in
deleted file mode 100755
index fc8a4f9..0000000
--- a/libreoffice-common.preinst.in
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in install|upgrade)
- # move a already-filled in javasettingsunopkginstall.xml to the new
- # location on upgrades
- if [ ! -e `echo /@OODIR@ | sed -e
s/usr/var/`/share/config/javasettingsunopkginstall.xml ]; then
- if [ -e `echo /@OODIR@ | sed -e s/usr/var/ | sed -e
s/libre/open/`/config/javasettingsunopkginstall.xml ]; then
- mv `echo /@OODIR@ | sed -e s/usr/var/ | sed -e
s/libre/open/`/share/config/javasettingsunopkginstall.xml \
- `echo /@OODIR@ | sed -e
s/usr/var/`/share/config/javasettingsunopkginstall.xml
- fi
- 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.1.1~rc1-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
- rmdir /share/config 2> /dev/null && rmdir /share 2>
/dev/null || true
- fi
-
- if [ -d /user ]; then
- for i in shared tmp; do
- rmdir /user/extensions/$i/extensions 2>
/dev/null || true
- rm -f /user/extensions/$i/extensions.db
- rm -f /user/extensions/$i/lastsynchronized
- rm -f /user/extensions/$i/log.txt
- rmdir
/user/extensions/$i/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend
2> /dev/null || true
- rmdir
/user/extensions/$i/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend
2> /dev/null || true
- rm -f
/user/extensions/$i/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
|| true
- rm -f
/user/extensions/$i/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registered_packages.db
|| true
- rmdir
/user/extensions/$i/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend
2> /dev/null || true
- rmdir
/user/extensions/$i/registry/com.sun.star.comp.deployment.executable.PackageRegistryBackend
2> /dev/null || true
- rm -f
/user/extensions/$i/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
|| true
- rmdir
/user/extensions/$i/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend
2> /dev/null || true
- rmdir
/user/extensions/$i/registry/com.sun.star.comp.deployment.script.PackageRegistryBackend
2> /dev/null || true
- rmdir
/user/extensions/$i/registry/com.sun.star.comp.deployment.sfwk.PackageRegistryBackend
2> /dev/null || true
- rmdir /user/extensions/$i/registry 2> /dev/null
&& rmdir /user/extensions/$i 2> /dev/null || true
- done
- rmdir /user/extensions/ 2> /dev/null && rmdir /user 2>
/dev/null || true
-
- rm -f /user/uno_packages/cache/log.txt
- rmdir
/user/uno_packages/cache/registry/com.sun.star.comp.deployment.bundle.PackageRegistryBackend
2> /dev/null || true
- rmdir
/user/uno_packages/cache/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend
2> /dev/null || true
- rm -f
/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/backenddb.xml
|| true
- rm -f
/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/registered_packages.db
|| true
- rmdir
/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend
2> /dev/null || true
- rmdir
/user/uno_packages/cache/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend
2> /dev/null || true
- rmdir
/user/uno_packages/cache/registry/com.sun.star.comp.deployment.executable.PackageRegistryBackend
2> /dev/null || true
- rm -f
/user/uno_packages/cache/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend/backenddb.xml
|| true
- rmdir
/user/uno_packages/cache/registry/com.sun.star.comp.deployment.help.PackageRegistryBackend
2> /dev/null || true
- rmdir
/user/uno_packages/cache/registry/com.sun.star.comp.deployment.script.PackageRegistryBackend
2> /dev/null || true
- rmdir
/user/uno_packages/cache/registry/com.sun.star.comp.deployment.sfwk.PackageRegistryBackend
2> /dev/null || true
- rmdir /user/uno_packages/cache/uno_packages 2>
/dev/null || true
- rm -f /user/uno_packages/cache/uno_packages.db 2>
/dev/null || true
-
-
- rmdir /user/uno_packages/cache/registry 2> /dev/null &&
rmdir /user/uno_packages/cache 2> /dev/null && rmdir /user/uno_packages 2>
/dev/null || true
-
- rmdir /user 2> /dev/null || true
- fi
- fi
-
- dpkg-maintscript-helper mv_conffile \
- "/etc/openoffice/psprint.conf" "/etc/libreoffice/psprint.conf"
"" libreoffice-common -- "$@"
- dpkg-maintscript-helper mv_conffile \
- "/etc/openoffice/sofficerc" "/etc/libreoffice/sofficerc" ""
libreoffice-common -- "$@"
- dpkg-maintscript-helper mv_conffile \
- "/etc/openoffice/soffice.sh" "/etc/libreoffice/soffice.sh" ""
libreoffice-common -- "$@"
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/libreoffice-core.preinst.in b/libreoffice-core.preinst.in
deleted file mode 100755
index 550d918..0000000
--- a/libreoffice-core.preinst.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "upgrade" -o "$1" = "install" ]; then
- rm -f /`echo @OODIR@ | sed -e
s,usr/,var/,g`/basis3.4/program/services.rdb
- rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/basis3.4/program/
2>/dev/null || true
- rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/basis3.4 2>/dev/null ||
true
-fi
-
-#DEBHELPER#
-
-exit 0
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
