./packages/openofficeorg/3.1/experimental r1488: * debian/control.in, debian/control.ogltrans.in, debian/rules:
------------------------------------------------------------
revno: 1488
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Wed 2009-04-08 10:51:02 +0200
message:
* debian/control.in, debian/control.ogltrans.in, debian/rules:
OOo is fixed to not crash when OGLTrans.uno.so is not there anymore,
reenable splitout to -ogltrans
added:
control.ogltrans.in
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-04-08 08:02:28 +0000
+++ b/changelog 2009-04-08 08:51:02 +0000
@@ -1,5 +1,8 @@
openoffice.org (1:3.1.0~rc1-2) UNRELEASED; urgency=low
+ * ooo-build:
+ - update (82f9223329fe1df307294ba885d53eea007ae1a9)
+
* debian/shell-lib.sh: export PYTHONPATH="/@OOBASISDIR/program" as
regstering mailmerge.py aparently calls "import pythonloader" which
does not work anymore without (closes: #522536)
@@ -8,6 +11,9 @@
* debian/rules, debian/shell-lib.sh:
- move javasettingsunopkginstall.xml to /var/lib/openoffice and adapt
unopkg calls (closes: #523044)
+ * debian/control.in, debian/control.ogltrans.in, debian/rules:
+ 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
=== modified file 'control'
--- a/control 2009-04-05 22:38:23 +0000
+++ b/control 2009-04-08 08:51:02 +0000
@@ -3295,6 +3295,19 @@
This package contains a Mozilla/Netscape compatible plugin which can handle
all OOo documents.
+Package: openoffice.org-ogltrans
+Section: graphics
+Priority: extra
+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
+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.
+ .
+ This package contains the extension making OpenOffice.org able to use
+ OpenGL for impress transitions.
+
Package: openoffice.org-wiki-publisher
Section: misc
Priority: optional
=== modified file 'control.in'
--- a/control.in 2009-04-05 22:38:23 +0000
+++ b/control.in 2009-04-08 08:51:02 +0000
@@ -380,13 +380,10 @@
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
+ openoffice.org-common (<< 2.0.3+2.0.4m179)
+Provides: openoffice.org2-impress
Conflicts: openoffice.org-debian-files,
- openoffice.org2-impress (<< ${binary:Version}),
- openoffice.org-ogltrans (<= 1:3.1.0~ooo300m6-1)
+ 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.
=== added file 'control.ogltrans.in'
--- a/control.ogltrans.in 1970-01-01 00:00:00 +0000
+++ b/control.ogltrans.in 2009-04-08 08:51:02 +0000
@@ -0,0 +1,15 @@
+Package: openoffice.orgVER-ogltrans
+Section: graphics
+Priority: extra
+Architecture: %OOO_OGLTRANS_ARCHS%
+Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:3.1.0~), openoffice.orgVER-impress (>> 1:3.1.0~), openoffice.orgVER-common (>> 1:3.1.0~),
+ ${misc:Depends}
+Enhances: openoffice.orgVER-impress
+Replaces: openoffice.orgVER-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.
+ .
+ This package contains the extension making OpenOffice.org able to use
+ OpenGL for impress transitions.
+
=== modified file 'rules'
--- a/rules 2009-04-08 08:02:28 +0000
+++ b/rules 2009-04-08 08:51:02 +0000
@@ -1347,6 +1347,10 @@
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.mozilla.in
endif
+ifneq "$(OOO_OGLTRANS_ARCHS)" ""
+ sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
+ >> debian/control < debian/control.ogltrans.in
+endif
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(ENABLE_MEDIAWIKI)" "y"
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
@@ -1389,6 +1393,7 @@
perl -pi -e "s,%OOO_GCJ_ARCHS%,$(OOO_GCJ_ARCHS),g" debian/control
perl -pi -e "s,%OOO_MONO_ARCHS%,$(OOO_MONO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g" debian/control
+ perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g" debian/control
perl -pi -e "s,%OOO_BINFILTER_ARCHS%,$(OOO_BINFILTER_ARCHS),g" debian/control
perl -pi -e "s,%OOO_BUILD_SVN%,$(OOO_BUILD_SVN)," debian/control
@@ -2396,8 +2401,13 @@
$(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extension/install/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).zip
ifeq "$(ENABLE_OPENGL)" "y"
+ rm -rf $(PKGDIR)-ogltrans
+ mkdir -p $(PKGDIR)-ogltrans/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/OGLTrans.uno.so \
- $(PKGDIR)-impress/$(OODIR)/program
+ $(PKGDIR)-ogltrans/$(OODIR)/program
+ mkdir -p $(PKGDIR)-ogltrans/$(OODIR)/share/config/soffice.cfg/simpress/
+ mv $(PKGDIR)-impress/$(OODIR)/share/config/soffice.cfg/simpress/transitions-ogl.xml \
+ $(PKGDIR)-ogltrans/$(OODIR)/share/config/soffice.cfg/simpress/transitions-ogl.xml
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
Reply to: