------------------------------------------------------------
revno: 1352
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2008-12-23 12:24:22 +0100
message:
work around #i97491; -2
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-12-22 08:29:13 +0000
+++ b/changelog 2008-12-23 11:24:22 +0000
@@ -1,3 +1,14 @@
+openoffice.org (1:3.0.1~rc1-2) experimental; urgency=low
+
+ * ooo-build:
+ - update (r14911):
+ - work around #i97491: do not move soffice into
+ openoffice.org-common (closes: #509435)
+ * debian/rules: (temporarily?) comment out soffice changing in -common.
+ * debian/control{,in}: fix Vcs-Bzr:
+
+ -- Rene Engelhard <r...@debian.org> Mon, 22 Dec 2008 23:58:48 +0100
+
openoffice.org (1:3.0.1~rc1-1) experimental; urgency=low
* OpenOffice.org 3.0.1 rc1 (OOO300_m14)
=== modified file 'control'
--- a/control 2008-12-22 16:58:35 +0000
+++ b/control 2008-12-23 11:24:22 +0000
@@ -104,7 +104,7 @@
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol,
${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
Conflicts: openoffice.org-thesaurus, openoffice.org-unbundled,
openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114,
openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome,
openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0),
openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0),
openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0),
openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0),
openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0),
openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0),
openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0,
openoffice.org-help-2.0.1, openoffice.org-help-2.0.2,
openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core,
openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell,
openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<<
${Source-Version}), openoffice.org-impress (<< ${Source-Version}),
openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<<
${Source-Version}), openoffice.org-gtk (<< ${Source-Version}),
openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<<
${Source-Version}), openoffice.org-evolution (<< ${Source-Version}),
openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean
(<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (=
1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22),
openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>=
${base-version}.1), cacao-oj6-jre
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell
-Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<<
2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<<
1:2.3.1), openoffice.org-calc (<< 2.2.1~oof680m15-2), openoffice.org-headless
(<< 1:3.0.0~dev300m26)
+Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<<
2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<<
1:3.0.1~rc1-2), openoffice.org-calc (<< 2.2.1~oof680m15-2),
openoffice.org-headless (<< 1:3.0.0~dev300m26)
Description: OpenOffice.org office suite architecture dependent files
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'control.in'
--- a/control.in 2008-12-22 16:58:35 +0000
+++ b/control.in 2008-12-23 11:24:22 +0000
@@ -244,7 +244,7 @@
openoffice.org-java,
openoffice.org2-hunspell,
openoffice.org-hunspell,
- openoffice.org-common (<< 1:2.3.1),
+ openoffice.org-common (<< 1:3.0.1~rc1-2),
openoffice.org-calc (<< 2.2.1~oof680m15-2),
openoffice.org-headless (<< 1:3.0.0~dev300m26)
Description: OpenOffice.org office suite architecture dependent files
=== modified file 'rules'
--- a/rules 2008-12-19 18:06:32 +0000
+++ b/rules 2008-12-23 11:24:22 +0000
@@ -2946,12 +2946,12 @@
ln -s /$(OODIR)/sdk/index.html index.html
endif
-ifneq "$(DIST)" "Ubuntu"
- # ooo-build has a patch with this hardcoded.
- perl -pi -e "s/Ubuntu helper/helper/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
- perl -pi -e "s/Ubuntu config/config/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
- perl -pi -e "s/Ubuntu stuff/stuff/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
-endif
+#ifneq "$(DIST)" "Ubuntu"
+# # ooo-build has a patch with this hardcoded.
+# perl -pi -e "s/Ubuntu helper/helper/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
+# perl -pi -e "s/Ubuntu config/config/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
+# perl -pi -e "s/Ubuntu stuff/stuff/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
+#endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
rm -rf $(PKGDIR)-wiki-publisher
