------------------------------------------------------------
revno: 1167
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Sat 2008-08-16 02:32:36 -0300
message:
fix hsqldbjar location in internal hsqldb case
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-08-16 05:25:48 +0000
+++ b/changelog 2008-08-16 05:32:36 +0000
@@ -9,12 +9,15 @@
* debian/control.in:
- Standards-Version: 3.8.0 (already following it)
- For upgrades from 1:2.4.1-3~bpo40+1 add a Replaces:
- openoffice.org-java-common (= 1:2.4.1-3~bpo40+1) to -base
+ openoffice.org-java-common (= 1:2.4.1-3~bpo40+1) to -base because of
+ hsqldb, see below.
* debian/copyright:
- wrap "Debian package authors:" line to please lintian
* debian/rules:
- remove obsolete [$(OOO_ARCHS)] qualifier from python-dev builddep
(closes: #491623)
+ - put hsqldb.jar also to -base with internal hsqldb so that we don't
+ get file differences between sids package and backports.
* debian/rules, debian/control.reportdesign.in:
- split librpt* out into a -report-builder-bin package. Version 1.0.5
of the Report Builder theoretically is working with OOo 2.4.x but the
=== modified file 'rules'
--- a/rules 2008-08-16 05:23:17 +0000
+++ b/rules 2008-08-16 05:32:36 +0000
@@ -1543,6 +1543,13 @@
openoffice.org-base/usr/share/java/$(OODIRNAME); \
ln -s /usr/share/java/$(OODIRNAME)/sdbc_hsqldb.jar \
openoffice.org-base/$(OODIR)/program/classes/sdbc_hsqldb.jar
+ # we need this in -base. Otherwise we get unwanted package differences
+ # in the unstable version and backports which might use internal hsqldb
+ ifneq "$(SYSTEM_HSQLDB)" "y"
+ mkdir -p debian/tmp/pkg/openoffice.org-base/$(OODIR)/program/classes
+ mv
debiam/tmp/pkg/openoffice.org-common/$(OODIR)/program/classes/hsqldb.jar \
+ debian/tmp/pkg/openoffice.org-base/$(OODIR)/program/classes
+ endif
endif
# move .so to -dev
