------------------------------------------------------------
revno: 2103
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Thu 2010-09-16 23:55:59 +0200
message:
temporarily disable -sdbc-postgresql
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2010-09-16 20:43:33 +0000
+++ b/changelog 2010-09-16 21:55:59 +0000
@@ -22,6 +22,8 @@
as otherwise libjpipe.so is not found...
- remove WITH_SPLIT option, upstream vanilla tarballs not supported by
new ooo-build build anymore
+ - temporarily disable -sdbc-postgresql as unopkg apparently has problems
+ with .zips now...
* debian/control.in, debian/rules: adapt for "Test Cleanup". Build-depend
on libcppunit-dev and junit4. Remove xvfb.
* debian/*.{pre,post},{inst,rm}.in, debian/shell-lib-{components,extensions}:
@@ -54,7 +56,7 @@
installed/updated
* debian/control.in, debian/rules: stop building industrial package
- -- Rene Engelhard <r...@debian.org> Thu, 16 Sep 2010 22:42:14 +0200
+ -- Rene Engelhard <r...@debian.org> Thu, 16 Sep 2010 23:52:59 +0200
openoffice.org (1:3.2.1-6) unstable; urgency=high
=== modified file 'control'
--- a/control 2010-09-16 20:56:42 +0000
+++ b/control 2010-09-16 21:55:59 +0000
@@ -904,20 +904,6 @@
This package allows OpenOffice.org to access the KDE Addressbook.
You need to install kaddressbook separately.
-Package: openoffice.org-sdbc-postgresql
-Section: misc
-Architecture: i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc
-Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1),
${misc:Depends}
-Conflicts: openoffice.org-java-common (<< 2.3.0~src680m212),
openoffice.org-gcj (<< 2.3.0~src680m212), ure (<< 1.5.1+OOo3.1.1-15)
-Suggests: postgresql
-Description: OpenOffice.org extension for PostgreSQL SDBC driver
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- The PostgreSQL SDBC Driver allows to use the PostgreSQL database from
- OpenOffice.org without any wrapper layer such as ODBC or JDBC.
-Homepage: http://dba.openoffice.org/drivers/postgresql/
-
Package: openoffice.org-mysql-connector
Section: misc
Architecture: i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc
=== modified file 'rules'
--- a/rules 2010-09-16 20:56:26 +0000
+++ b/rules 2010-09-16 21:55:59 +0000
@@ -261,7 +261,7 @@
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
endif
-ENABLE_SDBC_POSTGRESQL=y
+ENABLE_SDBC_POSTGRESQL=n
ENABLE_MINIMIZER=y
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
@@ -1801,8 +1801,10 @@
>> debian/control < debian/control.kde.in
perl -pi -e 's/ openoffice.org$(VER)-gnome,/ openoffice.org-gnome |
openoffice.org$(VER)-kde,/' debian/control
endif
+ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.postgresql.in
+endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.mysql.in
