./packages/openofficeorg/3.0/experimental r1105: merge 1:2.4.1~rc1-1
------------------------------------------------------------
revno: 1105
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-05-29 12:59:20 +0200
message:
merge 1:2.4.1~rc1-1
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1022.1.86
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-05-20 09:28:18 +0200
message:
close 481996
modified:
changelog
------------------------------------------------------------
revno: 1022.1.87
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-05-23 12:27:03 +0200
message:
prepare for m15
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1022.1.88
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-05-23 14:18:15 +0200
message:
update ooo-build
modified:
changelog
------------------------------------------------------------
revno: 1022.2.8
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-05-23 14:16:12 +0200
message:
update ooo-build
modified:
changelog
------------------------------------------------------------
revno: 1022.1.89
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-26 13:39:06 +0200
message:
merge; fix changelog formatting
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.2.9
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-05-23 17:25:25 +0200
message:
remove overseen OOO_ARCHS and fix control and maintscripts dependencies
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.2.10
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-26 13:32:43 +0200
message:
disable mono
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.1.90
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-26 15:06:29 +0200
message:
merge...
modified:
control
rules
------------------------------------------------------------
revno: 1022.2.11
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-26 15:01:43 +0200
message:
... and OGLTrans ...
modified:
control
rules
------------------------------------------------------------
revno: 1022.1.91
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-05-26 22:33:31 +0200
message:
update for m16 (rc1), mono builds for i386, just disable for amd64
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.1.92
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-05-27 10:18:35 +0200
message:
reenable OGLTrans for non-64-bit; improve conditionals
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.1.93
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-05-28 10:40:10 +0200
message:
update ooo-build; fix dependencies/conflicts
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.94
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-05-29 12:50:51 +0200
message:
-1
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2008-05-26 22:26:44 +0000
+++ b/changelog 2008-05-29 10:59:20 +0000
@@ -29,7 +29,6 @@
- temporarily disable SDK package (until jsc21)
- update get-orig-source target for fixed hyph_en_US.dic
- add --enable-gio conditional
- - temporarily disable mono
* debian/rules, debian/control.in:
- split emailmerge out into an own package. Don't make -writer depend on
python-uno anymore so that -writer (and openoffice.org) still can be
@@ -57,18 +56,34 @@
-- Rene Engelhard <rene@debian.org> Mon, 26 May 2008 22:27:01 +0200
-openoffice.org (1:2.4.1~ooh680m14-1.2pre) experimental; urgency=low
+openoffice.org (1:2.4.1~rc1-1) experimental; urgency=low
+ * OpenOffice.org 2.4.1 rc1 (OOH680_m16)
+ - now doesn't need a patched icu (public SetBreakType) anymore for
+ building
* ooo-build:
- - use ooo-build-2-4-1 branch
- - update (r12577)
+ - use ooo-build-2-4-1 branch
+ - update (r12682)
+ + allows to change broken java configuration
+ This closes: #451928, #452925
+ Most probably also closes: #454996
+ * debian/rules:
+ - we also need to build-depend on libnss3-dev (closes: #481996)
+ - reenable system-icu for etch backports
+ - add get-orig-source target
+ - remove overseen $(OOO_ARCHS); make control/maintscripts depend on all
+ .ins for it (removes duplicate contro.gcj.in). Thanks Chris Cheney
+ - 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:
+ - remove libicu build-conflicts
* debian/control.in, debian/rules:
- libsapdbc-java was removed, stop suggesting it and adding it to OOos
CLASSPATH
- * debian/rules:
- - add get-orig-source target
- -- Rene Engelhard <rene@debian.org> Mon, 19 May 2008 11:35:35 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 27 May 2008 22:44:43 +0200
openoffice.org (1:2.4.1~ooh680m14-1) experimental; urgency=low
@@ -86,7 +101,7 @@
* debian/copyright: fix "Obtained from", mention go-oo.org. Remove obsolete
section about odk/sdk_oo
- -- Rene Engelhard <rene@debian.org> Thu, 15 May 2008 00:23:58 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 12 May 2008 11:38:39 +0200
openoffice.org (1:2.4.0-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-05-23 17:27:16 +0000
+++ b/control 2008-05-29 10:59:20 +0000
@@ -3,8 +3,8 @@
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, 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 (>= 6.0.7~) , 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.7.0) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], ant-optional (>= 1.7.0) [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] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libcommons-logging-java [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.4) , 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) , libglib2.0-dev (>= 2.15.0)
-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]
+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 (>= 6.0.7~) , 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.7.0) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], ant-optional (>= 1.7.0) [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] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libcommons-logging-java [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) , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , 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) , libglib2.0-dev (>= 2.15.0)
+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.7.2
XS-Python-Version: current
Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.0/experimental
=== modified file 'control.in'
--- a/control.in 2008-05-19 20:54:18 +0000
+++ b/control.in 2008-05-29 10:59:20 +0000
@@ -51,7 +51,7 @@
libpq-dev,
libxrandr-dev
%BUILD_DEPS%
-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]
+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.7.2
XS-Python-Version: current
Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.0/experimental
=== modified file 'rules'
--- a/rules 2008-05-23 17:27:16 +0000
+++ b/rules 2008-05-29 10:59:20 +0000
@@ -27,8 +27,8 @@
PKGSOURCE := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2;exit 0}')
SOURCE_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
-UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d":" -f2 | cut -d- -f1)
-BASE_VERSION:=$(UPSTREAM_VERSION)
+UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d: -f2 | cut -d- -f1)
+BASE_VERSION:=$(shell echo $(SOURCE_VERSION) | cut -d: -f1):$(UPSTREAM_VERSION)
HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
#HELP_L10N_VIRTUAL_VERSION:=2.4
@@ -233,7 +233,6 @@
NEONSONR=26
NEW_DPKG_SHLIBDEPS=n
DBVER=4.4
- USE_SYSTEM_ICU=n
USE_STLPORT=y
PACKAGE_WRITER2LATEX=y
MOZILLA=xulrunner
@@ -255,20 +254,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"
@@ -308,9 +311,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
@@ -359,7 +362,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
@@ -369,9 +372,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)
@@ -384,8 +384,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
@@ -436,10 +438,10 @@
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 [$(OOO_ARCHS)]
+ BUILD_DEPS += , python
endif
BUILD_DEPS += , debhelper (>= 6.0.7~)
@@ -626,21 +628,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
@@ -651,10 +657,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
@@ -686,13 +694,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
@@ -1124,7 +1134,7 @@
# Generate control file, because we have so many different languages
# Based on script by Martin Quinson <Martin.Quinson@tuxfamily.org>
control: debian/control
-debian/control: debian/control.in debian/control.lang.in debian/control.help.in debian/control.fonts.in debian/control.sdk.in debian/control.mozilla.in debian/control.gcj.in debian/control.gcj.in debian/control.mono.in debian/control.qa.in debian/control.postgresql.in ooo-build/bin/openoffice-xlate-lang debian/rules
+debian/control: $(wildcard debian/control*in) ooo-build/bin/openoffice-xlate-lang debian/rules
chmod 755 ooo-build/bin/openoffice-xlate-lang
sed -e "s#openoffice.orgVER#openoffice.org$(VER)#g" \
-e "s#broffice.orgVER#broffice.org$(VER)#g" \
@@ -1234,7 +1244,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
@@ -1645,7 +1655,7 @@
#
# Generate maintainer scripts
maintscripts: $(STAMP_DIR)/maintscripts
-$(STAMP_DIR)/maintscripts: debian/shell-lib.sh debian/control
+$(STAMP_DIR)/maintscripts: debian/shell-lib.sh $(wildcard debian/*.preinst.in) $(wildcard debian/*.postinst.in) $(wildcard debian/*.prerm.in) $(wildcard debian/*.postrm.in) debian/scripts/vars.$(ARCH) debian/control
dh_testdir
rm -f debian/*.{pre,post}{inst,rm}
Reply to: