./packages/openofficeorg/3.1/experimental r1434: use @OOBASISDIR@
------------------------------------------------------------
revno: 1434
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Wed 2009-03-11 18:10:06 +0100
message:
use @OOBASISDIR@
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 16:40:55 +0000
+++ b/changelog 2009-03-11 17:10:06 +0000
@@ -55,8 +55,11 @@
debian/scripts/openoffice-xlate-lang
* debian/rules, debian/control.in: add support for building against an other
python than the "current" (default) one
+ * 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 11:09:57 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 11 Mar 2009 17:59:26 +0100
openoffice.org (1:3.0.1-4.5pre) unstable; urgency=high
=== modified file 'openoffice.org-emailmerge.postinst.in'
--- a/openoffice.org-emailmerge.postinst.in 2008-12-07 17:47:27 +0000
+++ b/openoffice.org-emailmerge.postinst.in 2009-03-11 17:10:06 +0000
@@ -8,7 +8,7 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- add_extension /usr/lib/openoffice/basis3.1/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-12-07 17:47:27 +0000
+++ b/openoffice.org-qa-tools.postrm.in 2009-03-11 17:10:06 +0000
@@ -11,8 +11,8 @@
case "$1" in remove)
dpkg-divert --package $THIS_PACKAGE --remove --rename --divert \
- /usr/lib/openoffice/basis3.1/presets/basic/Standard/script.xlb.no-smoketest \
- /usr/lib/openoffice/basis3.1/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-12-07 17:47:27 +0000
+++ b/openoffice.org-qa-tools.preinst.in 2009-03-11 17:10:06 +0000
@@ -11,8 +11,8 @@
case "$1" in install|upgrade)
dpkg-divert --package $THIS_PACKAGE --add --rename --divert \
- /usr/lib/openoffice/basis3.1/presets/basic/Standard/script.xlb.no-smoketest \
- /usr/lib/openoffice/basis3.1/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-11 16:40:55 +0000
+++ b/rules 2009-03-11 17:10:06 +0000
@@ -1850,6 +1850,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; \
Reply to: