------------------------------------------------------------
revno: 847
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2007-08-14 07:24:46 +0200
message:
build-depend on libicu-dev, useless use of for :-), also conflict against old
-gcjs and add comment also to prerm
modified:
changelog
control
control.postgresql.in
openoffice.org-sdbc-postgresql.prerm.in
rules
=== modified file 'changelog'
--- a/changelog 2007-08-14 00:17:23 +0000
+++ b/changelog 2007-08-14 05:24:46 +0000
@@ -1,7 +1,7 @@
openoffice.org (2.3.0~src680m225-1.2pre) experimental; urgency=low
* ooo-build:
- - update (r10071)
+ - update (r10073)
+ cws-jl68.diff: handle bundled Java extensions
+ cws-dba23e.diff: fix system-hsqldb
* debian/shell-lib.sh, debian/openoffice.org-report-builder.{pre,post}*.in:
@@ -21,11 +21,13 @@
UNO_JAVA_JFW_CLASSPATH_URLS (removed in m224-1 due to the hsqldb
problems fixed in dba23e)
- one more lintian/.desktop fix
+ - build-depend on libicu-dev; 3.8 changed the -dev name (and 3.4 and 3.6
+ provide libicu-dev)
* debian/control.{postgresql,}.in, debian/rules,
debian/openoffice.org-sdbc-postgresql.*: package PostgreSQL SDBC Driver
from http://dba.openoffice.org/drivers/postgresql/ (closes: #346475)
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 14 Aug 2007 02:07:27 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 14 Aug 2007 07:20:25 +0200
openoffice.org (2.3.0~src680m225-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2007-08-14 00:17:23 +0000
+++ b/control 2007-08-14 05:24:46 +0000
@@ -2998,14 +2998,14 @@
Section: misc
Priority: optional
Depends: ${shlibs:Depends}, openoffice.org-core
-Conflicts: openoffice.org-java-common (<< 2.3.0~src680m212)
+Conflicts: openoffice.org-java-common (<< 2.3.0~src680m212),
openoffice.org-gcj (<< 2.3.0~src680m212)
Recommends: postgresql
-Description: SDBC PostgreSQL driver for OpenOffice.org
+Description: PostgreSQL SDBC driver for OpenOffice.org
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.
.
- Hompeage: http://dba.openoffice.org/drivers/postgresql/
+ Homepage: http://dba.openoffice.org/drivers/postgresql/
=== modified file 'control.postgresql.in'
--- a/control.postgresql.in 2007-08-14 00:04:02 +0000
+++ b/control.postgresql.in 2007-08-14 05:24:46 +0000
@@ -2,14 +2,14 @@
Section: misc
Priority: optional
Depends: ${shlibs:Depends}, openoffice.orgVER-core
-Conflicts: openoffice.orgVER-java-common (<< 2.3.0~src680m212)
+Conflicts: openoffice.orgVER-java-common (<< 2.3.0~src680m212),
openoffice.orgVER-gcj (<< 2.3.0~src680m212)
Recommends: postgresql
-Description: SDBC PostgreSQL driver for OpenOffice.org
+Description: PostgreSQL SDBC driver for OpenOffice.org
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.
.
- Hompeage: http://dba.openoffice.org/drivers/postgresql/
+ Homepage: http://dba.openoffice.org/drivers/postgresql/
=== modified file 'openoffice.org-sdbc-postgresql.prerm.in'
--- a/openoffice.org-sdbc-postgresql.prerm.in 2007-08-14 00:04:02 +0000
+++ b/openoffice.org-sdbc-postgresql.prerm.in 2007-08-14 05:24:46 +0000
@@ -11,6 +11,7 @@
case "$1" in
remove)
+ # this is a legacy package, so we need to find it first...
id=`/usr/lib/openoffice/program/unopkg list --shared | grep
Identifier:.*postgresql-sdbc | cut -d":" -f2`
remove_extension $id
;;
=== modified file 'rules'
--- a/rules 2007-08-14 00:08:06 +0000
+++ b/rules 2007-08-14 05:24:46 +0000
@@ -543,11 +543,8 @@
endif
ifeq "$(USE_SYSTEM_ICU)" "y"
- ifeq "$(DISTREL)" "$(filter $(DISTREL), dapper edgy)"
- BUILD_DEPS += , libicu34-dev [$(OOO_ARCHS)]
- else
- BUILD_DEPS += , libicu36-dev [$(OOO_ARCHS)]
- endif
+ # 34 and 36 provide this and 38 changed the real name.
+ BUILD_DEPS += , libicu-dev [$(OOO_ARCHS)]
CONFIGURE_FLAGS += --with-system-icu
# ICU utils are in /usr/sbin (!)
PATH := $(PATH):/usr/sbin
@@ -1685,10 +1682,8 @@
mv $(PKGDIR)-core/$(OODIR)/program/slideshow.uno.so \
$(PKGDIR)-impress/$(OODIR)/program
mkdir -p -m755 $(PKGDIR)-base/$(OODIR)/program
- for i in dba; do \
- mv $(PKGDIR)-core/$(OODIR)/program/lib$$i* \
- $(PKGDIR)-base/$(OODIR)/program; \
- done
+ mv $(PKGDIR)-core/$(OODIR)/program/libdba* \
+ $(PKGDIR)-base/$(OODIR)/program
for i in odbcbase2 dbpool2 jdbc2 odbc2 sdbc2 mysql2 adabas2; do \
mv $(PKGDIR)-core/$(OODIR)/program/lib$$i* \
$(PKGDIR)-base/$(OODIR)/program; \
