./packages/openofficeorg/3.1/experimental r1385: merge
------------------------------------------------------------
revno: 1385
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-01-14 10:26:21 +0100
message:
merge
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.39
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-01-08 22:56:55 +0100
message:
install ooo-build/NEWS
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.40
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sun 2009-01-11 17:02:58 +0100
message:
close #511459
modified:
changelog
------------------------------------------------------------
revno: 1332.1.41
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2009-01-13 07:52:33 +0100
message:
rc2
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.42
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-01-14 10:14:11 +0100
message:
-1
modified:
changelog
------------------------------------------------------------
revno: 1332.1.43
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-01-14 10:16:12 +0100
message:
fix mws, oops
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2009-01-08 21:31:04 +0000
+++ b/changelog 2009-01-14 09:26:21 +0000
@@ -33,11 +33,12 @@
-- Rene Engelhard <rene@debian.org> Tue, 06 Jan 2009 16:06:56 +0100
-openoffice.org (1:3.0.1~rc1-2.3pre) experimental; urgency=low
+openoffice.org (1:3.0.1~rc2-1) experimental; urgency=low
+ * OpenOffice.org 3.0.1 rc2 (OOO300_m15)
* ooo-build:
- - update (r15033):
- - remove workaround for #i97491 again
+ - update (r15061):
+ - remove workaround for #i97491 again (closes: #511459)
* build without stray ure.links (closes: #509793)
* debian/startcenter.desktop.in: use ooo-gulls.png as Icon
* debian/rules:
@@ -47,6 +48,7 @@
- fix extra license/readme file removal
- remove empty .../ure/lib dir in -common
- fix OOSDKDIR setting and move all $(OODIR)/sdk to $(OOSDKDIR)
+ - install ooo-build/NEWS
* debian/control.reportdesign.in:
- add missing Depends: on ${java-runtime-depends}
* debian/control.in:
@@ -62,7 +64,7 @@
* debian/presubj: point to OpenOffice.orgs README sections
("Problems During Program Startup" and "File Locking").
- -- Rene Engelhard <rene@debian.org> Thu, 08 Jan 2009 18:00:58 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 13 Jan 2009 07:56:06 +0100
openoffice.org (1:3.0.1~rc1-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2009-01-08 21:31:04 +0000
+++ b/rules 2009-01-14 09:26:21 +0000
@@ -2932,7 +2932,8 @@
done
dh_installdocs -s -A -Nlibmythes-dev debian/README.Debian \
- $(SOURCE_TREE)/instsetoo_native/util/OpenOffice/replace_file/*/00/README
+ $(SOURCE_TREE)/instsetoo_native/util/OpenOffice/replace_file/*/00/README \
+ ooo-build/NEWS
dh_installdocs -plibmythes-dev debian/copyright
dh_installman -s
# fix manpage symlinks
@@ -3152,7 +3153,8 @@
perl -pi -e 's,html/,html /,g' debian/openoffice.org-dev-doc.doc-base.udk-common-ref
endif
dh_installdocs -i -A debian/README.Debian \
- $(SOURCE_TREE)/instsetoo_native/util/OpenOffice/replace_file/*/00/README
+ $(SOURCE_TREE)/instsetoo_native/util/OpenOffice/replace_file/*/00/README }
+ ooo-build/NEWS
dh_installman -i
for i in `find $(PKGDIR)-common -type l -name "o*.1"`; do \
mv $$i $$i.gz; \
Reply to: