./packages/openofficeorg/3.1/experimental r1378: merge error
------------------------------------------------------------
revno: 1378
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Wed 2009-01-07 01:30:48 +0100
message:
merge error
modified:
rules
=== modified file 'rules'
--- a/rules 2009-01-07 00:09:13 +0000
+++ b/rules 2009-01-07 00:30:48 +0000
@@ -1644,21 +1644,6 @@
endif
endif
-ifneq "$(USE_SYSTEM_XMLSEC)" "y"
- # these have to go to -core, otherwise we get problems with the new
- # dpkg-shibdeps...
- for i in `find debian/tmp/pkg/openoffice.org-common/$(OODIR)/program/*.so.*`; do \
- mv $$i `echo $$i | sed -e s/common/core/`; \
- done
- # 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; \
mkdir -p openoffice.org-core/$(OOBRANDDIR)/ure/lib; \
Reply to: