./packages/openofficeorg/2.4/unstable r1041: fix shell-lib.sh; update ooo-build and GSIs, fix sed to add text/rtf to ooo-writer.desktop
------------------------------------------------------------
revno: 1041
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-03-28 10:57:54 +0100
message:
fix shell-lib.sh; update ooo-build and GSIs, fix sed to add text/rtf to ooo-writer.desktop
modified:
changelog
openoffice.org-common.preinst.in
openoffice.org.preinst.in
rules
shell-lib.sh
=== modified file 'changelog'
--- a/changelog 2008-03-28 09:07:34 +0000
+++ b/changelog 2008-03-28 09:57:54 +0000
@@ -1,3 +1,15 @@
+openoffice.org (1:2.4.0-2.3pre) unstable; urgency=low
+
+ * ooo-build:
+ - update (r12025)
+ - src: update GSIs from ftp.linux.cz: et ga
+ * debian/shell-lib.sh, debian/openoffice.org{,-common}.preinst.in:
+ - don't query docbook-xmls conffiles but ours....
+ * debian/rules:
+ - actually add text/rtf to ooo-writer.desktop (closes: #472952)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 28 Mar 2008 10:53:56 +0100
+
openoffice.org (1:2.4.0-2) unstable; urgency=low
* Brown paper bag release.
=== modified file 'openoffice.org-common.preinst.in'
--- a/openoffice.org-common.preinst.in 2006-07-16 19:42:06 +0000
+++ b/openoffice.org-common.preinst.in 2008-03-28 09:57:54 +0000
@@ -11,12 +11,12 @@
case "$1" in install|upgrade)
if dpkg --compare-versions "$2" lt "2.0.0-2"; then
- rm_conffile "/etc/bash_completion.d/openoffice"
- rm_conffile "/etc/openoffice/autoresponse.conf"
- rm_conffile "/etc/openoffice/openoffice.conf"
+ rm_conffile "/etc/bash_completion.d/openoffice" $THIS_PACKAGE
+ rm_conffile "/etc/openoffice/autoresponse.conf" $THIS_PACKAGE
+ rm_conffile "/etc/openoffice/openoffice.conf" $THIS_PACKAGE
fi
if dpkg --compare-versions "$2" lt "2.0.2-2"; then
- rm_conffile "/etc/bash_completion.d/ooo-wrapper.sh"
+ rm_conffile "/etc/bash_completion.d/ooo-wrapper.sh" $THIS_PACKAGE
fi
;;
esac
=== modified file 'openoffice.org.preinst.in'
--- a/openoffice.org.preinst.in 2006-08-23 20:46:43 +0000
+++ b/openoffice.org.preinst.in 2008-03-28 09:57:54 +0000
@@ -12,8 +12,8 @@
case "$1" in
install|upgrade)
if test -n "$2" && dpkg --compare-versions "$2" lt "2.0.0-1"; then
- prep_rm_conffile "/etc/openoffice/sofficerc"
- prep_rm_conffile "/etc/openoffice/psprint.conf"
+ prep_rm_conffile "/etc/openoffice/sofficerc" $THIS_PACKAGE
+ prep_rm_conffile "/etc/openoffice/psprint.conf" $THIS_PACKAGE
fi
;;
esac
=== modified file 'rules'
--- a/rules 2008-03-28 09:07:34 +0000
+++ b/rules 2008-03-28 09:57:54 +0000
@@ -2040,7 +2040,7 @@
echo 'X-KDE-Protocols=file,http,smb,ftp,webdav' >> $$f; \
fi; \
done
- sed -i -e '/^MimeType/s,text/rtf,text/rtf;application/rtf,' \
+ sed -i -e 's,;application/rtf,;application/rtf;text/rtf,' \
$(PKGDIR)-writer/usr/share/applications/ooo$(VER)-writer.desktop
sed -i -e 's/Office;/Office;Graphics;/' $(PKGDIR)-draw/usr/share/applications/ooo$(VER)-draw.desktop
# invalid, according to lintian. make it shut up.
=== modified file 'shell-lib.sh'
--- a/shell-lib.sh 2007-12-04 19:35:24 +0000
+++ b/shell-lib.sh 2008-03-28 09:57:54 +0000
@@ -19,7 +19,7 @@
if [ -e "$CONFFILE" ]; then
md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
- old_md5sum="`dpkg-query -W -f='${Conffiles}' docbook-xml | grep $CONFFILE | awk '{print $2}'`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' $2 | grep $CONFFILE | awk '{print $2}'`"
if [ "$md5sum" = "$old_md5sum" ]; then
mv "$CONFFILE" "$CONFFILE.${THIS_PACKAGE}-tmp"
fi
@@ -40,7 +40,7 @@
if [ -e "$CONFFILE" ]; then
md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
- old_md5sum="`dpkg-query -W -f='${Conffiles}' docbook-xml | grep $CONFFILE | awk '{print $2}'`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' $2 | grep $CONFFILE | awk '{print $2}'`"
if [ "$md5sum" != "$old_md5sum" ]; then
echo "Obsolete conffile $CONFFILE has been modified by you."
echo "Saving as $CONFFILE.dpkg-bak ..."
Reply to: