./packages/openofficeorg/3.1/experimental r1489: fix typo; regenerate control
------------------------------------------------------------
revno: 1489
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Wed 2009-04-08 21:51:23 +0200
message:
fix typo; regenerate control
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-04-08 08:51:02 +0000
+++ b/changelog 2009-04-08 19:51:23 +0000
@@ -1,7 +1,7 @@
openoffice.org (1:3.1.0~rc1-2) UNRELEASED; urgency=low
* ooo-build:
- - update (82f9223329fe1df307294ba885d53eea007ae1a9)
+ - update (9c5c8322f541550ca0bd605169aa40d9fd654d98)
* debian/shell-lib.sh: export PYTHONPATH="/@OOBASISDIR/program" as
regstering mailmerge.py aparently calls "import pythonloader" which
@@ -15,13 +15,12 @@
OOo is fixed to not crash when OGLTrans.uno.so is not there anymore,
reenable splitout to -ogltrans
- -- Rene Engelhard <rene@debian.org> Mon, 06 Apr 2009 00:36:39 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 08 Apr 2009 21:49:15 +0200
openoffice.org (1:3.1.0~rc1-1) experimental; urgency=low
* OpenOffice.org 3.1.0 rc1 (OOO310_m9)
- [ Rene Engelhard ]
* ooo-build:
- update (b6c58e692ac4fa15ec666a3fbd79c98eed78c46e)
- src: add GSI_ro.sdf.bz2 from ftp.linux.cz (DEV300), closes: #522180
=== modified file 'control'
--- a/control 2009-04-08 08:51:02 +0000
+++ b/control 2009-04-08 19:51:23 +0000
@@ -170,9 +170,9 @@
Package: openoffice.org-impress
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-draw (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-impress (<< ${binary:Version}), openoffice.org-common (<< 2.0.3+2.0.4m179), openoffice.org-ogltrans (<= 1:3.1.0~ooo300m6-1)
-Provides: openoffice.org2-impress, openoffice.org-ogltrans
-Conflicts: openoffice.org-debian-files, openoffice.org2-impress (<< ${binary:Version}), openoffice.org-ogltrans (<= 1:3.1.0~ooo300m6-1)
+Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-impress (<< ${binary:Version}), openoffice.org-common (<< 2.0.3+2.0.4m179)
+Provides: openoffice.org2-impress
+Conflicts: openoffice.org-debian-files, openoffice.org2-impress (<< ${binary:Version})
Description: full-featured office productivity suite -- presentation
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -3301,6 +3301,7 @@
Architecture: i386 powerpc sparc s390 amd64 ia64 ppc64
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:3.1.0~), openoffice.org-impress (>> 1:3.1.0~), openoffice.org-common (>> 1:3.1.0~), ${misc:Depends}
Enhances: openoffice.org-impress
+Replaces: openoffice.org-impress (= 1:3.1.0~rc1-1)
Description: OpenOffice.org Impress extension for transitions using OpenGL
OpenOffice.org is a full-featured office productivity suite that provide
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'rules'
--- a/rules 2009-04-08 08:51:02 +0000
+++ b/rules 2009-04-08 19:51:23 +0000
@@ -2683,8 +2683,7 @@
# move javaseetingsunopkginstall.xml to /var/lib
mkdir -p $(PKGDIR)-common/var/lib/$(OODIRNAME)
- mv $(PKGDIR)-common/$(OODIR)/share/config/javasettingsunopkginstall.xml
- \
+ mv $(PKGDIR)-common/$(OODIR)/share/config/javasettingsunopkginstall.xml \
$(PKGDIR)-common/var/lib/$(OODIRNAME)/javasettingsunopkginstall.xml
# hopefully this compat symlink will serve packages not yet updated...
ln -s /var/lib/$(OODIRNAME)/javasettingsunopkginstall.xml \
Reply to: