./packages/openofficeorg/3.1/experimental r1418: reenable OGLTrans
------------------------------------------------------------
revno: 1418
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2009-02-28 12:39:23 +0100
message:
reenable OGLTrans
modified:
changelog
control
control.ogltrans.in
rules
=== modified file 'changelog'
--- a/changelog 2009-02-26 07:22:26 +0000
+++ b/changelog 2009-02-28 11:39:23 +0000
@@ -39,6 +39,8 @@
- only specify --with-lang= when we don't only build en-US. en-US is
default anyway and not specifying --with-lang=en-US afais speeds up the
en-US only build even more
+ - OGLTrans seems to work now in sid (even for amd64), so reenable
+ (closes: #517335)
* debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
OOo now has one upstream
* debian/control.ure.in: suggest java5-runtime instead of java2-runtime as
@@ -46,7 +48,7 @@
* debian/control.mediawiki.in: depend on liblucene2-java until i#98680 is
fixed
- -- Rene Engelhard <rene@debian.org> Wed, 25 Feb 2009 21:29:04 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 28 Feb 2009 12:28:53 +0100
openoffice.org (1:3.0.1-3.4pre) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-02-26 07:22:26 +0000
+++ b/control 2009-02-28 11:39:23 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64] , gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost1.37-dev (>= 1.37.0-4) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>> 1.8.0.10-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.13-4), lp-solve (>= 5.5.0.13-4) , libsuitesparse-dev (>= 1:3.2.0-2) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64] , gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libsaxonb-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost1.37-dev (>= 1.37.0-4) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>> 1.8.0.10-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.13-4), lp-solve (>= 5.5.0.13-4) , libsuitesparse-dev (>= 1:3.2.0-2) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.8.0
XS-Python-Version: current
@@ -3221,6 +3221,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.0.1-3), openoffice.org-impress (>> 1:3.0.1-3), openoffice.org-common (>> 1:3.0.1-3)
+Enhances: openoffice.org-impress
+Description: OpenOffice.org "OpenGL rendered transitions" extension
+ 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.ogltrans.in'
--- a/control.ogltrans.in 2008-02-06 14:44:21 +0000
+++ b/control.ogltrans.in 2009-02-28 11:39:23 +0000
@@ -2,7 +2,7 @@
Section: graphics
Priority: extra
Architecture: %OOO_OGLTRANS_ARCHS%
-Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:2.4.0~m237), openoffice.orgVER-impress (>> 1:2.4.0~m237), openoffice.orgVER-common (>= 1:2.4.0~ooh680m6-2)
+Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:3.0.1-3), openoffice.orgVER-impress (>> 1:3.0.1-3), openoffice.orgVER-common (>> 1:3.0.1-3)
Enhances: openoffice.orgVER-impress
Description: OpenOffice.org "OpenGL rendered transitions" extension
OpenOffice.org is a full-featured office productivity suite that provide
=== modified file 'rules'
--- a/rules 2009-02-26 07:22:26 +0000
+++ b/rules 2009-02-28 11:39:23 +0000
@@ -185,7 +185,7 @@
PRUNE_OOOBUILD=y
PARALLEL_BUILD=n
MOZILLA=iceape
-ENABLE_OPENGL=n
+ENABLE_OPENGL=y
SYSTEM_OPENSSL=y
NEW_DPKG_SHLIBDEPS=y
ifeq "$(ENABLE_JAVA)" "y"
@@ -300,15 +300,15 @@
ifeq "$(ENABLE_OPENGL)" "y"
# doesn't make that much sense on arm(el) and mips(el), does it? :)
OOO_OGLTRANS_ARCHS= i386 powerpc sparc s390
-#ifeq "$(BUILD_AMD64)" "y"
-# OOO_OGLTRANS_ARCHS+= amd64
-#endif
-#ifeq "$(BUILD_IA64)" "y"
-# OOO_OGLTRANS_ARCHS+= ia64
-#endif
-#ifeq "$(BUILD_PPC64)" "y"
-# OOO_OGLTRANS_ARCHS+= ppc64
-#endif
+ifeq "$(BUILD_AMD64)" "y"
+ OOO_OGLTRANS_ARCHS+= amd64
+endif
+ifeq "$(BUILD_IA64)" "y"
+ OOO_OGLTRANS_ARCHS+= ia64
+endif
+ifeq "$(BUILD_PPC64)" "y"
+ OOO_OGLTRANS_ARCHS+= ppc64
+endif
ifeq (,$(findstring $(ARCH),$(OOO_OGLTRANS_ARCHS)))
ENABLE_OPENGL=n
endif
Reply to: