[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc1-1-20-g8b4a784
The following commit has been merged in the debian-experimental-3.5 branch:
commit 8b4a784460dafdfab374cbe824974a7e270efd7c
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jan 24 17:28:25 2012 +0000
adapt for extension -> normal optional component change of -sdbc-postgresql
diff --git a/control b/control
index 5e4ed56..49c9d9c 100644
--- a/control
+++ b/control
@@ -3336,10 +3336,10 @@ Description: office productivity suite -- KDE integration
Package: libreoffice-sdbc-postgresql
Section: misc
Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: ${shlibs:Depends}, libreoffice-core (>= 1:3.4.4~), ${misc:Depends}
+Depends: ${shlibs:Depends}, libreoffice-core (>= 1:3.5.0~beta), ${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Suggests: postgresql (>= 8.4)
-Description: LibreOffice extension for PostgreSQL SDBC driver
+Description: PostgreSQL SDBC driver for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
diff --git a/control.postgresql.in b/control.postgresql.in
index e32cf19..617fff7 100644
--- a/control.postgresql.in
+++ b/control.postgresql.in
@@ -1,11 +1,11 @@
Package: libreofficeVER-sdbc-postgresql
Section: misc
Architecture: %OOO_BASE_ARCHS%
-Depends: ${shlibs:Depends}, libreofficeVER-core (>= 1:3.4.4~),
+Depends: ${shlibs:Depends}, libreofficeVER-core (>= 1:3.5.0~beta),
${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Suggests: postgresql (>= 8.4)
-Description: LibreOffice extension for PostgreSQL SDBC driver
+Description: PostgreSQL SDBC driver for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
diff --git a/rules b/rules
index 12069a1..5ce90e8 100755
--- a/rules
+++ b/rules
@@ -1019,7 +1019,8 @@ endif
ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
BUILD_DEPS += , libpq-dev (>= 9.0~)
- CONFIGURE_FLAGS += --enable-ext-postgresql-sdbc
+else
+ CONFIGURE_FLAGS += --disable-sdbc-postgresql
endif
ifeq "$(ENABLE_RANDR)" "y"
@@ -2816,7 +2817,6 @@ endif
-Nlibreoffice$(VER)-presentation-minimizer \
-Nlibreoffice$(VER)-presenter-console \
-Nlibreoffice$(VER)-pdfimport \
- -Nlibreoffice$(VER)-sdbc-postgresql \
-Nlibreoffice$(VER)-mysql-connector -- \
-V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')" \
-V'base-version=$(BASE_VERSION)' \
@@ -2856,10 +2856,6 @@ ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
-v$(shell grep "<version" $(SOURCE_TREE)/sdext/source/presenter/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
ifeq "$(PACKAGE_BASE)" "y"
- ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
- dh_gencontrol -plibreoffice$(VER)-sdbc-postgresql -- \
- -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g)+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
- endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -plibreoffice$(VER)-mysql-connector -- \
-v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index b3c59cf..7251532 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -117,7 +117,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
+create_package_directory gid_Module_Optional_PostgresqlSdbc pkg/libreoffice-sdbc-postgresql
move_wrappers pkg/libreoffice-common soffice unopkg
move_wrappers pkg/libreoffice-common libreoffice loffice lofromtemplate
move_wrappers pkg/libreoffice-base lobase
--
LibreOffice packaging repository
Reply to: