------------------------------------------------------------
revno: 1783
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Sat 2009-12-12 19:31:37 +0100
message:
depend on kdelibs-runtime >= 4.3.4, bump build-dep on kdelibs5-dev, too
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-12-12 10:58:06 +0000
+++ b/changelog 2009-12-12 18:31:37 +0000
@@ -2,8 +2,10 @@
* debian/rules:
- only build-depend on (gcc-)mingw32 when we actually enable the SDK
+ - build-depend on kdelibs5-dev (>= 4:4.3.4) when building against KDE4.
+ Add .shlibs local to force a kdebase-runtime a >= 4:4.3.4 dependency
- -- Rene Engelhard <[email protected]> Sat, 12 Dec 2009 11:56:16 +0100
+ -- Rene Engelhard <[email protected]> Sat, 12 Dec 2009 13:22:46 +0100
openoffice.org (1:3.1.1-9) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-12-08 23:28:36 +0000
+++ b/control 2009-12-12 18:31:37 +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,
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 sparc], libglu1-mesa-dev [i386 powerpc s390
amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev
, libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
6.0.7~) , openjdk-6-jdk [i386 powerpc s390 armel amd64 ppc64 s390x sparc] ,
gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x sparc], libgcj-common (>=
1:4.4.1) [i386 mips mipsel s390 armel amd64 ia64 s390x sparc] , ant (>= 1.7.0)
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x sparc] , gcc-mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc] , libcommons-codec-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-lang-java [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x sparc] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x sparc], libsac-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libflute-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc], libformula-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x sparc], librepository-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc], libserializer-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x sparc] , libcommons-logging-java [i386
powerpc mips mips
el s390 armel amd64 ia64 ppc64 s390x sparc] , xulrunner-dev [i386 powerpc mips
mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc], libnss3-dev [i386 powerpc
mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) ,
mono-devel (>= 2.0.1) [i386 amd64 ia64 sparc], libmono-dev (>= 2.0.1) [i386
amd64 ia64 sparc], mono-utils (>= 2.0.1) [i386 amd64 ia64 sparc],
cli-common-dev (>= 0.5.7) [i386 amd64 ia64 sparc] , 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.1.0~r791) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x sparc]
, libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc
mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libhsqldb-java (>>
1.8.0.10)
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , bsh (>=
2.0b4) [i386 powerpc mips mipsel s390 armel amd64 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 ,
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 sparc], libglu1-mesa-dev [i386 powerpc s390
amd64 ia64 ppc64 s390x sparc] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev
, libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>=
6.0.7~) , openjdk-6-jdk [i386 powerpc s390 armel amd64 ppc64 s390x sparc] ,
gcj-jdk [i386 mips mipsel s390 armel amd64 ia64 s390x sparc], libgcj-common (>=
1:4.4.1) [i386 mips mipsel s390 armel amd64 ia64 s390x sparc] , ant (>= 1.7.0)
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
ant-optional (>= 1.7.0) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x sparc] , gcc-mingw32 [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc] , libcommons-codec-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x sparc], libcommons-httpclient-java [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libcommons-lang-java [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
libcommons-logging-java [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64
s390x sparc] , libbase-java-openoffice.org [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x sparc], libsac-java [i386 powerpc mips mipsel s390 armel
amd64 ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386 powerpc mips
mipsel s390 armel amd64 ia64 ppc64 s390x sparc], libflute-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
libloader-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc], libformula-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x sparc], librepository-java-openoffice.org
[i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc],
libfonts-java-openoffice.org [i386 powerpc mips mipsel s390 armel amd64 ia64
ppc64 s390x sparc], libserializer-java-openoffice.org [i386 powerpc mips mipsel
s390 armel amd64 ia64 ppc64 s390x sparc] , libcommons-logging-java [i386
powerpc mips mips
el s390 armel amd64 ia64 ppc64 s390x sparc] , xulrunner-dev [i386 powerpc mips
mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc], libnss3-dev [i386 powerpc
mips mipsel s390 arm armel amd64 ia64 ppc64 s390x sparc] , dmake (>= 1:4.11) ,
mono-devel (>= 2.0.1) [i386 amd64 ia64 sparc], libmono-dev (>= 2.0.1) [i386
amd64 ia64 sparc], mono-utils (>= 2.0.1) [i386 amd64 ia64 sparc],
cli-common-dev (>= 0.5.7) [i386 amd64 ia64 sparc] , 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
(>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev
(>= 1.1.0~r791) [powerpc mips mipsel armel s390 m68k amd64 ia64 ppc64 s390x
sparc] , libebook1.2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386
powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x sparc] , libhsqldb-java
(>> 1.8.0.10) [i386 powerpc mips mipsel s390 armel amd64 ia64 ppc64 s390x
sparc] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 armel amd64 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 ,
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-12-12 18:29:00 +0000
+++ b/rules 2009-12-12 18:31:37 +0000
@@ -169,6 +169,7 @@
endif
ifeq "$(KDE_VER)" "4"
QT_MINVER= (>= 4.5)
+ KDELIBS_MINVER= (>= 4:4.3.4)
endif
BUILD_DBG_PACKAGE=y
USE_SYSTEM_BSH=y
@@ -3211,6 +3212,7 @@
dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))"
dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))"
dh_installdeb -s
+ cp debian/shlibs.local.in debian/shlibs.local
ifeq "$(USE_SYSTEM_ICU)" "n"
cat debian/shlibs.override.icu >> debian/shlibs.local
endif
