------------------------------------------------------------
revno: 1869
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Thu 2010-03-18 23:53:03 +0100
message:
disable mozilla for alpha
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2010-03-18 17:18:34 +0000
+++ b/changelog 2010-03-18 22:53:03 +0000
@@ -24,13 +24,13 @@
.orig-ooo-build-X.Y.z.tar.gz, too and remove obsolete vcsupdate target
- fix libservlet2.x-java package/jar name detection, thanks calc for the
info
- - enable alpha
+ - enable alpha (no mozilla, though, xulrunner-dev not installable)
* debian/README.Debian-source: update for 3.2, mention new extra compnents
* debian/scripts/vars.alpha: add
* debian/control.in: remove full-featured from short description to
accomodate longer language names (closes: #566606)
- -- Rene Engelhard <[email protected]> Thu, 18 Mar 2010 15:53:42 +0100
+ -- Rene Engelhard <[email protected]> Thu, 18 Mar 2010 23:49:55 +0100
openoffice.org (1:3.2.0-4) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-03-18 17:18:34 +0000
+++ b/control 2010-03-18 22:53:03 +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, libjpeg-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] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) ,
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 [i386 powerpc mips mipsel s390 m68k
amd64 ia64 ppc64 s390x sparc hppa
armel alpha] , libcurl4-openssl-dev , libssl-dev , libdb-dev , python-central
(>= 0.5) , python-dev , debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc
s390 amd64 ppc64 s390x sparc armel alpha] , gcj-jdk [i386 mips mipsel s390
amd64 ia64 s390x sparc hppa armel alpha], libgcj-common (>= 1:4.4.1) [i386 mips
mipsel s390 amd64 ia64 s390x sparc hppa armel alpha] , ant (>= 1.7.0) [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x
sparc hppa armel alpha] , gcc-mingw32 [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa armel alpha], mingw32-runtime [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha] , libcommons-codec-java
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
libcommons-httpclient-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa armel alpha], libcommons-lang-java [i386 power
pc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
libcommons-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x
sparc hppa armel alpha] , libservlet2.5-java , libbase-java-openoffice.org
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
libsac-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa
armel alpha], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 amd64
ia64 ppc64 s390x sparc hppa armel alpha], libflute-java-openoffice.org [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa armel alpha], libloader-java-openoffice.org [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
libformula-java-openoffice.org [i3
86 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
librepository-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa armel alpha], libfonts-java-openoffice.org [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa armel alpha] , libcommons-logging-java [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha] ,
libservlet2.5-java , xulrunner-dev [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc armel hppa alpha], libnss3-dev (>= 3.12.3) [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc armel hppa alpha] , 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) , libs
tlport4.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 armel alpha] , libebook1.2-dev ,
libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 amd64
ia64 ppc64 s390x sparc hppa armel alpha] , libhsqldb-java (>> 1.8.0.10) [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha] , bsh
(>= 2.0b4) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa
armel alpha] , 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 , 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, libjpeg-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] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>= 1.15.1) ,
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 [i386 powerpc mips mipsel s390 m68k
amd64 ia64 ppc64 s390x sparc hppa
armel alpha] , libcurl4-openssl-dev , libssl-dev , libdb-dev , python-central
(>= 0.5) , python-dev , debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc
s390 amd64 ppc64 s390x sparc armel alpha] , gcj-jdk [i386 mips mipsel s390
amd64 ia64 s390x sparc hppa armel alpha], libgcj-common (>= 1:4.4.1) [i386 mips
mipsel s390 amd64 ia64 s390x sparc hppa armel alpha] , ant (>= 1.7.0) [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x
sparc hppa armel alpha] , gcc-mingw32 [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa armel alpha], mingw32-runtime [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha] , libcommons-codec-java
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
libcommons-httpclient-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa armel alpha], libcommons-lang-java [i386 power
pc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
libcommons-logging-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x
sparc hppa armel alpha] , libservlet2.5-java , libbase-java-openoffice.org
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
libsac-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa
armel alpha], libxml-java-openoffice.org [i386 powerpc mips mipsel s390 amd64
ia64 ppc64 s390x sparc hppa armel alpha], libflute-java-openoffice.org [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa armel alpha], libloader-java-openoffice.org [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
libformula-java-openoffice.org [i3
86 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
librepository-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa armel alpha], libfonts-java-openoffice.org [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha],
libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc hppa armel alpha] , libcommons-logging-java [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha] ,
libservlet2.5-java , xulrunner-dev [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc armel hppa], libnss3-dev (>= 3.12.3) [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc armel 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-de
v (>= 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 armel alpha] , libebook1.2-dev ,
libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 amd64
ia64 ppc64 s390x sparc hppa armel alpha] , libhsqldb-java (>> 1.8.0.10) [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa armel alpha] , bsh
(>= 2.0b4) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa
armel alpha] , 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 , 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), graphicsmagick-imagemagick-compat (<<
1.3.9~), ant (= 1.8.0-1) [ia64 mips mipsel kfreebsd-i386 kfreebsd-amd64 hppa],
ant (= 1.8.0-2) [ia64 mips mipsel kfreebsd-i386 kfreebsd-amd64 hppa], ant (=
1.8.0-3) [ia64 mips mipsel kfreebsd-i386 kfreebsd-amd64 hppa], base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
@@ -3441,7 +3441,7 @@
Package: mozilla-openoffice.org
Section: net
-Architecture: i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc armel
hppa alpha
+Architecture: i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc armel
hppa
Enhances: iceape-browser,
iceweasel,
mozilla-browser,
=== modified file 'rules'
--- a/rules 2010-03-18 17:18:00 +0000
+++ b/rules 2010-03-18 22:53:03 +0000
@@ -544,9 +544,9 @@
ifeq "$(BUILD_HPPA)" "y"
OOO_MOZILLA_ARCHS += hppa
endif
-ifeq "$(BUILD_ALPHA)" "y"
- OOO_MOZILLA_ARCHS += alpha
-endif
+#ifeq "$(BUILD_ALPHA)" "y"
+# OOO_MOZILLA_ARCHS += alpha
+#endif
ifeq "$(USE_BZIP_COMPRESS)" "y"
DPKG_DEPENDS = dpkg (>= 1.10.24)
