------------------------------------------------------------
revno: 1753
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Thu 2009-11-12 19:39:36 +0100
message:
MOZILLA=libxul
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-11-10 21:01:58 +0000
+++ b/changelog 2009-11-12 18:39:36 +0000
@@ -1,9 +1,10 @@
openoffice.org (1:3.1.1-7) UNRELEASED; urgency=low
* ooo-build:
- - update (15358d0ee4b92789d2ec9c58251eb16d3e8b23bd)
+ - update (d3710ff30e264935d076a73a6f7dc69267f840a6)
- icc-use-sal-endianness-and-types.diff: use correct endianess
in icc (closes: #536348)
+ - xulrunner-1.9.1.diff: fix build with xulrunner 1.9.1
* debian/po:
- add
@@ -19,10 +20,11 @@
(command-with-path-in-maintainer-script)
- install /usr/share/openoffice/shell-lib-extensions.sh only with 644;
thanks lintian
+ - MOZILLA=libxul (closes: #555912)
* debian/openoffice.org-common.lintian-overrides.in: override
E: openoffice.org-common: no-debconf-config
- -- Rene Engelhard <r...@debian.org> Tue, 10 Nov 2009 22:00:22 +0100
+ -- Rene Engelhard <r...@debian.org> Thu, 12 Nov 2009 19:38:11 +0100
openoffice.org (1:3.1.1-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-11-05 09:27:47 +0000
+++ b/control 2009-11-12 18:39:36 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <ha...@debian.org>, Rene Engelhard <r...@debian.org>
-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,
libldap2-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], libglu1-mesa-dev [i386 powerpc s390 amd64
ia64 ppc64 s390x] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev ,
libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
6.0.7~) , o
penjdk-6-jdk , gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x],
libgcj-common (>= 1:4.4.1-1) [i386 mips mipsel s390 armel amd64 ia64 s390x] ,
ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x] , mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] ,
libcommons-codec-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x], libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x], libcommons-lang-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x], libcommons-logging-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , libbase-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libsac-java [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libxml-java-openoffice.org [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libflute-
java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], liblayout-java-openoffice.org [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x], libformula-java-openoffice.org [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x], librepository-java-openoffice.org [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x], libfonts-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x] , libcommons-logging-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , iceape-dev (>= 1.1.9-5) [i386 powerpc mips
mipsel s390 arm armel amd64 ia64 ppc64 s390x], libnss3-dev [i386 powerpc mips
mipsel s390 arm armel a
md64 ia64 ppc64 s390x] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64
ia64], libmono-dev (>= 2.0.1) [i386 amd64 ia64], mono-utils (>= 2.0.1) [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 , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev ,
libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev
, libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>=
1.0.6~r768) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x],
libmysqlcppconn-stlport-dev [i386] , libebook1.2-dev , libxrandr-dev ,
liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , 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 , librdf0-dev
, libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-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,
libldap2-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], libglu1-mesa-dev [i386 powerpc s390 amd64
ia64 ppc64 s390x] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev ,
libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
6.0.7~) , o
penjdk-6-jdk , gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x],
libgcj-common (>= 1:4.4.1-1) [i386 mips mipsel s390 armel amd64 ia64 s390x] ,
ant (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x] , mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x] ,
libcommons-codec-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x], libcommons-httpclient-java [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x], libcommons-lang-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x], libcommons-logging-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , libbase-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libsac-java [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], libxml-java-openoffice.org [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x], libflute-
java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x], liblayout-java-openoffice.org [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x], libformula-java-openoffice.org [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x], librepository-java-openoffice.org [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x], libfonts-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x],
libserializer-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64
ia64 ppc64 s390x] , libcommons-logging-java [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , xulrunner-dev [i386 powerpc mips mipsel s390
arm armel amd64 ia64 ppc64 s390x], libnss3-dev [i386 powerpc mips mipsel s390
arm armel amd64 ia64
ppc64 s390x] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 amd64 ia64],
libmono-dev (>= 2.0.1) [i386 amd64 ia64], mono-utils (>= 2.0.1) [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 , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev ,
libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev
, libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>=
1.0.6~r768) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x],
libmysqlcppconn-stlport-dev [i386] , libebook1.2-dev , libxrandr-dev ,
liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390
armel amd64 ia64 ppc64 s390x] , 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 , librdf0-dev ,
libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-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
=== modified file 'rules'
--- a/rules 2009-11-06 20:51:23 +0000
+++ b/rules 2009-11-12 18:39:36 +0000
@@ -203,7 +203,7 @@
USE_BZIP_COMPRESS=n
PRUNE_OOOBUILD=y
PARALLEL_BUILD=n
-MOZILLA=iceape
+MOZILLA=libxul
ENABLE_OPENGL=y
SYSTEM_OPENSSL=y
NEW_DPKG_SHLIBDEPS=y
@@ -327,6 +327,7 @@
DICT_DIR=/usr/share/myspell/dicts
HYPH_DIR=/usr/share/myspell/dicts
THES_DIR=/usr/share/myspell/dicts
+ MOZILLA=iceape
endif
#############
