------------------------------------------------------------
revno: 1933
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Mon 2010-04-12 17:02:26 +0200
message:
remove libnpsoplugin.so symlinks in dirs except /usr/lib/mozilla
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-04-12 00:18:14 +0000
+++ b/changelog 2010-04-12 15:02:26 +0000
@@ -20,6 +20,8 @@
build time
- the mozilla plugin is broken on 64 bit archs; (temporarily) disable it
on those until fixed
+ - remove libnpsoplugin.so symlinks in dirs except /usr/lib/mozilla
+ (which is the canonical location)
* debian/scripts/vars.s390x: add, we have S390X conditionals in rules
after all
* debian/rules, debian/control*in: GAH, I missed that armel has broken
@@ -29,7 +31,7 @@
Do the same for -filter-binfilter to make it have orrect Pre-Depends:
again
- -- Rene Engelhard <r...@debian.org> Mon, 12 Apr 2010 01:27:46 +0200
+ -- Rene Engelhard <r...@debian.org> Mon, 12 Apr 2010 16:52:49 +0200
openoffice.org (1:3.2.0-6) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2010-04-12 00:18:14 +0000
+++ b/rules 2010-04-12 15:02:26 +0000
@@ -2470,11 +2470,9 @@
done
mv $(PKGDIR)-core/$(OOBRANDDIR)/program/libnpsoplugin.so
debian/mozilla-openoffice.org$(VER)/$(OOBRANDDIR)/program
cd debian/mozilla-openoffice.org$(VER) && \
- for b in iceape iceweasel mozilla mozilla-firefox firefox; do \
- mkdir -p usr/lib/$$b/plugins && \
- ln -sf /$(OOBRANDDIR)/program/libnpsoplugin.so \
- usr/lib/$$b/plugins/libnpsoplugin.so; \
- done
+ mkdir -p usr/lib/mozilla/plugins && \
+ ln -sf /$(OOBRANDDIR)/program/libnpsoplugin.so \
+ usr/lib/mozilla/plugins/libnpsoplugin.so
else
rm -f $(PKGDIR)-core/$(OODIR)/program/libnpsoplugin.so
rm -f $(PKGDIR)-core/$(OODIR)/program/nsplugin
