[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. libreoffice_3.3.3-1-120-g06a7a99
The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 06a7a992bdac968426440515c95b1c1eb404ac07
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Jun 24 16:15:43 2011 +0200
reenable broken sdbc-postgresql on natty to prevent a NBS
diff --git a/changelog b/changelog
index 054d386..c05abd5 100644
--- a/changelog
+++ b/changelog
@@ -1,11 +1,4 @@
-libreoffice (1:3.3.3-1ubuntu1~ppa2) natty; urgency=high
-
- * update human icon theme to a 2011-06-24 checkout from master
- * update fixes for desktop file entries from ubuntu wiki (LP: #720716)
-
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 24 Jun 2011 12:11:29 +0200
-
-libreoffice (1:3.3.3-1ubuntu1~ppa1) natty; urgency=high
+libreoffice (1:3.3.3-1ubuntu1) natty; urgency=medium
* merge from Debian:
- debian/rules: make multiarch changes conditional and skip them
@@ -21,8 +14,12 @@ libreoffice (1:3.3.3-1ubuntu1~ppa1) natty; urgency=high
* remove desktop-translations.diff, those templates are unused
* remove fix-lo-desktop-pot.diff, those templates are unused
* remove lp775608.diff, has been integrated upstream
+ * update human icon theme to a 2011-06-24 checkout from master
+ * update fixes for desktop file entries from ubuntu wiki (LP: #720716)
+ * reenable sdbc_postgresql for natty even though it is broken,
+ to prevent NBS in natty
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 23 Jun 2011 00:46:44 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 24 Jun 2011 15:48:15 +0200
libreoffice (1:3.3.3-1) unstable; urgency=medium
diff --git a/control b/control
index 90e8d98..ba3cf61 100644
--- a/control
+++ b/control
@@ -837,6 +837,20 @@ Description: office productivity suite -- KDE integration
* konqueror / kmail
* libreoffice-kab: KDE Addressbook support
+Package: libreoffice-sdbc-postgresql
+Section: misc
+Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Suggests: postgresql
+Description: LibreOffice extension for PostgreSQL SDBC driver
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The PostgreSQL SDBC Driver allows one to use the PostgreSQL database from
+ LibreOffice without any wrapper layer such as ODBC or JDBC.
+Homepage: http://dba.openoffice.org/drivers/postgresql/
+
Package: libreoffice-mysql-connector
Section: misc
Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
diff --git a/rules b/rules
index ef25251..57c8b48 100755
--- a/rules
+++ b/rules
@@ -457,6 +457,11 @@ ifeq "$(DIST)" "Ubuntu"
# FIXME: smoketest fails, but we need the indep packages for the other archs
# disabling for all archs to get rid of epm dependency
RUN_SMOKETEST=n
+ # enable building of sdbc_postgresql on natty even though it is broken, because we
+ # otherwise get a NBS
+ ifeq ($(DISTREL),natty)
+ ENABLE_SDBC_POSTGRESQL=y
+ endif
endif
ifeq "$(L10N_SEPARATE_SOURCE)" "y"
--
LibreOffice packaging repository
Reply to: