./packages/openofficeorg/2.4/experimental r959: OOH680_m1, build-depend on graphicsmagick-imagemagick-compat
------------------------------------------------------------
revno: 959
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2008-01-06 01:09:40 +0100
message:
OOH680_m1, build-depend on graphicsmagick-imagemagick-compat
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2008-01-04 23:47:51 +0000
+++ b/changelog 2008-01-06 00:09:40 +0000
@@ -1,6 +1,12 @@
-openoffice.org (1:2.4.0~m241-0.1pre) experimental; urgency=low
-
- * new upstream snapshot (SRC680_m241)
+openoffice.org (1:2.4.0~ooh680m1-0.1prf) experimental; urgency=low
+
+ *
+
+ -- Rene Engelhard <rene@debian.org> Sat, 05 Jan 2008 15:52:39 +0100
+
+openoffice.org (1:2.4.0~ooh680m1-0.1pre) experimental; urgency=low
+
+ * new upstream snapshot (OOH680_m1)
- adds https support for WebDAV (closes: #244280)
- officially adds possibility to input formulas starting with -/+
(closes: #433360)
@@ -35,6 +41,8 @@
- remove Provides: writer2latex from -writer, bogus (we only provide
libwriter2latex-java at all, and that with an old version). Depend
on openoffice.org-writer2latex.
+ - build-depend on graphicsmagick-imagemagick-compat instead of simply
+ graphicsmagick as ooo-builds Makefile.shared now uses "convert".
* debian/control.ogltrans.in:
- depend on openoffice.orgVER-core and openoffice.orgVER-impress
>> 2.4.0~m237
@@ -43,7 +51,7 @@
* debian/openoffice.org-{ogltrans,base-core}.overrides.lintian:
- override RPATH warning
- -- Rene Engelhard <rene@debian.org> Fri, 21 Dec 2007 13:19:37 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 05 Jan 2008 01:21:21 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-01-04 23:47:51 +0000
+++ b/control 2008-01-06 00:09:40 +0000
@@ -3,13 +3,8 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-<<<<<<< TREE
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], flex [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libpam0g-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxaw7-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], unzip [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], zip [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], autoconf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], sharutils [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], pkg-config [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], xutils [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libfontconfig1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libfreetype6-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libx11-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libsm-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxt-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxext-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libice-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libsane-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxrender-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libcupsys2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libarchive-zip-perl [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libstartup-notification0-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libpng12-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libjpeg62-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxml2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libldap2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libexpat1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libgnomevfs2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], fastjar [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libsndfile1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], xsltproc [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], graphicsmagick [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], netpbm [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], fdupes [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], xml-core [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxkbfile-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxinerama-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], x11proto-render-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxml-parser-perl [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], gperf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libpq-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libgl1-mesa-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libglu1-mesa-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libcurl4-openssl-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libssl-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libdb4.5-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , libxerces2-java [i386 powerpc sparc mips mipsel armel amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel armel amd64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel armel amd64 ppc64], libsac-java [i386 powerpc sparc mips mipsel armel amd64 ppc64], libxml-java [i386 powerpc sparc mips mipsel armel amd64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel armel amd64 ppc64], libjfreereport-java (>= 0.9.0-05) [i386 powerpc sparc mips mipsel armel amd64 ppc64], liblayout-java [i386 powerpc sparc mips mipsel armel amd64 ppc64], libloader-java [i386 powerpc sparc mips mipsel armel amd64 ppc64], libformula-java [i386 powerpc sparc mips mipsel armel amd64 ppc64], librepository-java [i386 powerpc sparc mips mipsel armel amd64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel armel amd64 ppc64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel amd64 ppc64] , libxul-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , dmake (>= 1:4.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , mono-mcs (>= 1.2.3) [i386 amd64], mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3) [i386 amd64], mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4) [i386 amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libwps-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libwpg-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libicu-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libxslt1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libcairo2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libneon27-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64]
-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, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1)
-=======
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386 powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf [i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64], pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64 ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64], libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386 powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64], libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64], libarchive-zip-perl [i386 powerpc sparc amd64 ppc64], libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev [i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64 ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64], netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64 ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64], x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64 ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc amd64 ppc64] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc amd64 ppc64] , libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libdb4.5-dev [i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc amd64 ppc64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc amd64 ppc64], libsac-java [i386 powerpc sparc amd64 ppc64], libxml-java [i386 powerpc sparc amd64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc amd64 ppc64], libjfreereport-java (>= 0.9.0-05) [i386 powerpc sparc amd64 ppc64], liblayout-java [i386 powerpc sparc amd64 ppc64], libloader-java [i386 powerpc sparc amd64 ppc64], libformula-java [i386 powerpc sparc amd64 ppc64], librepository-java [i386 powerpc sparc amd64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc amd64 ppc64], libjcommon-serializer-java [i386 powerpc sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64] , mono-mcs (>= 1.2.3) [i386 sparc amd64], mono-gmcs (>= 1.2.3) [i386 sparc amd64], libmono-dev (>= 1.2.3) [i386 sparc amd64], mono-utils (>= 1.2.3) [i386 sparc amd64], cli-common-dev (>= 0.4.4) [i386 sparc amd64], mono-1.0-devel [i386 sparc amd64], mono-2.0-devel [i386 sparc amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64 ppc64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386 powerpc sparc amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc amd64 ppc64] , portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64] , libwpg-dev [i386 powerpc sparc amd64 ppc64] , libicu-dev [i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] , libneon27-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], flex [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libpam0g-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxaw7-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], unzip [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], zip [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], autoconf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], sharutils [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], pkg-config [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], xutils [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libfontconfig1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libfreetype6-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libx11-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libsm-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxt-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxext-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libice-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libsane-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxrender-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libcupsys2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libarchive-zip-perl [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libstartup-notification0-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libpng12-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libjpeg62-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxml2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libldap2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libexpat1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libgnomevfs2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], fastjar [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libsndfile1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], xsltproc [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], graphicsmagick-imagemagick-compat [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], netpbm [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], fdupes [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], xml-core [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxkbfile-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxinerama-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], x11proto-render-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libxml-parser-perl [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], gperf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libpq-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libgl1-mesa-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libglu1-mesa-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libcurl4-openssl-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libssl-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libdb4.5-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , libxerces2-java [i386 powerpc sparc mips mipsel armel amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel armel amd64 ppc64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel armel amd64 ppc64], libsac-java [i386 powerpc sparc mips mipsel armel amd64 ppc64], libxml-java [i386 powerpc sparc mips mipsel armel amd64 ppc64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel armel amd64 ppc64], libjfreereport-java (>= 0.9.0-05) [i386 powerpc sparc mips mipsel armel amd64 ppc64], liblayout-java [i386 powerpc sparc mips mipsel armel amd64 ppc64], libloader-java [i386 powerpc sparc mips mipsel armel amd64 ppc64], libformula-java [i386 powerpc sparc mips mipsel armel amd64 ppc64], librepository-java [i386 powerpc sparc mips mipsel armel amd64 ppc64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel armel amd64 ppc64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel amd64 ppc64] , libxul-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , dmake (>= 1:4.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , mono-mcs (>= 1.2.3) [i386 sparc amd64], mono-gmcs (>= 1.2.3) [i386 sparc amd64], libmono-dev (>= 1.2.3) [i386 sparc amd64], mono-utils (>= 1.2.3) [i386 sparc amd64], cli-common-dev (>= 0.4.4) [i386 sparc amd64], mono-1.0-devel [i386 sparc amd64], mono-2.0-devel [i386 sparc amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libwps-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libwpg-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libicu-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libxslt1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libcairo2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libneon27-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64]
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, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1), 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)
->>>>>>> MERGE-SOURCE
Standards-Version: 3.7.2
XS-Python-Version: current
Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.4/experimental
=== modified file 'control.in'
--- a/control.in 2008-01-04 23:47:51 +0000
+++ b/control.in 2008-01-06 00:09:40 +0000
@@ -39,7 +39,7 @@
fastjar [%OOO_ARCHS%],
libsndfile1-dev [%OOO_ARCHS%],
xsltproc [%OOO_ARCHS%],
- graphicsmagick [%OOO_ARCHS%],
+ graphicsmagick-imagemagick-compat [%OOO_ARCHS%],
netpbm [%OOO_ARCHS%],
fdupes [%OOO_ARCHS%],
xml-core [%OOO_ARCHS%],
=== modified file 'rules'
--- a/rules 2008-01-04 23:47:51 +0000
+++ b/rules 2008-01-06 00:09:40 +0000
@@ -52,11 +52,11 @@
unexport LS_COLORS
SRCNUM=680
-MWS=SRC680
+MWS=OOH680
# note that this only makes sense for ~oo?680s. as o < r (as rcX). src680 would break the ordering (s > r).
-#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
+MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
# For SRC680 milestones, use only ~mX
-MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2)
+#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2)
#MILESTONE=m9
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
Reply to: