------------------------------------------------------------
revno: 1753 [merge]
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Sun 2009-12-27 22:58:49 +0100
message:
merge
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-12-27 21:55:16 +0000
+++ b/changelog 2009-12-27 21:58:49 +0000
@@ -7,11 +7,18 @@
* debian/control.in:
- actually fix Vcs-Bzr:
- * merge 1:3.1.1-12
+ * merge 1:3.1.1-12 and -13
-- Rene Engelhard <[email protected]> Tue, 22 Dec 2009 23:07:22 +0100
-openoffice.org (1:3.1.1-12) UNRELEASED; urgency=medium
+openoffice.org (1:3.1.1-13) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - actually also remove armel from OOO_JAVA_ARCHS and OOO_MOZILLA_ARCHS
+
+ -- Rene Engelhard <[email protected]> Sun, 27 Dec 2009 22:28:58 +0100
+
+openoffice.org (1:3.1.1-12) unstable; urgency=medium
* ooo-build:
- update (bfe183f5f669daea3dd91d13fea47b2ddc8e370)
@@ -19,8 +26,9 @@
gcj
- surrender and disable armel until the bug in the bridges is fixed...
+ - disable mono on sparc
- -- Rene Engelhard <[email protected]> Tue, 22 Dec 2009 10:28:54 +0100
+ -- Rene Engelhard <[email protected]> Fri, 25 Dec 2009 23:05:26 +0100
openoffice.org (1:3.2.0~rc1-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2009-12-27 21:55:16 +0000
+++ b/control 2009-12-27 21:58:49 +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), flex | 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)
[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,
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, po-debconf, , g++ (>> 4.3.0) [s390], gcc
(>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390
amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64
ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [powerpc mips
mipsel s390 m68k amd64 ia64 ppc64 s390x sparc hppa] , libcurl4-openssl-dev ,
libssl
-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
6.0.7~) , openjdk-6-jdk [i386 powerpc s390 armel amd64 ppc64 s390x sparc] ,
gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x sparc hppa],
libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 armel amd64 ia64 s390x sparc
hppa] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x sparc hppa], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x sparc hppa] , gcc-mingw32 [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x sparc hppa] , libcommons-codec-java [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa],
libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc hppa], libcommons-lang-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x sparc hppa], libcommons-logging-java [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] ,
libbase-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa],
libsac-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc
hppa], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x sparc hppa], libflute-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x sparc hppa], liblayout-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa],
libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc hppa], libformula-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa],
librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x sparc hppa], libfonts-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s39
0x sparc hppa], libserializer-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libcommons-logging-java [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] ,
xulrunner-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x
sparc hppa], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 arm armel
amd64 ia64 ppc64 s390x sparc hppa] , dmake (>= 1:4.11) , mono-devel (>=
2.4.2.3) [i386 amd64 ia64 sparc], libmono-dev (>= 2.4.2.3) [i386 amd64 ia64
sparc], mono-utils (>= 2.4.2.3) [i386 amd64 ia64 sparc], cli-common-dev (>=
0.5.7) [i386 amd64 ia64 sparc] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev
(>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4)
, libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>=
1.1.0~r791)
[powerpc mips mipsel s390 m68k amd64 ia64 ppc64 s390x sparc hppa] ,
libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libhsqldb-java (>>
1.8.0.10) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc
hppa] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x sparc hppa] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>=
5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60)
, libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , libgtk2.0-dev (>=
2.10) , libgnomevfs2-dev , libgconf2-dev , gcc-4.4, g++-4.4 , libldap2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | 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)
[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,
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, po-debconf, , g++ (>> 4.3.0) [s390], gcc
(>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc s390
amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 amd64 ia64
ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) , libgraphite-dev [powerpc mips
mipsel s390 m68k amd64 ia64 ppc64 s390x sparc hppa] , libcurl4-openssl-dev ,
libssl
-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
6.0.7~) , openjdk-6-jdk [i386 powerpc s390 armel amd64 ppc64 s390x sparc] ,
gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x sparc hppa],
libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 armel amd64 ia64 s390x sparc
hppa] , ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x sparc hppa], ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x sparc hppa] , gcc-mingw32 [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x sparc hppa] , libcommons-codec-java [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa],
libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc hppa], libcommons-lang-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x sparc hppa], libcommons-logging-java [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] ,
libbase-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa],
libsac-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc
hppa], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x sparc hppa], libflute-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x sparc hppa], liblayout-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa],
libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc hppa], libformula-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa],
librepository-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x sparc hppa], libfonts-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s39
0x sparc hppa], libserializer-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x sparc hppa] , libcommons-logging-java [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] ,
xulrunner-dev [i386 powerpc mips mipsel s390 arm armel amd64 ia64 ppc64 s390x
sparc hppa], libnss3-dev (>= 3.12.3) [i386 powerpc mips mipsel s390 arm armel
amd64 ia64 ppc64 s390x sparc hppa] , dmake (>= 1:4.11) , mono-devel (>=
2.4.2.3) [i386 amd64 ia64], libmono-dev (>= 2.4.2.3) [i386 amd64 ia64],
mono-utils (>= 2.4.2.3) [i386 amd64 ia64], cli-common-dev (>= 0.5.7) [i386
amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) ,
libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) ,
libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev ,
libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>= 4:4.3.4)
, libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>=
1.1.0~r791) [powerpc mips mipsel s39
0 m68k amd64 ia64 ppc64 s390x sparc hppa] , libebook1.2-dev , libxrandr-dev ,
liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc hppa] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] , bsh (>= 2.0b4) [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc hppa] ,
liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) ,
libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugins-base0.10-dev , libneon27-gnutls-dev , libgtk2.0-dev (>=
2.10) , libgnomevfs2-dev , libgconf2-dev , gcc-4.4, g++-4.4 , libldap2-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),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
@@ -3365,7 +3365,7 @@
Package: cli-uno-bridge
Section: cli-mono
-Architecture: i386 amd64 ia64 sparc
+Architecture: i386 amd64 ia64
Depends: ${shlibs:Depends}, openoffice.org-core (>> ${base-version}),
libuno-cli-basetypes1.0-cil, libuno-cli-uretypes1.0-cil,
libuno-cli-oootypes1.0-cil, libuno-cli-cppuhelper1.0-cil,
libuno-cli-ure1.0-cil, ${cli:Depends}, ${misc:Depends}
Conflicts: libuno-cil, libuno-cli-types1.1-cil
Provides: libuno-cil
=== modified file 'rules'
--- a/rules 2009-12-22 09:38:21 +0000
+++ b/rules 2009-12-27 21:58:49 +0000
@@ -450,9 +450,9 @@
ifeq "$(BUILD_IA64)" "y"
OOO_MONO_ARCHS += ia64
endif
-ifeq "$(BUILD_SPARC)" "y"
- OOO_MONO_ARCHS += sparc
-endif
+#ifeq "$(BUILD_SPARC)" "y"
+# OOO_MONO_ARCHS += sparc
+#endif
ifeq (,$(findstring $(ARCH),$(OOO_MONO_ARCHS)))
ENABLE_MONO=n
endif
