CVS:oo-deb/debian changelog,1.362.2.42,1.362.2.43 shell-lib.sh,1.8.6.1,1.8.6.2
Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv27360
Modified Files:
Tag: OPENOFFICE_ORG_1_1_3
changelog shell-lib.sh
Log Message:
- mention sysui-mimetype changes
- reformat changelog entry to "normal" formatting
- really remove update_desktop_database() from shell-lib.sh again
Index: shell-lib.sh
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/shell-lib.sh,v
retrieving revision 1.8.6.1
retrieving revision 1.8.6.2
diff -u -d -r1.8.6.1 -r1.8.6.2
--- shell-lib.sh 24 Nov 2004 21:33:06 -0000 1.8.6.1
+++ shell-lib.sh 24 Nov 2004 22:52:54 -0000 1.8.6.2
@@ -13,12 +13,6 @@
echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2
}
-update_desktop_database() {
- if which update-desktop-database >/dev/null 2>&1; then
- update-desktop-database -q
- fi
-}
-
trap "message;\
message \"Received signal. Aborting script $0.\";\
message;\
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.362.2.42
retrieving revision 1.362.2.43
diff -u -d -r1.362.2.42 -r1.362.2.43
--- changelog 24 Nov 2004 21:33:05 -0000 1.362.2.42
+++ changelog 24 Nov 2004 22:52:53 -0000 1.362.2.43
@@ -1,10 +1,16 @@
openoffice.org (1.1.3-2.3pre) experimental; urgency=low
* The "shrugs-I-should-have-tested-this" release.
- * we must not run update_desktop_database in postinst/rm since is is not
- defined and dh_desktop already adds the right snippets...
+ * Modified patches:
+ - sysui-mimetypes.diff: add some more for RTF and MS Word, add
+ MimeType= entry to math.desktop too, thanks Nathanial McCallum and
+ Matthias Klose [RE]
+ * debian/openoffice.org.postinst.in: remove [RE]
+ * debian/openoffice.org.postrm.in: do not run update_desktop_database;
+ undefined dh_desktop does insert a run to update-desktop-database
+ already [RE]
- -- Rene Engelhard <rene@debian.org> Wed, 24 Nov 2004 22:20:43 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 24 Nov 2004 23:35:03 +0100
openoffice.org (1.1.3-2) experimental; urgency=low
Reply to: