------------------------------------------------------------
revno: 1617
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Fri 2009-07-17 21:59:51 +0200
message:
don't hardcode libebook dependency
added:
scripts/get_libebook_dep.sh
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-07-13 13:37:50 +0000
+++ b/changelog 2009-07-17 19:59:51 +0000
@@ -2,8 +2,11 @@
* debian/rules, debian/control.kde.in, debian/openoffice.org-kab*:
also add/revoke libkab1.so to fix similar bug as with -evolution in -2
+ * debian/control.in, debian/rules, debian/scripts/get_libebook_dep.sh:
+ don't hardcode libebook1.2-9 as depends. Get libebook verson on the fly.
+ Add Build-Dependency on libebook1.2-dev.
- -- Rene Engelhard <[email protected]> Wed, 01 Jul 2009 22:59:39 +0200
+ -- Rene Engelhard <[email protected]> Tue, 14 Jul 2009 23:57:55 +0200
openoffice.org (1:3.1.1~ooo310m15-1) experimental; urgency=high
=== modified file 'control'
--- a/control 2009-06-23 06:49:14 +0000
+++ b/control 2009-07-17 19:59:51 +0000
@@ -3,8 +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], 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, bc , g++ (>> 4.3.0) [s390],
gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc
sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64
ia64 ppc64] , 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 , gcj-jdk [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-common
(>= 1:4.4.0) [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0)
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>=
1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] ,
libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64
ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390
armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64] , libbase-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-java-openof
fice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips
mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386
powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64
ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libserializer-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , libcommons-logging-java [i386 powerpc sparc mips mipsel
s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips
mipsel s390 arm armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips
mipsel s390 arm armel amd64
ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64
ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1)
[i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc 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 , libqt4-dev (>= 4.5) , libxrandr-dev , liblucene2-java (>= 2.3.2)
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java
(>> 1.8.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] ,
bsh (>= 2.0b4) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] ,
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-dev , librdf0-dev , libgtk2.0-dev
(>= 2.10) , libgnomevfs2-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], base-files (= 5)
+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, bc , g++ (>> 4.3.0) [s390],
gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc
sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64
ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev ,
libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) ,
openjdk-6
-jdk , gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev
(>= 1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [i386
sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc
mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java
[i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64],
libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64
ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel
amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel
s390 arm armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel
s390 arm armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-mcs (>= 1.2.3) [i
386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64],
libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386
sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64],
mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc 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 , libxslt1-dev , libcairo2-dev , kdelibs4-dev ,
libebook1.2-dev , libxrandr-dev , libhsqldb-java (>> 1.8.0.9) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4) [i386 powerpc
sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>=
5.5.0.10-10), lp-solve (>= 5.5.0.10-10) , libsuitesparse-dev (>= 3.1.0) ,
libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev ,
libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-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]
Standards-Version: 3.8.1
XS-Python-Version: current
Vcs-Bzr:
nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/unstable
@@ -372,7 +372,7 @@
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Section: gnome
Pre-Depends: openoffice.org-core (>= 1:3.1.0-2)
-Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base,
${shlibs:Depends}, libebook1.2-9, ${misc:Depends}
+Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base,
${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
Recommends: evolution
Conflicts: openoffice.org2-evolution (<< ${binary:Version})
Provides: openoffice.org2-evolution
@@ -3486,6 +3486,7 @@
Package: openoffice.org-kab
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Pre-Depends: openoffice.org-core (>= 1:3.1.0-2)
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Recommends: kaddressbook
Replaces: openoffice.org-kde (<= 1:3.0.0~beta2-1)
=== modified file 'control.in'
--- a/control.in 2009-06-23 06:49:14 +0000
+++ b/control.in 2009-07-17 19:59:51 +0000
@@ -644,7 +644,7 @@
Depends: openoffice.orgVER-core (= ${binary:Version}),
openoffice.orgVER-base,
${shlibs:Depends},
- libebook1.2-9,
+ ${libebook-dep},
${misc:Depends}
Recommends: evolution
Conflicts: openoffice.org2-evolution (<< ${binary:Version})
=== modified file 'rules'
--- a/rules 2009-07-13 13:37:50 +0000
+++ b/rules 2009-07-17 19:59:51 +0000
@@ -907,6 +907,8 @@
ifeq "$(ENABLE_EVO2)" "n"
CONFIGURE_FLAGS += --disable-evolution2
DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-evolution
+else
+ BUILD_DEPS += , libebook1.2-dev
endif
ifeq "$(ENABLE_RANDR)" "y"
@@ -3137,6 +3139,7 @@
-V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \
-V'lpsolve-dep=$(LPSOLVE_DEP)' \
-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
+ -V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
ifeq "$(ENABLE_JAVA)" "y"
=== added file 'scripts/get_libebook_dep.sh'
--- a/scripts/get_libebook_dep.sh 1970-01-01 00:00:00 +0000
+++ b/scripts/get_libebook_dep.sh 2009-07-17 19:59:51 +0000
@@ -0,0 +1,24 @@
+#!/bin/sh -x
+
+libs=`grep libebook.*\.so build/connectivity/source/drivers/evoab2/EApi.cxx |
perl -pe 's/\s+\"(.*)\".*/$1/'`
+
+for l in $libs; do
+ if [ -e "/usr/lib/$l" ]; then
+ # sanity check: do the libs match with what we would get
+ # for our libebook version if we followed the .so symlink?
+ l1=`readlink /usr/lib/$l`
+ l2_tmp=`echo $l | perl -pe 's/(.*)\.\d+$/$1/'`
+ l2=`readlink /usr/lib/$l2_tmp`
+ if [ "$l1" = "$l2" ]; then
+ dep=`dpkg -S /usr/lib/$l | cut -d: -f1`
+ fi
+ fi
+done
+
+if [ -n "$dep" ]; then
+ echo $dep
+else
+ echo "Cannot find libebook dependency. None of the following libs
found:" echo $libs
+ exit 1
+fi
+
