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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.1-1-4-gf1a0e02



The following commit has been merged in the debian-experimental-3.4.0 branch:
commit f1a0e0256c34445f8bc6d9e0fe79af8b8e80f5b6
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Jul 10 23:04:55 2011 +0000

    call dpkg-trigger instead of calling the funtins directly (Jonathan Nieder)

diff --git a/changelog b/changelog
index 2418e4c..cd6ac69 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,10 @@
 libreoffice (1:3.4.1-2) UNRELEASED; urgency=low
 
-  * debian/shell-lib-components.sh:
-    - check for /@OOBASISDIR@/program/.services.rdb (closes: #633396)
+  * debian/libreoffice-common.postinst.in, libreoffice-core.postinst.in,
+    debian/shell-lib-components.sh:
+    check for /@OOBASISDIR@/program/.services.rdb before uisng it
+    (closes: #633396) and replace manual call of the function by
+    dpkg-trigger (thanks Jonathan Nieder)
   * debian/control.in:
     - make new -common break old -evolution/-filter-binfilter
 
diff --git a/libreoffice-common.postinst.in b/libreoffice-common.postinst.in
index 56b9edc..a7f181d 100644
--- a/libreoffice-common.postinst.in
+++ b/libreoffice-common.postinst.in
@@ -36,10 +36,10 @@ if [ "$1" = "configure" ]; then
 	rmdir /etc/openoffice 2>/dev/null || true
 
 	if dpkg --compare-versions "$2" lt "1:3.3.0-3"; then
-		sync_extensions
+		dpkg-trigger /@OOBRANDDIR@/share/extensions
 	fi
 	if dpkg --compare-versions "$2" lt "1:3.4.0-1"; then
-		update_services_rdb
+		dpkg-trigger /@OOBASISDIR@/registered-components
 	fi
 fi
 

-- 
LibreOffice packaging repository


Reply to: