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

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-4-6-gf34451f



The following commit has been merged in the master branch:
commit f34451f9ef4a7508904704c9abd5c1767b247055
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Mar 4 15:13:28 2012 +0100

      * debian/*.triggers, debian/*.prerm.in:
       - add activate triggers for /usr/lib/libreoffice/share/extensions to
         the respetive extensions. Run sync_extensions after rm -rf'ing the
         dir already in preinst (upgrade) (closes: #658646)

diff --git a/changelog b/changelog
index ddaa7e1..718a0fd 100644
--- a/changelog
+++ b/changelog
@@ -10,8 +10,12 @@ libreoffice (1:3.4.5-5) UNRELEASED; urgency=low
     libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64]
   * debian/rules:
     - remove -O0 setting via ARCH_FLAGS, already handled by debian-opt.diff
+  * debian/*.triggers, debian/*.prerm.in:
+   - add activate triggers for /usr/lib/libreoffice/share/extensions to
+     the respetive extensions. Run sync_extensions after rm -rf'ing the
+     dir already in preinst (upgrade) (closes: #658646)
 
- -- Rene Engelhard <rene@debian.org>  Fri, 02 Mar 2012 23:15:39 +0100
+ -- Rene Engelhard <rene@debian.org>  Sun, 04 Mar 2012 13:21:41 +0100
 
 libreoffice (1:3.4.5-4) unstable; urgency=low
 
diff --git a/libreoffice-common.triggers b/libreoffice-common.triggers
new file mode 100644
index 0000000..affe09d
--- /dev/null
+++ b/libreoffice-common.triggers
@@ -0,0 +1,3 @@
+interest /usr/lib/libreoffice/share/extensions
+interest /usr/lib/libreoffice/basis3.4/registered-components
+
diff --git a/libreoffice-mysql-connector.preinst.in b/libreoffice-mysql-connector.preinst.in
new file mode 100644
index 0000000..b164e00
--- /dev/null
+++ b/libreoffice-mysql-connector.preinst.in
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "upgrade" ]; then
+	rm -rf /usr/lib/libreoffice/share/extensions/mysql-connector-ooo
+	sync_extensions
+fi
+
+#DEBHELPER#
+
diff --git a/libreoffice-mysql-connector.triggers b/libreoffice-mysql-connector.triggers
new file mode 100644
index 0000000..b5aaf61
--- /dev/null
+++ b/libreoffice-mysql-connector.triggers
@@ -0,0 +1 @@
+activate /usr/lib/libreoffice/share/extensions
diff --git a/libreoffice-pdfimport.preinst.in b/libreoffice-pdfimport.preinst.in
new file mode 100644
index 0000000..c4161ed
--- /dev/null
+++ b/libreoffice-pdfimport.preinst.in
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "upgrade" ]; then
+	rm -rf /usr/lib/libreoffice/share/extensions/pdfimport
+	sync_extensions
+fi
+
+#DEBHELPER#
+
diff --git a/libreoffice-pdfimport.triggers b/libreoffice-pdfimport.triggers
new file mode 100644
index 0000000..b5aaf61
--- /dev/null
+++ b/libreoffice-pdfimport.triggers
@@ -0,0 +1 @@
+activate /usr/lib/libreoffice/share/extensions
diff --git a/libreoffice-presentation-minimizer.preinst.in b/libreoffice-presentation-minimizer.preinst.in
new file mode 100644
index 0000000..bb6d37a
--- /dev/null
+++ b/libreoffice-presentation-minimizer.preinst.in
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "upgrade" ]; then
+	rm -rf /usr/lib/libreoffice/share/extensions/presentation-minimizer
+	sync_extensions
+fi
+
+#DEBHELPER#
+
diff --git a/libreoffice-presentation-minimizer.triggers b/libreoffice-presentation-minimizer.triggers
new file mode 100644
index 0000000..b5aaf61
--- /dev/null
+++ b/libreoffice-presentation-minimizer.triggers
@@ -0,0 +1 @@
+activate /usr/lib/libreoffice/share/extensions
diff --git a/libreoffice-presenter-console.preinst.in b/libreoffice-presenter-console.preinst.in
new file mode 100644
index 0000000..eb60c14
--- /dev/null
+++ b/libreoffice-presenter-console.preinst.in
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "upgrade" ]; then
+	rm -rf /usr/lib/libreoffice/share/extensions/presenter-screen
+	sync_extensions
+fi
+
+#DEBHELPER#
+
diff --git a/libreoffice-presenter-console.triggers b/libreoffice-presenter-console.triggers
new file mode 100644
index 0000000..b5aaf61
--- /dev/null
+++ b/libreoffice-presenter-console.triggers
@@ -0,0 +1 @@
+activate /usr/lib/libreoffice/share/extensions
diff --git a/libreoffice-report-builder.preinst.in b/libreoffice-report-builder.preinst.in
new file mode 100644
index 0000000..0ce967a
--- /dev/null
+++ b/libreoffice-report-builder.preinst.in
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "upgrade" ]; then
+	rm -rf /usr/lib/libreoffice/share/extensions/report-builder
+	sync_extensions
+fi
+
+#DEBHELPER#
+
diff --git a/libreoffice-report-builder.triggers b/libreoffice-report-builder.triggers
new file mode 100644
index 0000000..b5aaf61
--- /dev/null
+++ b/libreoffice-report-builder.triggers
@@ -0,0 +1 @@
+activate /usr/lib/libreoffice/share/extensions
diff --git a/libreoffice-script-provider-bsh.preinst.in b/libreoffice-script-provider-bsh.preinst.in
new file mode 100644
index 0000000..0c4e864
--- /dev/null
+++ b/libreoffice-script-provider-bsh.preinst.in
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+#INCLUDE_SHELL_LIB#
+
+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
new file mode 100644
index 0000000..260488d
--- /dev/null
+++ b/libreoffice-script-provider-js.preinst.in
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "upgrade" ]; then
+	rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-javascript
+	sync_extensions
+fi
+
+#DEBHELPER#
+
diff --git a/libreoffice-sdbc-pistgresql.triggers b/libreoffice-sdbc-pistgresql.triggers
new file mode 100644
index 0000000..b5aaf61
--- /dev/null
+++ b/libreoffice-sdbc-pistgresql.triggers
@@ -0,0 +1 @@
+activate /usr/lib/libreoffice/share/extensions
diff --git a/libreoffice-sdbc-postgresql.preinst.in b/libreoffice-sdbc-postgresql.preinst.in
old mode 100755
new mode 100644
index b01abb6..545f1da
--- a/libreoffice-sdbc-postgresql.preinst.in
+++ b/libreoffice-sdbc-postgresql.preinst.in
@@ -1,21 +1,13 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
 #INCLUDE_SHELL_LIB#
 
-case "$1" in
-	upgrade)
-		case "`echo $2 | cut -d+ -f2`" in
-		OOo*)
-			# this is a legacy package, so we need to find it first...
-			id=`/usr/lib/libreoffice/program/unopkg list --shared | grep Identifier:.*postgresql-sdbc | cut -d":" -f2`
-			remove_extension $id
-			;;
-		esac
-	;;
-esac
+if [ "$1" = "upgrade" ]; then
+	rm -rf /usr/lib/libreoffice/share/extensions/postgresql-sdbc-*
+	sync_extensions
+fi
 
 #DEBHELPER#
 
-exit 0
diff --git a/libreoffice-wiki-publisher.preinst.in b/libreoffice-wiki-publisher.preinst.in
new file mode 100644
index 0000000..e98f546
--- /dev/null
+++ b/libreoffice-wiki-publisher.preinst.in
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+#INCLUDE_SHELL_LIB#
+
+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
new file mode 100644
index 0000000..dd0b92a
--- /dev/null
+++ b/python-uno.preinst.in
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "upgrade" ]; then
+	rm -rf /usr/lib/libreoffice/share/extensions/script-provider-for-python
+	sync_extensions
+fi
+
+#DEBHELPER#
+

-- 
LibreOffice packaging repository


Reply to: