------------------------------------------------------------
revno: 1865
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Fri 2010-02-12 01:54:24 +0100
message:
work around rules setting a kdelibs4-dev (>= 4:4.3.4) build-dep on
lenny-backports
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2010-02-11 17:38:00 +0000
+++ b/changelog 2010-02-12 00:54:24 +0000
@@ -14,6 +14,9 @@
- build-conflict against graphicsmagick-imagemagick-compat (<< 1.3.9ยจ),
suggest imagemagick | graphicsmagick-imagemagick-compat instead of
vice-versa (closes: #569124)
+ * debian/rules:
+ - wrap KDELIBS_MINVER for KDE4 into ifneq "$(LENNY_BACKPORT)" "y" as it
+ for some reason also gets used for lenny-backports which has KDE3..
-- Rene Engelhard <[email protected]> Thu, 11 Feb 2010 18:38:30 +0100
=== modified file 'control'
--- a/control 2010-02-10 15:54:03 +0000
+++ b/control 2010-02-12 00:54:24 +0000
@@ -4,7 +4,7 @@
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 (>=
7.2.3~) , openjdk-6-jdk [i386 powerpc s390 amd64 ppc64 s390x sparc] , gcj-jdk
[i386 mips mipsel s390 amd64 ia64 s390x sparc], libgcj-common (>= 1:4.4.1)
[i386 mips mipsel s390 amd64 ia64 s390x sparc] , ant (>= 1.7.0) [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc], ant-optional (>= 1.7.0) [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , gcc-mingw32 [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], mingw32-runtime [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , libcommons-codec-java
[i386 powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc],
libcommons-httpclient-java [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc], libcommons-lang-java [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc], libcommons-logging-java [i386 powerpc mips mipsel s390
amd64 ia64 ppc64 s390x sparc] , libbase-java-openoffice.org [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc], libsac-java [i386 powerpc mips
mipsel s390 amd64 ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc],
libflute-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc],
liblayout-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc], libloader-java-openoffice.org [i386 powerpc mips mipsel s390
amd64 ia64 ppc64 s390x sparc], libformula-java-openoffice.org [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc],
librepository-java-openoffice.org [i386 powerpc mips mipsel s390 amd64 ia64
ppc64 s390x sparc], libfonts-java-openoffice.org [i386 powerpc mips mipsel s390
amd64 ia64 ppc64 s390x sparc], libserializer-java-openoffice.org [i386 powerpc
mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , libcommons-logging-java [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , xulrunner-dev [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc], libnss3-dev [i386
powerpc mips mipsel s390 amd64 ia64 ppc64 s390x sparc] , 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 , 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] ,
libhsqldb-java (>> 1.8.0.10) [i386 powerpc mips mipsel s390 amd64 ia64 ppc64
s390x sparc] , bsh (>= 2.0b4) [i386 powerpc mips mipsel s390 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), graphicsmagick-imagemagick-compat,
base-files (= 5)
+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
Vcs-Bzr:
nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1.1/unstable
=== modified file 'rules'
--- a/rules 2010-02-04 09:46:09 +0000
+++ b/rules 2010-02-12 00:54:24 +0000
@@ -169,7 +169,11 @@
endif
ifeq "$(KDE_VER)" "4"
QT_MINVER= (>= 4.5)
- KDELIBS_MINVER= (>= 4:4.3.4)
+ # somehow lenny-backport picks this up although
+ # KDE is 3...
+ ifneq "$(LENNY_BACKPORT)" "y"
+ KDELIBS_MINVER= (>= 4:4.3.4)
+ endif
endif
BUILD_DBG_PACKAGE=y
USE_SYSTEM_BSH=y
