------------------------------------------------------------
revno: 1122
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-06-17 16:44:50 +0200
message:
merge
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.1.113
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-06-17 16:35:14 +0200
message:
ooo-build update; reenable randr
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-06-17 14:42:21 +0000
+++ b/changelog 2008-06-17 14:44:50 +0000
@@ -30,6 +30,7 @@
- add --enable-gio conditional
- start of KDE4 support
- add BUILD_GTK conditional; disable both GTK and KDE for now...
+ - reenable randr
* 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
=== modified file 'control'
--- a/control 2008-06-15 18:41:02 +0000
+++ b/control 2008-06-17 14:44:50 +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,
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,
libcups2-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, bc , 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 , 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-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), 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-1)
[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, 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, bc , 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 , 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) ,
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
=== modified file 'rules'
--- a/rules 2008-06-17 14:42:21 +0000
+++ b/rules 2008-06-17 14:44:50 +0000
@@ -171,7 +171,7 @@
ENABLE_PDFIMPORT=y
BUILD_GTK=n
ENABLE_GIO=y
-ENABLE_RANDR=n
+ENABLE_RANDR=y
ifeq "$(BUILD_GTK)" "y"
PACKAGE_NPSOPLUGIN=y
endif
@@ -786,8 +786,9 @@
endif
ifeq "$(ENABLE_RANDR)" "y"
- CONFIGURE_FLAGS += --enable-randr
BUILD_DEPS += , libxrandr-dev
+else
+ CONFIGURE_FLAGS += --disable-randr
endif
ifeq "$(BUILD_BINFILTERS)" "y"
