r848 ./packages/openofficeorg/2.3/experimental: some oversights
------------------------------------------------------------
revno: 848
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2007-08-14 15:52:59 +0200
message:
some oversights
modified:
control.postgresql.in
rules
=== modified file 'control.postgresql.in'
--- a/control.postgresql.in 2007-08-14 05:24:46 +0000
+++ b/control.postgresql.in 2007-08-14 13:52:59 +0000
@@ -1,6 +1,7 @@
Package: openoffice.orgVER-sdbc-postgresql
Section: misc
Priority: optional
+Architecture: %OOO_ARCHS%
Depends: ${shlibs:Depends}, openoffice.orgVER-core
Conflicts: openoffice.orgVER-java-common (<< 2.3.0~src680m212), openoffice.orgVER-gcj (<< 2.3.0~src680m212)
Recommends: postgresql
=== modified file 'rules'
--- a/rules 2007-08-14 05:24:46 +0000
+++ b/rules 2007-08-14 13:52:59 +0000
@@ -2347,7 +2347,7 @@
TMP=`mktemp -q`; \
sed -e 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1 file:///usr/share/java/mysql.jar|' \
-e 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1 file:///usr/share/java/sapdbc.jar|' \
- -e -e 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1 file:///usr/share/java/postgresql.jar|' < $(PKGDIR)-common/$(OODIR)/program/jvmfwk3rc > $$TMP && \
+ -e 's|\(UNO_JAVA_JFW_CLASSPATH_URLS=.*\)|\1 file:///usr/share/java/postgresql.jar|' < $(PKGDIR)-common/$(OODIR)/program/jvmfwk3rc > $$TMP && \
mv $$TMP $(PKGDIR)-common/$(OODIR)/program/jvmfwk3rc
# move psprint.conf into /etc
@@ -2677,6 +2677,8 @@
endif
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
dh_shlibdeps -s $(SHLIBS_OVERRIDE)
+ # this is in an extension (.zip), so dh_shlibdeps doesn't get it. We need to do
+ # it manually.
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
dpkg-shlibdeps -O \
$(SOURCE_TREE)/connectivity/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc*.so \
Reply to: