./packages/openofficeorg/3.0.1/experimental r1336: merge
------------------------------------------------------------
revno: 1336
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-12-10 23:06:22 +0100
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1331.1.1
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-12-10 23:04:24 +0100
message:
+ - update .so -> -dev merging to the fact that 3.0s SDK does not have
+ the .so symlinks for libuno_* anymore but only for the internal xmlsec.
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-12-09 22:03:41 +0000
+++ b/changelog 2008-12-10 22:06:22 +0000
@@ -3,11 +3,14 @@
* new upstream snapshot (OOO300_m13)
- fixes usage of flash v9 plugin (closes: #434510)
* ooo-build
- - switch to ooo-build-3-0-1 branch (r14804)
+ - switch to ooo-build-3-0-1 branch (r14807)
* debian/source.lintian-overrides: override bogus
missing-build-dependency-for-dh_-command
+ * debian/rules:
+ - update .so -> -dev merging to the fact that 3.0s SDK does not have
+ the .so symlinks for libuno_* anymore but only for the internal xmlsec.
- -- Rene Engelhard <rene@debian.org> Tue, 09 Dec 2008 22:27:02 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 10 Dec 2008 23:05:19 +0100
openoffice.org (1:3.0.0-6) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-12-04 14:31:50 +0000
+++ b/rules 2008-12-10 22:06:22 +0000
@@ -1679,11 +1679,15 @@
endif
endif
- # move .so to -dev
+ifeq "$(USE_SYSTEM_XMLSEC)" "y"_
+ # move .so to -dev. The libuno_sal* libs don't have symlinks in
+ # the package here right now (see i#97041).
+ # Thus this only applies to the libxmlsec*.so things right now
cd debian/tmp/pkg; \
mkdir -p -m755 openoffice.org-dev/$(OODIR)/program; \
mv openoffice.org-common/$(OODIR)/program/*.so \
openoffice.org-dev/$(OODIR)/program
+endif
ifeq "$(ENABLE_MONO)" "y"
cd debian/tmp/pkg; \
Reply to: