[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0-2-45-g19d5a57
The following commit has been merged in the debian-experimental-4.2 branch:
commit 91437be5ca9c3da037da38b78f875d16a6158c7c
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jul 29 23:30:06 2013 +0200
create new libreoffice-base-drivers; Move hsqldb and firebird into own packages
diff --git a/changelog b/changelog
index 8f288f4..75c948a 100644
--- a/changelog
+++ b/changelog
@@ -10,10 +10,13 @@ libreoffice (1:4.2.0~alpha0~git20130729-1) UNRELEASED; urgency=low
sc_macros_tests VBA tests need Arial etc.-similar fonts
- add conditionals for new libs used: opencl, firebird, avahi-client,
vlc
- * debian/control.in:
+ * debian/control.in, debian/rules:
- split avmediagst.so into new -avmedia-backend-gstreamer and put new vlc
backend into a new -avmedia-backend-vcl. Recommend
-gstreamer | -avmedia and make metapackage depend on that, too
+ * debian/control*in, debian/rules:
+ - create new libreoffice-base-drivers - as name says. Move hsqldb and
+ firebird into own packages
-- Rene Engelhard <rene@debian.org> Sun, 02 Jun 2013 20:49:18 +0200
diff --git a/control b/control
index 7641375..8d35e1e 100644
--- a/control
+++ b/control
@@ -67,7 +67,6 @@ Build-Depends: ant (>= 1.7.0),
liblcms2-dev,
libldap2-dev,
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.9.0),
libmspub-dev,
libmwaw-dev,
libmysqlclient-dev,
@@ -556,40 +555,17 @@ Package: libreoffice-base
Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
Section: database
Depends: libreoffice-base-core (= ${binary:Version}),
+ libreoffice-base-drivers (= ${binary:Version}),
libreoffice-core (= ${binary:Version}),
- ${java-common-depends},
- ${java-runtime-depends},
- ${java:Depends},
${misc:Depends},
${shlibs:Depends}
-Suggests: libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools,
- libmysql-java | libpg-java | libjtds-java,
- libreoffice-gcj,
- libreoffice-report-builder,
- unixodbc
-Recommends: libreoffice-writer
+Suggests: libreoffice-gcj, libreoffice-report-builder, unixodbc
+Recommends: libreoffice-writer, ${java-common-depends}, ${java-runtime-depends}
Description: office productivity suite -- database
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the database component for LibreOffice.
- .
- You can extend the functionality of LibreOffice Base by installing these
- packages:
- .
- * unixodbc: ODBC database support
- * libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools: ODBC
- drivers for:
- - MySQL
- - PostgreSQL
- - SQLite
- - MS SQL / Sybase SQL
- - *.mdb (JET / MS Access)
- * libmysql-java | libpg-java | libjtds-java: JDBC Drivers
- for:
- - MySQL
- - PostgreSQL
- - MS SQL Server and Sybase
Package: libreoffice-style-crystal
Architecture: all
@@ -886,6 +862,74 @@ Description: VLC backend for LibreOffice
This package contains a VLC backend for LibreOffices avmedia component
to play audio/video.
+Package: libreoffice-sdbc-firebird
+Depends: libreoffice-core, ${shlibs:Depends}
+Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
+Section: database
+Enhances: libreoffice-base-drivers
+Description: Firebird SDBC driver for LibreOffice
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The Firebird SDBC Driver allows one to use the Firebird database from
+ LibreOffice without any wrapper layer such as ODBC or JDBC.
+
+Package: libreoffice-sdbc-hsqldb
+Depends: libreoffice-core, ${java-common-depends}, ${java:Depends}
+Replaces: libreoffice-base (<< 1:4.2~)
+Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
+Section: database
+Enhances: libreoffice-base-drivers
+Description: HSQLDB SDBC driver for LibreOffice
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The HSQLDB SDBC Driver allows one to use the HSQLDB embedded database from
+ LibreOffice without any wrapper layer such as ODBC or JDBC.
+
+Package: libreoffice-base-drivers
+Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
+Section: database
+Suggests: libjtds-java,
+ libreoffice-mysql-connector | libmyodbc | libmysql-java,
+ libreoffice-sdbc-postgresql | odbc-postgresql | libpg-java,
+ libsqliteodbc | tdsodbc | mdbtools
+Recommends: libreoffice-sdbc-firebird,
+ libreoffice-sdbc-hsqldb [amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc]
+Replaces: libreoffice-base (<< 1:4.2~)
+Description: Database connectvity drivers for LibreOffice
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the database connectivity drivers used by LibreOffices
+ database functionality:
+ - ODBC
+ - JDBC
+ - dBase
+ - Calc
+ - Flat files
+ - MySQL
+ .
+ You can extend this by installing:
+ .
+ * unixodbc: ODBC database support
+ * libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools: ODBC
+ drivers for:
+ - MySQL
+ - PostgreSQL
+ - SQLite
+ - MS SQL / Sybase SQL
+ - *.mdb (JET / MS Access)
+ * libmysql-java | libpg-java | libjtds-java: JDBC Drivers
+ for:
+ - MySQL
+ - PostgreSQL
+ - MS SQL Server and Sybase
+ * libreoffice-sdbc-hsqldb: embedded HSQLDB SDBC Driver
+ * libreoffice-sdbc-firebird: Firebird SDBC Driver
+ * libreoffice-sdbc-postgresql: PostgreSQL SDBC Driver
+ * libreoffice-mysql-connector: "native" MySQL Connector
+
Package: libreoffice-l10n-af
Section: localization
Architecture: all
@@ -4418,6 +4462,7 @@ Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips
Depends: libreoffice-core (>= 1:3.5.0~beta), ${misc:Depends}, ${shlibs:Depends}
Suggests: postgresql (>= 8.4)
Breaks: ure (<< 1.5.1+OOo3.1.1-15)
+Enhances: libreoffice-base-drivers
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.
@@ -4539,7 +4584,6 @@ Depends: ant (>= 1.7.0),
libldap2-dev,
libloader-java (>= 1.1.6),
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.9.0),
libmspub-dev,
libmwaw-dev,
libmysqlclient-dev,
diff --git a/control.in b/control.in
index 1306a31..946e6ec 100644
--- a/control.in
+++ b/control.in
@@ -410,40 +410,19 @@ Package: libreoffice-base
Architecture: %OOO_BASE_ARCHS%
Section: database
Depends: libreoffice-base-core (= ${binary:Version}),
+ libreoffice-base-drivers (= ${binary:Version}),
libreoffice-core (= ${binary:Version}),
- ${java-common-depends},
- ${java-runtime-depends},
- ${java:Depends},
${misc:Depends},
${shlibs:Depends}
-Suggests: libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools,
- libmysql-java | libpg-java | libjtds-java,
- libreoffice-gcj,
+Suggests: libreoffice-gcj,
libreoffice-report-builder,
unixodbc
-Recommends: libreoffice-writer
+Recommends: libreoffice-writer, ${java-common-depends}, ${java-runtime-depends}
Description: office productivity suite -- database
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the database component for LibreOffice.
- .
- You can extend the functionality of LibreOffice Base by installing these
- packages:
- .
- * unixodbc: ODBC database support
- * libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools: ODBC
- drivers for:
- - MySQL
- - PostgreSQL
- - SQLite
- - MS SQL / Sybase SQL
- - *.mdb (JET / MS Access)
- * libmysql-java | libpg-java | libjtds-java: JDBC Drivers
- for:
- - MySQL
- - PostgreSQL
- - MS SQL Server and Sybase
Package: libreoffice-style-crystal
Architecture: all
@@ -740,3 +719,70 @@ Description: VLC backend for LibreOffice
This package contains a VLC backend for LibreOffices avmedia component
to play audio/video.
+Package: libreoffice-sdbc-firebird
+Depends: libreoffice-core, ${shlibs:Depends}
+Architecture: %OOO_BASE_ARCHS%
+Section: database
+Enhances: libreoffice-base-drivers
+Description: Firebird SDBC driver for LibreOffice
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The Firebird SDBC Driver allows one to use the Firebird database from
+ LibreOffice without any wrapper layer such as ODBC or JDBC.
+
+Package: libreoffice-sdbc-hsqldb
+Depends: libreoffice-core, ${java-common-depends}, ${java:Depends}
+Replaces: libreoffice-base (<< 1:4.2~)
+Architecture: %OOO_JAVA_ARCHS%
+Section: database
+Enhances: libreoffice-base-drivers
+Description: HSQLDB SDBC driver for LibreOffice
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The HSQLDB SDBC Driver allows one to use the HSQLDB embedded database from
+ LibreOffice without any wrapper layer such as ODBC or JDBC.
+
+Package: libreoffice-base-drivers
+Architecture: %OOO_BASE_ARCHS%
+Section: database
+Suggests: libreoffice-sdbc-postgresql | odbc-postgresql | libpg-java,
+ libreoffice-mysql-connector | libmyodbc | libmysql-java,
+ libsqliteodbc | tdsodbc | mdbtools,
+ libjtds-java,
+Recommends: libreoffice-sdbc-hsqldb [%OOO_JAVA_ARCHS%], libreoffice-sdbc-firebird
+Replaces: libreoffice-base (<< 1:4.2~)
+Description: Database connectvity drivers for LibreOffice
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the database connectivity drivers used by LibreOffices
+ database functionality:
+ - ODBC
+ - JDBC
+ - dBase
+ - Calc
+ - Flat files
+ - MySQL
+ .
+ You can extend this by installing:
+ .
+ * unixodbc: ODBC database support
+ * libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools: ODBC
+ drivers for:
+ - MySQL
+ - PostgreSQL
+ - SQLite
+ - MS SQL / Sybase SQL
+ - *.mdb (JET / MS Access)
+ * libmysql-java | libpg-java | libjtds-java: JDBC Drivers
+ for:
+ - MySQL
+ - PostgreSQL
+ - MS SQL Server and Sybase
+ * libreoffice-sdbc-hsqldb: embedded HSQLDB SDBC Driver
+ * libreoffice-sdbc-firebird: Firebird SDBC Driver
+ * libreoffice-sdbc-postgresql: PostgreSQL SDBC Driver
+ * libreoffice-mysql-connector: "native" MySQL Connector
+
diff --git a/control.postgresql.in b/control.postgresql.in
index 7fe2266..838e420 100644
--- a/control.postgresql.in
+++ b/control.postgresql.in
@@ -6,6 +6,7 @@ Depends: libreoffice-core (>= 1:3.5.0~beta),
${shlibs:Depends}
Suggests: postgresql (>= 8.4)
Breaks: ure (<< 1.5.1+OOo3.1.1-15)
+Enhances: libreoffice-base-drivers
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 67f3ec9..687b12e 100755
--- a/rules
+++ b/rules
@@ -182,7 +182,7 @@ ifneq "$(WHEEZY_BACKPORT)" "y"
BOOST_MINVER= (>= 1.49.0-4)
endif
endif
-SYSTEM_STUFF += mdds
+#SYSTEM_STUFF += mdds
SYSTEM_STUFF += vigra
USE_EXTERNAL_CXXLIBS=y
SYSTEM_STUFF += mythes
@@ -475,9 +475,9 @@ ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
ENABLE_EVO2=n
ENABLE_KDEAB=n
ENABLE_REPORTDESIGN=n
- DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core
+ DEBHELPER_OPTIONS += -Nlibreoffice-base libreoffice-base-core -Nlibreoffice-base-drivers
DEBHELPER_OPTIONS += -Nlibreoffice-evolution -Nlibreoffice-kab
- DEBHELPER_OPTIONS += -Nlibreoffice-sdbc-postgresql -Nlibreoffice-mysql-connector
+ DEBHELPER_OPTIONS += -Nlibreoffice-sdbc-postgresql -Nlibreoffice-mysql-connector -Nlibreoffice-sdbc-hsqldb libreoffice-sdbc-firebird
DEBHELPER_OPTIONS += -Nlibreoffice-report-builder-bin -Nlibreoffice-report-builder
CONFIGURE_FLAGS += --disable-database-connectivity
endif
@@ -2600,6 +2600,30 @@ ifeq "$(USE_VLC)" "y"
$(PKGDIR)-avmedia-backend-vlc/$(OODIR)/program
endif
+ifeq "$(ENABLE_JAVA)" "y"
+ mkdir -p $(PKGDIR)-sdbc-hsqldb/$(OODIR)/program
+ mkdir -p $(PKGDIR)-sdbc-hsqldb/usr/lib/libreoffice/program/classes
+ mkdir -p $(PKGDIR)-sdbc-hsqldb/usr/share/libreoffice/program/classes
+ mv $(PKGDIR)-base/$(OODIR)/program/libhsqldb.so \
+ $(PKGDIR)-sdbc-hsqldb/$(OODIR)/program
+ ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
+ mv $(PKGDIR)-base/usr/lib/libreoffice/program/classes/hsqldb.jar \
+ $(PKGDIR)-sdbc-hsqldb/usr/lib/libreoffice/program/classes
+ endif
+ for i in lib share; do \
+ mv $(PKGDIR)-base/usr/$$i/libreoffice/program/classes/sdbc_hsqldb.jar \
+ $(PKGDIR)-sdbc-hsqldb/usr/$$i/libreoffice/program/classes; \
+ done
+endif
+ mkdir -p $(PKGDIR)-sdbc-firebird/$(OODIR)/program
+ mv $(PKGDIR)-base/$(OODIR)/program/libfirebird-sdbclo.so \
+ mkdir -p $(PKGDIR)-sdbc-firebird/$(OODIR)/program
+ find $(PKGDIR)-base/$(OODIR)/program \
+i ! -name "libdbulo*" -a ! -name "libdbaxml*" \
+ -a ! -name "libdbp*"; then
+ mv $$i \
+ $(PKGDIR)-base-drivers/$(OODIR)/program
+
for i in $(ARCH_DEP_PACKAGES); do \
if [ -e debian/$$i.bug-script.in ]; then \
cat debian/$$i.bug-script.in \
--
LibreOffice packaging repository
Reply to: