------------------------------------------------------------
revno: 1647
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Thu 2009-09-10 18:50:45 +0200
message:
update ooo-build; OGLTrans is now already installed upstream
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-09-07 20:39:50 +0000
+++ b/changelog 2009-09-10 16:50:45 +0000
@@ -8,7 +8,7 @@
(closes: #488667)
* ooo-build:
- - update (7cfa4c59eb0c32f573d84f40724ce4806cece746)
+ - update (312d1a2ea080f8d29074d254d7c4fddb0c7d5f0a)
* debian/rules:
- revert back to internal redland libs because odfmetadata2 now is in.
@@ -29,7 +29,7 @@
- make openoffice.org depend on ttf-sil-gentium / ttf-sil-gentium-basic
as they are included in OOos source now (for graphite support)
- -- Rene Engelhard <r...@debian.org> Sun, 06 Sep 2009 20:19:28 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 09 Sep 2009 22:03:41 +0200
openoffice.org (1:3.1.1-2) UNRELEASED; urgency=low
=== modified file 'rules'
--- a/rules 2009-09-10 16:50:24 +0000
+++ b/rules 2009-09-10 16:50:45 +0000
@@ -2555,16 +2555,6 @@
$(PKGDIR)-mysql-connector/$(OOBRANDDIR)/share/extension/install/mysql-connector-ooo-$(shell
. $(SOURCE_TREE)/mysqlc/version.mk; echo
$${MYSQLC_VERSION_MAJOR}.$${MYSQLC_VERSION_MINOR}.$${MYSQLC_VERSION_MICRO}-$(shell
echo $(PLATFORMID) | sed -e s/_/-/)).oxt
endif
-ifeq "$(ENABLE_OPENGL)" "y"
- rm -rf $(PKGDIR)-ogltrans
- mkdir -p $(PKGDIR)-ogltrans/$(OODIR)/program
- mv $(PKGDIR)-core/$(OODIR)/program/OGLTrans.uno.so \
- $(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"
rm -rf $(PKGDIR)-pdfimport
install -D -m644 $(SOURCE_TREE)/sdext/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/bin/pdfimport.oxt \
