[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. f5b553c9bf2fabcd08bab29e5e10c9d881e5c309



The following commit has been merged in the master branch:
commit f5b553c9bf2fabcd08bab29e5e10c9d881e5c309
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Mar 24 09:36:14 2011 +0100

    try to remove /etc/openoffice if it's empty

diff --git a/changelog b/changelog
index 3fc45d4..0a225a3 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,10 @@ libreoffice (1:3.3.2-2) UNRELEASED; urgency=low
 
   * debian/rules:
     - really use internal libtextcat on squeeze (thanks dba) 
+  * debian/libreoffice-common.postinst.in:
+    - try to remove /etc/openoffice if it's empty 
 
- -- Rene Engelhard <rene@debian.org>  Wed, 23 Mar 2011 15:26:38 +0100
+ -- Rene Engelhard <rene@debian.org>  Thu, 24 Mar 2011 09:34:40 +0100
 
 libreoffice (1:3.3.2-1) unstable; urgency=low
 
diff --git a/libreoffice-common.postinst.in b/libreoffice-common.postinst.in
index 74c623a..5e34758 100644
--- a/libreoffice-common.postinst.in
+++ b/libreoffice-common.postinst.in
@@ -29,6 +29,9 @@ if [ "$1" = "configure" ]; then
 			"/etc/openoffice/soffice.sh" "/etc/libreoffice/soffice.sh" "" libreoffice-common -- "$@"
 	fi
 
+	# try to remove, hopefully empty now
+	rmdir /etc/openoffice 2>/dev/null || true
+
 	if dpkg --compare-versions "$2" lt "1:3.3.0-3"; then
 		sync_extensions
 	fi

-- 
LibreOffice packaging repository


Reply to: