------------------------------------------------------------
revno: 1136
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2008-06-18 19:21:41 +0200
message:
reenable mono on amd64
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-06-17 14:35:14 +0000
+++ b/changelog 2008-06-18 17:21:41 +0000
@@ -4,8 +4,9 @@
+ update (r12913)
* debian/rules:
- reenable randr
+ - reenable mono, mono seems to be fixed on amd64
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 17 Jun 2008 14:47:53 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 18 Jun 2008 19:19:50 +0200
openoffice.org (1:2.4.1-3) unstable; urgency=medium
=== modified file 'control'
--- a/control 2008-06-17 14:35:14 +0000
+++ b/control 2008-06-18 17:21:41 +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 , 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.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) , libxrandr-dev , 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 , 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 amd64
ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3)
[i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64],
cli-common-dev (>= 0.4.4) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc
amd64 ia64], mono-2.0-devel [i386 sparc amd64 ia64] , 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) , libxrandr-dev , 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, 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
@@ -3020,7 +3020,7 @@
This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
Package: libuno-cil
-Architecture: i386 sparc ia64
+Architecture: i386 sparc amd64 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
=== modified file 'rules'
--- a/rules 2008-06-17 14:35:14 +0000
+++ b/rules 2008-06-18 17:21:41 +0000
@@ -297,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
@@ -607,6 +607,8 @@
# 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)]
+ # FIXME: add versioned build-dep on the right package to force a newer
+ # 1.9.1 verision working on amd64
endif
ifeq "$(ENABLE_MONO)" "y"
# http://pkg-mono.alioth.debian.org/cli-policy/ch-mono.html#s7.3
