------------------------------------------------------------
revno: 1808
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Thu 2010-02-11 13:50:24 +0100
message:
build-depend on libjpeg-dev instead of libjpeg62-dev
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2010-02-10 21:50:34 +0000
+++ b/changelog 2010-02-11 12:50:24 +0000
@@ -15,10 +15,11 @@
- build-conflict against graphicsmagick-imagemagick-compat (<< 1.3.9ยจ),
suggest imagemagick | graphicsmagick-imagemagick-compat instead of
vice-versa (closes: #569124)
+ - build-depend on libjpeg-dev instead of libjpeg62-dev
* debian/control.ure.in: fix uno-libs3*'s ure replaces
- -- Rene Engelhard <[email protected]> Wed, 10 Feb 2010 22:49:05 +0100
+ -- Rene Engelhard <[email protected]> Thu, 11 Feb 2010 13:48:29 +0100
openoffice.org (1:3.2.0~rc5-2) experimental; urgency=low
=== modified file 'control'
--- a/control 2010-02-10 21:50:34 +0000
+++ b/control 2010-02-11 12:50:24 +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, libjpeg62-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] , dpkg-dev (>= 1.14.11) , 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] , 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] , gcj-jdk
[i386 mips mipsel s390 amd64 ia64 s390x sparc hppa], libgcj-common (>= 1:4.4.1)
[i386 mips mipsel s390 amd64 ia64 s390x sparc hppa] , ant (>= 1.7.0) [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], ant-optional (>=
1.7.0) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] ,
gcc-mingw32 [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
mingw32-runtime [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc
hppa] , libcommons-codec-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libcommons-httpclient-java [i386 powerpc mips mipsel s390
amd64 ia64 ppc64 s390x sparc hppa], libcommons-lang-java [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libcommons-logging-java [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] ,
libbase-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libsac-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libxml-java-openoffice.org [i386 powerpc mips mipsel s390
amd64 ia64 ppc64 s390x sparc hppa], libflute-java-openoffice.org [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa], liblayout-java-openoffice.org [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libloader-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libformula-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa], librepository-java-openoffice.org
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libserializer-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa] , libcommons-logging-java [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , xulrunner-dev [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libnss3-dev (>=
3.12.3) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc 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-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 , libebook1.2-dev ,
libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 amd64
ia64 ppc64 s390x sparc hppa] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , bsh (>= 2.0b4) [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , 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] , dpkg-dev (>= 1.14.11) , 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] , 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] , gcj-jdk
[i386 mips mipsel s390 amd64 ia64 s390x sparc hppa], libgcj-common (>= 1:4.4.1)
[i386 mips mipsel s390 amd64 ia64 s390x sparc hppa] , ant (>= 1.7.0) [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], ant-optional (>=
1.7.0) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] ,
gcc-mingw32 [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
mingw32-runtime [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc
hppa] , libcommons-codec-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libcommons-httpclient-java [i386 powerpc mips mipsel s390
amd64 ia64 ppc64 s390x sparc hppa], libcommons-lang-java [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libcommons-logging-java [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] ,
libbase-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libsac-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libxml-java-openoffice.org [i386 powerpc mips mipsel s390
amd64 ia64 ppc64 s390x sparc hppa], libflute-java-openoffice.org [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa], liblayout-java-openoffice.org [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libloader-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libformula-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa], librepository-java-openoffice.org
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa],
libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc hppa], libserializer-java-openoffice.org [i386 powerpc mips mipsel
s390 amd64 ia64 ppc64 s390x sparc hppa] , libcommons-logging-java [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , xulrunner-dev [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa], libnss3-dev (>=
3.12.3) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc 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-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 , libebook1.2-dev ,
libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc mips mipsel s390 amd64
ia64 ppc64 s390x sparc hppa] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , bsh (>= 2.0b4) [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc hppa] , 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~), base-files (= 5)
Standards-Version: 3.8.3
XS-Python-Version: current
=== modified file 'control.in'
--- a/control.in 2010-02-10 21:50:34 +0000
+++ b/control.in 2010-02-11 12:50:24 +0000
@@ -30,7 +30,7 @@
libcups2-dev,
libarchive-zip-perl,
libpng12-dev,
- libjpeg62-dev,
+ libjpeg-dev,
libxml2-dev,
libexpat1-dev,
fastjar,
