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

[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.5.4-5-143-g4d4f4d6



The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit c93d6c8c7a09cf6ab9b85787d8fae024b20fb676
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Mon Apr 2 17:36:58 2012 +0200

    lp#969707: do not use libreoffice-cores unopkg in preinst

diff --git a/libreoffice-mysql-connector.preinst.in b/libreoffice-mysql-connector.preinst.in
index b164e00..13a9738 100644
--- a/libreoffice-mysql-connector.preinst.in
+++ b/libreoffice-mysql-connector.preinst.in
@@ -6,7 +6,6 @@ set -e
 
 if [ "$1" = "upgrade" ]; then
 	rm -rf /usr/lib/libreoffice/share/extensions/mysql-connector-ooo
-	sync_extensions
 fi
 
 #DEBHELPER#
diff --git a/libreoffice-pdfimport.preinst.in b/libreoffice-pdfimport.preinst.in
index c4161ed..1528f77 100644
--- a/libreoffice-pdfimport.preinst.in
+++ b/libreoffice-pdfimport.preinst.in
@@ -6,7 +6,6 @@ set -e
 
 if [ "$1" = "upgrade" ]; then
 	rm -rf /usr/lib/libreoffice/share/extensions/pdfimport
-	sync_extensions
 fi
 
 #DEBHELPER#
diff --git a/libreoffice-presentation-minimizer.preinst.in b/libreoffice-presentation-minimizer.preinst.in
index bb6d37a..b9039f4 100644
--- a/libreoffice-presentation-minimizer.preinst.in
+++ b/libreoffice-presentation-minimizer.preinst.in
@@ -6,7 +6,6 @@ set -e
 
 if [ "$1" = "upgrade" ]; then
 	rm -rf /usr/lib/libreoffice/share/extensions/presentation-minimizer
-	sync_extensions
 fi
 
 #DEBHELPER#
diff --git a/libreoffice-presenter-console.preinst.in b/libreoffice-presenter-console.preinst.in
index eb60c14..9d2cba8 100644
--- a/libreoffice-presenter-console.preinst.in
+++ b/libreoffice-presenter-console.preinst.in
@@ -6,7 +6,6 @@ set -e
 
 if [ "$1" = "upgrade" ]; then
 	rm -rf /usr/lib/libreoffice/share/extensions/presenter-screen
-	sync_extensions
 fi
 
 #DEBHELPER#
diff --git a/libreoffice-report-builder.preinst.in b/libreoffice-report-builder.preinst.in
index 0ce967a..24a943e 100644
--- a/libreoffice-report-builder.preinst.in
+++ b/libreoffice-report-builder.preinst.in
@@ -6,7 +6,6 @@ set -e
 
 if [ "$1" = "upgrade" ]; then
 	rm -rf /usr/lib/libreoffice/share/extensions/report-builder
-	sync_extensions
 fi
 
 #DEBHELPER#
diff --git a/libreoffice-script-provider-bsh.preinst.in b/libreoffice-script-provider-bsh.preinst.in
index 0c4e864..de40c46 100644
--- a/libreoffice-script-provider-bsh.preinst.in
+++ b/libreoffice-script-provider-bsh.preinst.in
@@ -6,7 +6,6 @@ set -e
 
 if [ "$1" = "upgrade" ]; then
 	rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-beanshell
-	sync_extensions
 fi
 
 #DEBHELPER#
diff --git a/libreoffice-script-provider-js.preinst.in b/libreoffice-script-provider-js.preinst.in
index 260488d..657ed30 100644
--- a/libreoffice-script-provider-js.preinst.in
+++ b/libreoffice-script-provider-js.preinst.in
@@ -6,7 +6,6 @@ set -e
 
 if [ "$1" = "upgrade" ]; then
 	rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-javascript
-	sync_extensions
 fi
 
 #DEBHELPER#
diff --git a/libreoffice-script-provider-python.preinst.in b/libreoffice-script-provider-python.preinst.in
index dd0b92a..9ed1fd7 100644
--- a/libreoffice-script-provider-python.preinst.in
+++ b/libreoffice-script-provider-python.preinst.in
@@ -6,7 +6,6 @@ set -e
 
 if [ "$1" = "upgrade" ]; then
 	rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-python
-	sync_extensions
 fi
 
 #DEBHELPER#
diff --git a/libreoffice-wiki-publisher.preinst.in b/libreoffice-wiki-publisher.preinst.in
index e98f546..babb8d8 100644
--- a/libreoffice-wiki-publisher.preinst.in
+++ b/libreoffice-wiki-publisher.preinst.in
@@ -6,7 +6,6 @@ set -e
 
 if [ "$1" = "upgrade" ]; then
 	rm -rf /usr/lib/libreoffice/share/extensions/wiki-publisher
-	sync_extensions
 fi
 
 #DEBHELPER#
diff --git a/python-uno.preinst.in b/python-uno.preinst.in
index 0d8db01..9ed1fd7 100644
--- a/python-uno.preinst.in
+++ b/python-uno.preinst.in
@@ -5,10 +5,7 @@ set -e
 #INCLUDE_SHELL_LIB#
 
 if [ "$1" = "upgrade" ]; then
-	if dpkg --compare-versions "$2" lt "1:3.5.2-2"; then
-		rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-python
-		sync_extensions
-	fi
+	rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-python
 fi
 
 #DEBHELPER#
diff --git a/python3-uno.preinst.in b/python3-uno.preinst.in
index 0d8db01..9ed1fd7 100644
--- a/python3-uno.preinst.in
+++ b/python3-uno.preinst.in
@@ -5,10 +5,7 @@ set -e
 #INCLUDE_SHELL_LIB#
 
 if [ "$1" = "upgrade" ]; then
-	if dpkg --compare-versions "$2" lt "1:3.5.2-2"; then
-		rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-python
-		sync_extensions
-	fi
+	rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-python
 fi
 
 #DEBHELPER#

-- 
LibreOffice packaging repository


Reply to: