[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-111-g3e7a294
The following commit has been merged in the debian-experimental-3.5 branch:
commit 3a399dc4ca4b1be1fd78a4acf13998339c4c60aa
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Wed Nov 30 15:09:01 2011 +0100
fix version; update; -sdbc-postgresql is now installed automagically by the installer
diff --git a/changelog b/changelog
index 71fa90b..34947b6 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.5.0~alpha0~git20111129-1) UNRELEASED; urgency=low
+libreoffice (1:3.5.0~beta1~git20111130-1) UNRELEASED; urgency=low
[ Rene Engelhard ]
* new upstream snapshot
diff --git a/libreoffice-sdbc-postgresql.preinst.in b/libreoffice-sdbc-postgresql.preinst.in
deleted file mode 100755
index f276912..0000000
--- a/libreoffice-sdbc-postgresql.preinst.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-case "$1" in
- upgrade)
- if dpkg --compare-versions `echo $2 | cut -d+ -f2` lt OOo3.3.0~; then
- # 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
- fi
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/rules b/rules
index d69b4c5..3d7f10f 100755
--- a/rules
+++ b/rules
@@ -2464,13 +2464,6 @@ ifeq "$(ENABLE_MINIMIZER)" "y"
rm -f $(PKGDIR)-presentation-minimizer/$(OOBRANDDIR)/share/extensions/presentation-minimizer/registration/LICENSE
endif
-ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
- rm -rf $(PKGDIR)-sdbc-postgresql
- mkdir -p $(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extensions/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g)
- cd $(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extensions/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g) && \
- unzip $(CURDIR)/$(SOURCE_TREE)/connectivity/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).oxt
-endif
-
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
rm -f $(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extensions/mysql-connector-ooo/registration/LICENSE
endif
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index e59a8ff..50035a5 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -83,6 +83,7 @@ create_package_directory gid_Module_Optional_Extensions_MySQLConnector pkg/libr
create_package_directory gid_Module_Optional_Extensions_PDFIMPORT pkg/libreoffice-pdfimport
create_package_directory gid_Module_Optional_Extensions_PRESENTER_SCREEN pkg/libreoffice-presenter-console
create_package_directory gid_Module_Optional_Extensions_REPORTDESIGN pkg/libreoffice-report-builder
+create_package_directory gid_Module_Optional_Extensions_PostgreSQL pkg/libreoffice-sdbc-postgresql
move_wrappers pkg/libreoffice-common soffice unopkg
move_wrappers pkg/libreoffice-common libreoffice lofromtemplate
move_wrappers pkg/libreoffice-base lobase
--
LibreOffice packaging repository
Reply to: