./packages/openofficeorg/3.0.1/experimental r1426: merge from 3.1 branch
------------------------------------------------------------
revno: 1426
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-03-11 19:38:25 +0100
message:
merge from 3.1 branch
modified:
changelog
openoffice.org-emailmerge.postinst.in
openoffice.org-qa-tools.postrm.in
openoffice.org-qa-tools.preinst.in
rules
=== modified file 'changelog'
--- a/changelog 2009-03-11 18:25:09 +0000
+++ b/changelog 2009-03-11 18:38:25 +0000
@@ -1,3 +1,13 @@
+openoffice.org (1:3.0.1-6) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - remove ure (>= ...) from uno-libs3s Depends: (closes: #519138)
+ * debian/openoffice.org-qa-tools.{postrm,preinst},
+ openoffice.org-emailmerge.postinst.in, debian/rules: don't hardcode the
+ dir, use @OOBASISDIR@
+
+ -- Rene Engelhard <rene@debian.org> Wed, 11 Mar 2009 17:59:26 +0100
+
openoffice.org (1:3.0.1-5) unstable; urgency=high
* ooo-build:
=== modified file 'openoffice.org-emailmerge.postinst.in'
--- a/openoffice.org-emailmerge.postinst.in 2008-07-30 01:52:28 +0000
+++ b/openoffice.org-emailmerge.postinst.in 2009-03-11 18:38:25 +0000
@@ -8,7 +8,7 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension /usr/lib/openoffice/basis3.0/program/mailmerge.py
+ add_extension /@OOBASISDIR/program/mailmerge.py
fi
#DEBHELPER#
=== modified file 'openoffice.org-qa-tools.postrm.in'
--- a/openoffice.org-qa-tools.postrm.in 2008-07-30 01:52:28 +0000
+++ b/openoffice.org-qa-tools.postrm.in 2009-03-11 18:38:25 +0000
@@ -11,8 +11,8 @@
case "$1" in remove)
dpkg-divert --package $THIS_PACKAGE --remove --rename --divert \
- /usr/lib/openoffice/basis3.0/presets/basic/Standard/script.xlb.no-smoketest \
- /usr/lib/openoffice/basis3.0/presets/basic/Standard/script.xlb
+ /@OOBASISDIR@/presets/basic/Standard/script.xlb.no-smoketest \
+ /@OOBASISDIR@/presets/basic/Standard/script.xlb
;;
esac
=== modified file 'openoffice.org-qa-tools.preinst.in'
--- a/openoffice.org-qa-tools.preinst.in 2008-07-30 01:52:28 +0000
+++ b/openoffice.org-qa-tools.preinst.in 2009-03-11 18:38:25 +0000
@@ -11,8 +11,8 @@
case "$1" in install|upgrade)
dpkg-divert --package $THIS_PACKAGE --add --rename --divert \
- /usr/lib/openoffice/basis3.0/presets/basic/Standard/script.xlb.no-smoketest \
- /usr/lib/openoffice/basis3.0/presets/basic/Standard/script.xlb
+ /@OOBASISDIR@/presets/basic/Standard/script.xlb.no-smoketest \
+ /@OOBASISDIR@/presets/basic/Standard/script.xlb
;;
esac
=== modified file 'rules'
--- a/rules 2009-03-10 15:22:59 +0000
+++ b/rules 2009-03-11 18:38:25 +0000
@@ -1809,6 +1809,7 @@
perl -pi -e "s/\@LANGPACKISOS\@/$(LANGPACKISOS)/" $$MAINTSCRIPT; \
perl -pi -e "s,\@OODIR\@,$(OODIR),g" $$MAINTSCRIPT; \
perl -pi -e "s,\@OOBRANDDIR\@,$(OOBRANDDIR),g" $$MAINTSCRIPT; \
+ perl -pi -e "s,\@OOBASISDIR\@,$(OOBASISDIR),g" $$MAINTSCRIPT; \
perl -pi -e "s/\@VER\@/$(VER)/g" $$MAINTSCRIPT; \
fi; \
done; \
@@ -3128,6 +3129,8 @@
-Lure -Luno-libs3 \
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program \
$(SHLIBS_OVERRIDE)
+ # don't make uno-libs3 depend on ure...
+ perl -pi -e 's/, ure \(.*\)$$//' debian/uno-libs3.substvars
ifeq "$(ENABLE_JAVA)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
dh_shlibdeps -popenoffice.org$(VER)-officebean \
Reply to: