------------------------------------------------------------
revno: 1673
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2009-10-16 23:38:10 +0200
message:
OOO320_m2
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-10-14 09:03:18 +0000
+++ b/changelog 2009-10-16 21:38:10 +0000
@@ -1,6 +1,6 @@
-openoffice.org (1:3.2.0~beta~ooo320m1-1) UNRELEASED; urgency=low
+openoffice.org (1:3.2.0~beta~ooo320m2-1) UNRELEASED; urgency=low
- * OpenOffice.org 3.2.0 release branch milestone 1 (OOO320_m1)
+ * OpenOffice.org 3.2.0 release branch milestone 2 (OOO320_m2)
- paste into memo field doesn't replace existing content anymore
(closes: #482473)
- has many performance improvements for Base (closes: #488202)
@@ -15,7 +15,7 @@
- no duplicate shortcut in Insert Menu anymore (closes: #550510)
* ooo-build:
- - update (7ff794bc25495dd2503d5dcebd0ff0c22fabc57d)
+ - update (6fcfa1002f45902d0e877eb311ddb2bbc14948e2)
* debian/rules:
- revert back to internal redland libs because odfmetadata2 now is in.
@@ -47,7 +47,7 @@
* debian/openoffice.org-filter-binfilter.{templates,postinst.in}:
- warn against those filters being obsoleted with OOo 3.4
- -- Rene Engelhard <r...@debian.org> Wed, 14 Oct 2009 11:02:48 +0200
+ -- Rene Engelhard <r...@debian.org> Fri, 16 Oct 2009 19:34:38 +0200
openoffice.org (1:3.1.1-5) UNRELEASED; urgency=low
=== modified file 'rules'
--- a/rules 2009-10-14 09:03:18 +0000
+++ b/rules 2009-10-16 21:38:10 +0000
@@ -3527,12 +3527,6 @@
for i in da_DK en_GB nl_NL ru_RU; do \
rm $(TAG)/dictionaries/$$i/hyph_$${i}.dic; \
done && \
- cd $(TAG)/libxml2/download/ && \
- tar xfvz libxml2-2.6.31.tar.gz && \
- rm -rf libxml2-2.6.31/result libxml2-2.6.31/test && \
- tar cfvz libxml2-2.6.31.tar.gz libxml2-2.6.31/ && \
- rm -rf libxml2-2.6.31/ && \
- cd ../../.. && \
tar cfvj OOo_$(UPSTREAM_VERSION)_src_system.tar.bz2.dfsg $(TAG)
&& \
rm -rf $(TAG) && \
ln -sf OOo_$(UPSTREAM_VERSION)_src_system.tar.bz2.dfsg
OOo_$(UPSTREAM_VERSION)_src_system.tar.bz2 && \
@@ -3565,12 +3559,6 @@
for i in da_DK en_GB nl_NL ru_RU; do \
rm
ooo/$(MWS)_$(MILESTONE)/dictionaries/$$i/hyph_$${i}.dic; \
done && \
- cd ooo/$(MWS)_$(MILESTONE)/libxml2/download/ && \
- tar xfvz libxml2-2.6.31.tar.gz && \
- rm -rf libxml2-2.6.31/result libxml2-2.6.31/test && \
- tar cfvz libxml2-2.6.31.tar.gz libxml2-2.6.31/ && \
- rm -rf libxml2-2.6.31/ && \
- cd ../../../.. && \
tar cfvj $(TAG)-libs-extern-sys.tar.bz2.dfsg ooo && \
ln -sf $(TAG)-libs-extern-sys.tar.bz2.dfsg
$(TAG)-libs-extern-sys.tar.bz2 && \
rm -rf ooo && \
