------------------------------------------------------------
revno: 1109
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-05-28 10:50:32 +0200
message:
merge back
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-05-26 11:32:43 +0000
+++ b/changelog 2008-05-28 08:50:32 +0000
@@ -11,7 +11,10 @@
- specify -Nopenoffice.org-gcj when building without Java
- remove overseen $(OOO_ARCHS); make control/maintscripts depend on all
.ins for it (removes duplicate contro.gcj.in). Thanks Chris Cheney
- - temporarily disable mono
+ - disable mono on amd64 and OGLtrans on 64-bit archs
+ - improve USE_STLPORT/ENABLE_MONO/ENABLE_OGLTRANS/MOZILLA conditionals to
+ add the right build-deps even when the arch we generate it doesn't build
+ e.g. with STLport
* debian/control.in, debian/rules:
- libsapdbc-java was removed, stop suggesting it and adding it to OOos
CLASSPATH
@@ -22,7 +25,7 @@
* debian/control.in, debian/rules:
- fix Vcs-Svn:, make it a generated field
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 26 May 2008 13:25:26 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 28 May 2008 10:44:52 +0200
openoffice.org (1:2.4.0-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-05-26 13:01:43 +0000
+++ b/control 2008-05-28 08:50:32 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <[email protected]>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, xutils,
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,
libcupsys2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, libxrandr-dev , g++ (>> 4.3.0) [s390],
gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libcurl4-openssl-dev ,
libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) ,
debhelper (>= 5.0.51~) , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc
mips mipsel s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel
s390 amd64 ppc64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libxml-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libformula-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
librepository-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , dmake (>= 1:4.11) , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>=
2.3-3) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) ,
libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64]
, liblpsolve55-dev (>= 5.5.0.10-10), lp-solve (>= 5.5.0.10-10) ,
libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev (>= 2.10)
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, xutils,
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,
libcupsys2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev,
libldap2-dev, libexpat1-dev, libgnomevfs2-dev, fastjar, xsltproc,
graphicsmagick-imagemagick-compat, netpbm, fdupes, xml-core, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, libxrandr-dev , g++ (>> 4.3.0) [s390],
gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc
sparc s390], libglu1-mesa-dev [i386 powerpc sparc s390] , libcurl4-openssl-dev
, libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) ,
debhelper (>= 5.0.51~) , java-gcj-compat-dev (>= 1.0.76-7) [i386 powerpc sparc
mips mipsel s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel
s390 amd64 ppc64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libxml-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390
amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libformula-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
librepository-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64],
libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 amd64 ppc64
ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 amd64
ppc64 ia64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390
armel amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel
amd64 ppc64 ia64] , dmake (>= 1:4.11) , mono-mcs (>= 1.2.3) [i386 sparc ia64],
mono-gmcs (>= 1.2.3) [i386 sparc ia64], libmono-dev (>= 1.2.3) [i386 sparc
ia64], mono-utils (>= 1.2.3) [i386 sparc ia64], cli-common-dev (>= 0.4.4) [i386
sparc ia64], mono-1.0-devel [i386 sparc ia64], mono-2.0-devel [i386 sparc ia64]
, libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.3-3) , libstlport4.6-dev
(>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>=
0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev , libxslt1-dev , libcairo2-dev
, kdelibs4-dev (>= 4:3.4.3-2) , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc
sparc mips mipsel s390 amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc
mips mipsel s390 amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10),
lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>> 3.1.0) , libdbus-glib-1-dev
(>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , libgtk2.0-dev
(>= 2.10)
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, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1),
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.7.2
XS-Python-Version: current
@@ -3019,6 +3019,19 @@
.
This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
+Package: libuno-cil
+Architecture: i386 sparc ia64
+Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version}),
mono-gac, ${cli:Depends}
+Description: CLI binding for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the CLI bindings to OpenOffice.org for
+ accessing the OpenOffice.org API from Mono languages (e.g. C# and Boo)
+ .
+ Note that currently the use of Mono for add-ins & scripting inside
+ OpenOffice.org is *not* yet supported.
+
Package: openoffice.org-qa-tools
Section: devel
Priority: extra
@@ -3068,6 +3081,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
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.4.0~m237),
openoffice.org-impress (>> 1:2.4.0~m237), openoffice.org-common (>=
1:2.4.0~ooh680m6-2)
+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-report-builder
Section: misc
Priority: optional
=== modified file 'rules'
--- a/rules 2008-05-26 13:01:43 +0000
+++ b/rules 2008-05-28 08:50:32 +0000
@@ -95,7 +95,7 @@
BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
-ENABLE_MONO=n
+ENABLE_MONO=y
MONO_MINVER= (>= 1.2.3)
USE_SYSTEM_HUNSPELL=y
HUNSPELL_MIN_VER= (>= 1.1.5-2)
@@ -148,7 +148,7 @@
PARALLEL_BUILD=n
MOZILLA=iceape
PACKAGE_URE=y
-ENABLE_OPENGL=n
+ENABLE_OPENGL=y
SYSTEM_OPENSSL=y
NEW_DPKG_SHLIBDEPS=y
ifeq "$(ENABLE_JAVA)" "y"
@@ -242,20 +242,24 @@
OOO_STLPORT_ARCHS=$(OOO_ARCHS)
endif
+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_PPC64)" "y"
- OOO_OGLTRANS_ARCHS+= ppc64
-endif
-ifeq "$(BUILD_IA64)" "y"
- OOO_OGLTRANS_ARCHS+= ia64
-endif
+#ifeq "$(BUILD_AMD64)" "y"
+# OOO_OGLTRANS_ARCHS+= amd64
+#endif
+#ifeq "$(BUILD_PPC64)" "y"
+# OOO_OGLTRANS_ARCHS+= ppc64
+#endif
+#ifeq "$(BUILD_IA64)" "y"
+# OOO_OGLTRANS_ARCHS+= ia64
+#endif
ifeq (,$(findstring $(ARCH),$(OOO_OGLTRANS_ARCHS)))
ENABLE_OPENGL=n
endif
+else
+ OOO_OGLTRANS_ARCHS=
+endif
OOO_ARCHS= i386 powerpc sparc mips mipsel armel s390
ifeq "$(BUILD_AMD64)" "y"
@@ -293,9 +297,9 @@
# mono
# ppc fails (#412967), arm(el), too
OOO_MONO_ARCHS = i386 sparc
-ifeq "$(BUILD_AMD64)" "y"
- OOO_MONO_ARCHS += amd64
-endif
+#ifeq "$(BUILD_AMD64)" "y"
+# OOO_MONO_ARCHS += amd64
+#endif
ifeq "$(BUILD_IA64)" "y"
OOO_MONO_ARCHS += ia64
endif
@@ -344,7 +348,7 @@
endif
endif
-OOO_MOZILLA_ARCHS=i386 powerpc sparc mips mipsel s390
+OOO_MOZILLA_ARCHS=i386 powerpc sparc mips mipsel s390 armel
ifeq "$(BUILD_AMD64)" "y"
OOO_MOZILLA_ARCHS += amd64
endif
@@ -354,9 +358,6 @@
ifeq "$(BUILD_IA64)" "y"
OOO_MOZILLA_ARCHS += ia64
endif
-ifeq (,$(findstring $(ARCH),$(OOO_MOZILLA_ARCHS)))
- MOZILLA=
-endif
ifeq "$(USE_BZIP_COMPRESS)" "y"
DPKG_DEPENDS = dpkg (>= 1.10.24)
@@ -369,8 +370,10 @@
BUILD_DEPS += , dpkg-dev (>= 1.14.11)
endif
-ifeq "$(ENABLE_OPENGL)" "y"
+ifneq "$(OOO_OGLTRANS_ARCHS)" ""
BUILD_DEPS += , libgl1-mesa-dev [$(OOO_OGLTRANS_ARCHS)],
libglu1-mesa-dev [$(OOO_OGLTRANS_ARCHS)]
+endif
+ifeq "$(ENABLE_OPENGL)" "y"
CONFIGURE_FLAGS += --enable-opengl
endif
@@ -415,7 +418,7 @@
BUILD_DEPS += , python-central (>= 0.5)
endif
BUILD_DEPS += , python-dev (>= 2.4)
- WRITER_PYUNO_DEP = python-uno (>= $(UPSTREAM_VERSION))
+ WRITER_PYUNO_DEP = python-uno (>= $(BASE_VERSION))
DBG_DBG_SUGGESTS+= , python-dbg
else
BUILD_DEPS += , python
@@ -588,21 +591,25 @@
endif
ifneq "$(MOZILLA)" ""
- ifeq "$(MOZILLA)" "xulrunner"
+ ifneq "$(OOO_MOZILLA_ARCHS)" ""
+ ifeq "$(MOZILLA)" "xulrunner"
BUILD_DEPS+= , libxul-dev [$(OOO_MOZILLA_ARCHS)], libnss3-dev
[$(OOO_MOZILLA_ARCHS)]
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg, libnspr4-0d-dbg
- else
- ifeq "$(MOZILLA)" "libxul"
+ else
+ ifeq "$(MOZILLA)" "libxul"
BUILD_DEPS+= , xulrunner-dev-static [$(OOO_MOZILLA_ARCHS)], libnss3-dev
[$(OOO_MOZILLA_ARCHS)]
- else
- ifeq "$(MOZILLA)" "iceape"
+ else
+ ifeq "$(MOZILLA)" "iceape"
BUILD_DEPS += , $(MOZILLA)-dev (>= 1.1.9-5) [$(OOO_MOZILLA_ARCHS)],
libnss3-dev [$(OOO_MOZILLA_ARCHS)]
- else
+ else
BUILD_DEPS += , $(MOZILLA)-dev [$(OOO_MOZILLA_ARCHS)]
+ endif
endif
+ DBG_DBG_SUGGESTS+= , libnss3-1d-dbg, libnspr4-0d-dbg
endif
- DBG_DBG_SUGGESTS+= , libnss3-1d-dbg, libnspr4-0d-dbg
endif
+endif
+ifneq (,$(findstring $(ARCH),$(OOO_MOZILLA_ARCHS)))
CONFIGURE_FLAGS += --with-system-mozilla=$(MOZILLA)
else
CONFIGURE_FLAGS += --disable-mozilla --without-system-mozilla
@@ -613,10 +620,12 @@
BUILD_DEPS += , dmake (>= 1:4.11)
endif
-ifeq "$(ENABLE_MONO)" "y"
+ifneq "$(OOO_MONO_ARCHS)" ""
# mono-gmcs for gmcs itself and mkbundle2
# mono-mcs for mcs itself and al
BUILD_DEPS += , mono-mcs $(MONO_MINVER) [$(OOO_MONO_ARCHS)], mono-gmcs
$(MONO_MINVER) [$(OOO_MONO_ARCHS)], libmono-dev $(MONO_MINVER)
[$(OOO_MONO_ARCHS)], mono-utils $(MONO_MINVER) [$(OOO_MONO_ARCHS)],
cli-common-dev (>= 0.4.4) [$(OOO_MONO_ARCHS)], mono-1.0-devel
[$(OOO_MONO_ARCHS)], mono-2.0-devel [$(OOO_MONO_ARCHS)]
+endif
+ifeq "$(ENABLE_MONO)" "y"
# http://pkg-mono.alioth.debian.org/cli-policy/ch-mono.html#s7.3
MONO_SHARED_DIR = $(CURDIR)
export MONO_SHARED_DIR
@@ -648,13 +657,15 @@
endif
endif
-ifneq "$(USE_STLPORT)" "y"
- CONFIGURE_FLAGS += --without-stlport
-else
- ifeq "$(USE_SYSTEM_STLPORT)" "y"
+ifneq "$(OOO_STLPORT_ARCHS)" ""
LIBSTLPORT_MINVER= (>= 4.6.2-3)
BUILD_DEPS += , libstlport4.6-dev $(LIBSTLPORT_MINVER)
[$(OOO_STLPORT_ARCHS)]
DEV_STL_DEPENDS=, libstlport4.6-dev $(LIBSTLPORT_MINVER)
[$(OOO_STLPORT_ARCHS)]
+endif
+ifneq "$(USE_STLPORT)" "y"
+ CONFIGURE_FLAGS += --without-stlport
+else
+ ifeq "$(USE_SYSTEM_STLPORT)" "y"
CONFIGURE_FLAGS+= --with-stlport=$(CURDIR)/stlport
endif
endif
@@ -1200,7 +1211,7 @@
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.mozilla.in
endif
-ifeq "$(ENABLE_OPENGL)" "y"
+ifneq "$(OOO_OGLTRANS_ARCHS)" ""
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.ogltrans.in
endif
