------------------------------------------------------------
revno: 2345
committer: Rene Engelhard <r...@debian.org>
branch nick: 33final
timestamp: Mon 2011-01-24 11:18:36 +0100
message:
stop libreoffice.sh->ooffice.sh move
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2011-01-24 00:57:19 +0000
+++ b/changelog 2011-01-24 10:18:36 +0000
@@ -11,10 +11,14 @@
(closes: #610345)
- error-out on control target if /usr/include/ldap_features.h is not
existing
+ - stop renaming libreoffice.sh to ooffice.sh now that have transitional
+ packages cleaning up office.sh in -common
* debian/control.in
- readd versioned ttf-opensymbol depends bogusly removed by
"Remove obsolete OOo versions in dependencies." (closes: #610917)
- some more s/OOo/LibreOffice/
+ - make libreoffice-common conflict against
+ openoffice.org-common (<< 1:3.3.0~)
-- Rene Engelhard <r...@debian.org> Mon, 24 Jan 2011 01:56:24 +0100
=== modified file 'control'
--- a/control 2011-01-24 01:03:05 +0000
+++ b/control 2011-01-24 10:18:36 +0000
@@ -105,7 +105,7 @@
Depends: libreoffice-style-default | libreoffice-style, ${misc:Depends}, ure
Suggests: libreoffice-style-hicontrast, libreoffice-style-tango,
libreoffice-style-crystal, libreoffice-style-oxygen
Recommends: xfonts-mathml, ${textcat-data-recommends}
-Conflicts: libtextcat-data, broffice
+Conflicts: libtextcat-data, broffice, openoffice.org-common (<< 1:3.3.0~)
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-style-crystal (<< 1:${basis-version}~),
libreoffice-style-oxygen (<< 1:${basis-version}~),
=== modified file 'control.in'
--- a/control.in 2011-01-24 00:57:19 +0000
+++ b/control.in 2011-01-24 10:18:36 +0000
@@ -210,7 +210,8 @@
Recommends: xfonts-mathml,
${textcat-data-recommends}
Conflicts: libtextcat-data,
- broffice
+ broffice,
+ openoffice.org-common (<< 1:3.3.0~)
Provides: libreoffice-l10n-en-us
Breaks: libreofficeVER-style-crystal (<< 1:${basis-version}~),
libreofficeVER-style-oxygen (<< 1:${basis-version}~),
=== modified file 'rules'
--- a/rules 2011-01-24 00:42:05 +0000
+++ b/rules 2011-01-24 10:18:36 +0000
@@ -3178,12 +3178,6 @@
install -m644 -D $(SOURCE_TREE)/more_fonts/fonts/fc_local.conf \
$(PKGDIR)-common/$(OODIR)/share/fonts/truetype/fc_local.conf
- # FIXME: conffile madness.
- # unless openoffice.org-common gets purged we would still have
ooffice.sh
- # there together with libreoffice.sh...
- mv $(PKGDIR)-common/etc/bash_completion.d/libreoffice.sh \
- $(PKGDIR)-common/etc/bash_completion.d/ooffice.sh
-
# register technical.dic
perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/'
$(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
