./packages/openofficeorg/3.0.1/experimental r1348: rc1
------------------------------------------------------------
revno: 1348
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-12-19 19:06:32 +0100
message:
rc1
removed:
openoffice.org-common.postinst.in
modified:
changelog
control
control.in
openoffice.org-common.preinst.in
rules
=== modified file 'changelog'
--- a/changelog 2008-12-19 09:12:03 +0000
+++ b/changelog 2008-12-19 18:06:32 +0000
@@ -1,9 +1,9 @@
-openoffice.org (1:3.0.1~ooo300m13-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.1~rc1-0.1pre) experimental; urgency=low
- * new upstream snapshot (OOO300_m13)
+ * OpenOffice.org 3.0.1 rc1 (OOO300_m14)
- fixes usage of flash v9 plugin (closes: #434510)
* ooo-build
- - switch to ooo-build-3-0-1 branch (r14890)
+ - switch to ooo-build-3-0-1 branch (r14903)
* debian/source.lintian-overrides: override bogus
missing-build-dependency-for-dh_-command
* debian/rules:
@@ -19,8 +19,13 @@
make patch.apply
* debian/control.in:
- openoffice.org-base-core needs to depend on openoffice.org-core....
+ * debian/openoffice.org-common.postinst.in: remove; call to
+ update-openoffice-dicts is obsolete because OOo does not honour
+ dictionary.lst anymore
+ * debian//openoffice.org-common.preinst: remove
+ /etc/openoffice/dictionary.lst*
- -- Rene Engelhard <rene@debian.org> Wed, 17 Dec 2008 19:11:08 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 19 Dec 2008 17:36:54 +0100
openoffice.org (1:3.0.0-6) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-12-18 16:04:14 +0000
+++ b/control 2008-12-19 18:06:32 +0000
@@ -114,7 +114,7 @@
Package: openoffice.org-common
Architecture: all
-Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts, openoffice.org-style-galaxy
+Depends: openoffice.org-style-galaxy
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
Recommends: openoffice.org-style-tango, openoffice.org-style-crystal
Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4), openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (= 2.0.4~rc3-1), openoffice.org-base (<< ${base-version}), openoffice.org-writer (<< ${base-version}), openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<< ${base-version})
=== modified file 'control.in'
--- a/control.in 2008-12-18 16:04:14 +0000
+++ b/control.in 2008-12-19 18:06:32 +0000
@@ -256,8 +256,7 @@
Package: openoffice.orgVER-common
Architecture: all
-Depends: dictionaries-common (>= 0.10) | openoffice.org-updatedicts,
- openoffice.orgVER-style-galaxy
+Depends: openoffice.orgVER-style-galaxy
Suggests: openoffice.orgVER-style-industrial,
openoffice.orgVER-style-hicontrast
Recommends: openoffice.orgVER-style-tango,
=== removed file 'openoffice.org-common.postinst.in'
--- a/openoffice.org-common.postinst.in 2008-07-30 01:52:28 +0000
+++ b/openoffice.org-common.postinst.in 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# postinst script for openoffice.org-common
-
-THIS_PACKAGE=openoffice.org-common
-THIS_SCRIPT=postinst
-
-set -e
-
-#INCLUDE_SHELL_LIB#
-
-if [ "$1" = "configure" ]; then
- update-openoffice-dicts
-fi
-
-#DEBHELPER#
-
-exit 0
=== modified file 'openoffice.org-common.preinst.in'
--- a/openoffice.org-common.preinst.in 2008-07-30 01:52:28 +0000
+++ b/openoffice.org-common.preinst.in 2008-12-19 18:06:32 +0000
@@ -18,6 +18,8 @@
if dpkg --compare-versions "$2" lt "2.0.2-2"; then
rm_conffile "/etc/bash_completion.d/ooo-wrapper.sh" $THIS_PACKAGE
fi
+ # obsolete. no conffile.
+ rm -f /etc/openoffice/dictionary.lst /etc/openoffice/dictionary.lst-old
;;
esac
=== modified file 'rules'
--- a/rules 2008-12-19 15:20:25 +0000
+++ b/rules 2008-12-19 18:06:32 +0000
@@ -64,8 +64,8 @@
unexport LS_COLORS
MWS=OOO300
-MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
-#MILESTONE=m9
+#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
+MILESTONE=m14
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
OOO_BUILD_BRANCH=ooo-build-3-0-1
Reply to: