------------------------------------------------------------
revno: 1972
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Fri 2010-04-30 11:34:06 +0200
message:
move netpbm, fdupes, xml-core and libtextcat-data-utf8 to
Build-Depends-Indep, fix overly long changelog line
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2010-04-29 22:09:44 +0000
+++ b/changelog 2010-04-30 09:34:06 +0000
@@ -20,17 +20,20 @@
* debian/scripts/vars.kfreebsd-*: add PLATFORMID
* debian/shlibs.override.libc: force libc0.1 dependency to (>= 2.10.2-7)
* debian/control.in, debian/rules: use textcat data from
- libtextcat-data-utf8 if the same with "ours"
+ libtextcat-data-utf8 if the same with "ours". B-D-I on libtextcat-data-utf8
+ to find that out
* merge from Ubuntu:
- add ENABLE_SDBC_POSTGRESQL variable and disable the build of the
arch-dep extensions when we don't package them anyways
- change the way components like -evolution or -filter-binfilter are
registered so that we do not need to pre-depends on
openoffice.org-core anymore (thanks Michael Vogt)
- * debian/rules, debian/control.sdk.in: stop suggesting/recommending
java2-compiler,
- add the JAVA_RUNTIME_DEPENDS we already use instead.
+ * debian/rules, debian/control.sdk.in: stop suggesting/recommending
+ java2-compiler, add the JAVA_RUNTIME_DEPENDS we already use instead.
+ * debian/control.in, debian/rules: move netpbm, fdupes and xml-core to
+ Build-Depends-Indep
- -- Rene Engelhard <[email protected]> Thu, 29 Apr 2010 23:58:39 +0200
+ -- Rene Engelhard <[email protected]> Fri, 30 Apr 2010 01:23:09 +0200
openoffice.org (1:3.2.0-8) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-04-29 22:09:44 +0000
+++ b/control 2010-04-30 09:34:06 +0000
@@ -3,7 +3,8 @@
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], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], 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 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc],
libglu1-mesa-dev [i386 powerpc s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64
ppc64 s390x sparc] , l
ibpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libtextcat-data-utf8 , libcurl4-gnutls-dev , libssl-dev , libdb-dev ,
python-central (>= 0.5) , python-dev, python-all , debhelper (>= 7.2.3~) ,
openjdk-6-jdk [i386 powerpc s390 alpha amd64 armel ppc64 s390x sparc] , gcj-jdk
[i386 mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64
s390x sparc], libgcj-common (>= 1:4.4.1) [i386 mips mipsel s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x sparc] , ant (>= 1.7.0) [i386
mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa
ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
gcc-mingw32 [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x
sparc], libcommons-httpclient-java [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libcommons-lang-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-logging-java
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc] , libservlet2.5-java , libbase-java-openoffice.org
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc], libsac-java [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libxml-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alp
ha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libflute-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x
sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libloader-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libformula-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
librepository-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libfonts-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libserializer-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java ,
xulrunner-dev [i386 mips mipsel powerpc s390 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc
s390 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>=
1:4.11) , mono-devel (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64
kfreebsd-i386], libmono-dev (>= 2.4.2.3) [i386 kfreebsd-i386 amd64
kfreebsd-amd64 ia64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [i386 kfreebsd-i386
amd64 kfreebsd-amd64 ia64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [i386
kfreebsd-i386 amd64 kfreebsd-amd64 ia64 kfreebsd-i386] , libhunspell-dev (>=
1.1.5-2) , lib
hyphen-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 , libmysqlcppconn-dev (>=
1.1.0~r791) [i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev ,
libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , bsh (>= 2.0b4) [i386
mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa
ia64 ppc64 s390x sparc] , 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 (>= 1.0.8) , 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], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], 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, 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 kfreebsd-i386 amd64 kfreebsd-amd64
ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc s390 kfreebsd-i386
amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) ,
libgraphite-dev [i386 m68k mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libcurl4-gnutls-dev ,
libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev, python-all ,
debhelper (>= 7.2.3~) , openjdk-6-jdk [i386 powerpc s390 alpha amd64 armel
ppc64 s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386
mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x
sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>=
1.7.0) [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
mingw32-runtime [i386 mips mipsel powerpc s390 kfreebsd-i386 alp
ha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libcommons-codec-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libcommons-httpclient-java
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc], libcommons-lang-java [i386 mips mipsel powerpc
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x
sparc], libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libsac-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s39
0x sparc], libflute-java-openoffice.org [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x
sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libloader-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libformula-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
librepository-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libfonts-java-openoffice.org [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc], libserializer-java-openoffice.org [i386 mips mipsel powerpc s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libcommons-logging-java [i386 mips mipsel powerpc s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libservlet2.5-java ,
xulrunner-dev [i386 mips mipsel powerpc s390 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc], libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc
s390 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>=
1:4.11) , mono-devel (>= 2.4.2.3) [i386 kfreebsd-i386 amd64 kfreebsd-amd64 ia64
kfreebsd-i386], libmono-dev (>= 2.4.2.3) [i386 kfreebsd-i386 amd64
kfreebsd-amd64 ia64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [i386 kfreebsd-i386
amd64 kfreebsd-amd64 ia64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [i386
kfreebsd-i386 amd64 kfreebsd-amd64 ia64 kfreebsd-i386] , 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 , libmysqlcppconn-dev (>= 1.1.0~r791) [i386 m68k mips mipsel
powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2)
[i386 mips mipsel powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel
hppa ia64 ppc64 s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel
powerpc s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
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 , libn
eon27-gnutls-dev , librdf0-dev (>= 1.0.8) , libgtk2.0-dev (>= 2.10) ,
libgnomevfs2-dev , libgconf2-dev , libldap2-dev
+Build-Depends-Indep: fdupes, xml-core, netpbm, , libtextcat-data-utf8
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) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel],
ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (=
1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (= 5)
Standards-Version: 3.8.4
XS-Python-Version: >= 2.4
=== modified file 'control.in'
--- a/control.in 2010-04-27 18:13:50 +0000
+++ b/control.in 2010-04-30 09:34:06 +0000
@@ -37,9 +37,6 @@
fastjar,
xsltproc,
imagemagick,
- netpbm,
- fdupes,
- xml-core,
libxkbfile-dev,
libxinerama-dev,
x11proto-render-dev,
@@ -49,6 +46,7 @@
libpq-dev,
po-debconf,
%BUILD_DEPS%
+Build-Depends-Indep: fdupes, xml-core, netpbm, %BUILD_DEPS_INDEP%
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) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-2)
[%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-3) [%OOO_GCJ_JDK_ARCHS%]
Standards-Version: 3.8.4
XS-Python-Version: >= 2.4
=== modified file 'rules'
--- a/rules 2010-04-29 21:52:12 +0000
+++ b/rules 2010-04-30 09:34:06 +0000
@@ -661,7 +661,7 @@
endif
ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
- BUILD_DEPS += , libtextcat-data-utf8
+ BUILD_DEPS_INDEP += , libtextcat-data-utf8
TEXTCAT_DATA_RECOMMENDS := libtextcat-data-utf8
endif
@@ -1600,6 +1600,7 @@
-e "s#%$(DIST)=\([^%]*\)%#, \1#g#" \
-e "s#%[A-Za-z]*=[^%]*%##g#" \
-e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" \
+ -e "s#%BUILD_DEPS_INDEP%#$(strip $(BUILD_DEPS_INDEP))#g" \
< debian/control.in > debian/control
for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
