On Tue, May 10, 2011 at 11:04:02AM +0200, Agustin Martin wrote:
> tag 566816 +pending
> tag 617564 +pending
> tag 619262 +pending
> thanks
>
> Hi,
>
> I have just uploaded to DELAYED/7 the openoffice.org-en-au_2.1-5.1 NMU.
> It is intended to fix #566816, #617564 and #619262 (this last blocking
> update-openoffice-dicts removal) bugs.
>
> Changelog entries are:
>
> * openoffice.org-en-au.post{inst,rm}: Remove, only unconditionally
> called useless and soon to disappear update-openoffice-dicts
> (Closes: #619262).
> * Remove obsolete old location and mozilla symlinks (Closes: #566816).
> * Rename thesaurus package to mythes-en-au (Closes: #617564).
> * Do not remove file from orig source (th_en_AU_v2.idx) in clean target.
Hi,
New 0-day NMU to fix some details in my last NMU (thus DELAYED not used):
* Use a transitional package to smooth mythes-en-au renaming.
* Remove update-openoffice-dists call from myspell-en-au.{pre,post}inst.
Was previously removed only from thesaurus file.
* Deal with other minor details.
diff attached,
--
Agustin
diff -u openoffice.org-en-au-2.1/debian/control
openoffice.org-en-au-2.1/debian/control
--- openoffice.org-en-au-2.1/debian/control
+++ openoffice.org-en-au-2.1/debian/control
@@ -9,10 +9,11 @@
Package: mythes-en-au
Architecture: all
Section: text
-Depends: openoffice.org-common (>= 2.0) | language-support-en,
dictionaries-common (>= 0.10) | openoffice.org-updatedicts
+Depends: openoffice.org-common (>= 2.0) | language-support-en,
dictionaries-common (>= 0.10), ${misc:Depends}
Provides: openoffice.org2-thesaurus, openoffice.org-thesaurus-en-au
-Conflicts: openoffice.org (<< 1.9), openoffice.org-thesaurus-en-au
-Replaces: openoffice.org-thesaurus-en-au
+Conflicts: openoffice.org (<< 1.9)
+Breaks: openoffice.org-thesaurus-en-au (<<2.1-5.2~)
+Replaces: openoffice.org-thesaurus-en-au (<<2.1-5.2~)
Description: Australian English Thesaurus for OpenOffice.org
Openoffice.org is a full-featured office productivity suite that provides a
near drop-in replacement for Microsoft(R) Office.
@@ -26,6 +27,14 @@
-Depends: dictionaries-common (>= 1.0)
+Depends: dictionaries-common (>= 1.0), ${misc:Depends}
Provides: myspell-dictionary, myspell-dictionary-en
Description: English_australian dictionary for myspell
This is the English_australian dictionary for use with the myspell
spellchecker, which is currently used within OpenOffice.org and the
Mozilla spellchecker.
+
+Package: openoffice.org-thesaurus-en-au
+Depends: mythes-en-au, ${misc:Depends}
+Architecture: all
+Section: oldlibs
+Description: transitional dummy package
+ This package is here to smooth renaming from openoffice.org-thesaurus-en-au
+ to mythes-en-au and can safely be removed afterwards.
diff -u openoffice.org-en-au-2.1/debian/changelog
openoffice.org-en-au-2.1/debian/changelog
--- openoffice.org-en-au-2.1/debian/changelog
+++ openoffice.org-en-au-2.1/debian/changelog
@@ -1,9 +1,24 @@
+openoffice.org-en-au (2.1-5.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Smooth hyphenation package renaming in 2.1-5.1 by using
+ a transitional dummy openoffice.org-thesaurus-en-au package.
+ * myspell-en-au.post{inst,rm}: Remove call update-openoffice-dicts
+ also from myspell files. In 2.1-5.1 it was removed only from
+ thesaurus package. Really (Closes: #617564).
+ * myspell-en-au.post{inst,rm}: Add debhelper token.
+ * debian/control:
+ - Add ${misc:Depends}.
+ - Remove ancient openoffice.org-updatedicts dependency.
+
+ -- Agustin Martin Domingo <[email protected]> Tue, 21 Jun 2011 15:28:49
+0200
+
openoffice.org-en-au (2.1-5.1) unstable; urgency=low
* Non-maintainer upload.
- * openoffice.org-en-au.post{inst,rm}: Remove, only unconditionally
- called useless and soon to disappear update-openoffice-dicts
- (Closes: #619262).
+ * openoffice.org-thesaurus-en-au.post{inst,rm}: Remove, only
+ unconditionally called useless and soon to disappear
+ update-openoffice-dicts (Closes: #619262).
* Remove obsolete old location and mozilla symlinks (Closes: #566816).
* Rename thesaurus package to mythes-en-au (Closes: #617564).
* Do not remove file from orig source (th_en_AU_v2.idx) in clean target.
diff -u openoffice.org-en-au-2.1/debian/myspell-en-au.postrm
openoffice.org-en-au-2.1/debian/myspell-en-au.postrm
--- openoffice.org-en-au-2.1/debian/myspell-en-au.postrm
+++ openoffice.org-en-au-2.1/debian/myspell-en-au.postrm
@@ -2,10 +2,6 @@
set -e
-if [ "$1" = "remove" ]; then
- update-openoffice-dicts
-fi
-
rmscript="update-dictcommon-hunspell"
case "$1" in abort-install|remove)
@@ -20,2 +16 @@
-
-
+#DEBHELPER#
diff -u openoffice.org-en-au-2.1/debian/myspell-en-au.postinst
openoffice.org-en-au-2.1/debian/myspell-en-au.postinst
--- openoffice.org-en-au-2.1/debian/myspell-en-au.postinst
+++ openoffice.org-en-au-2.1/debian/myspell-en-au.postinst
@@ -2,10 +2,6 @@
set -e
-if [ "$1" = "configure" ]; then
- update-openoffice-dicts
-fi
-
SCRIPT="update-dictcommon-hunspell"
if [ "$1" = "configure" ] ; then
@@ -18,0 +15,2 @@
+
+#DEBHELPER#
only in patch2:
unchanged:
---
openoffice.org-en-au-2.1.orig/debian/openoffice.org-thesaurus-en-au.copyright
+++ openoffice.org-en-au-2.1/debian/openoffice.org-thesaurus-en-au.copyright
@@ -0,0 +1,10 @@
+This is a dummy package to smooth renaming from
+openoffice.org-thesaurus-en-au to mythes-en-au and can
+safely be removed afterwards. I do not think this small
+thing is even copyrightable, but in case is needed,
+
+Copyright 2011 Agustin Martin <[email protected]>
+
+and is placed in the Public Domain.
+
+
