------------------------------------------------------------
revno: 772
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2007-07-01 22:11:21 +0200
message:
-4
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2007-06-29 11:03:21 +0000
+++ b/changelog 2007-07-01 20:11:21 +0000
@@ -1,3 +1,9 @@
+openoffice.org (2.2.1-4) unstable; urgency=low
+
+ * debian/rules: fix lp-solve builddeps, oops
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 29 Jun 2007 17:47:56 +0200
+
openoffice.org (2.2.1-3) unstable; urgency=low
* debian/shell-lib.sh: do not parse /var/lib/dpkg/status diretcly, use
=== modified file 'control'
--- a/control 2007-06-28 23:20:02 +0000
+++ b/control 2007-07-01 20:11:21 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64], flex [i386 powerpc sparc amd64], libpam0g-dev [i386 powerpc sparc
amd64], libxaw7-dev [i386 powerpc sparc amd64], unzip [i386 powerpc sparc
amd64], zip [i386 powerpc sparc amd64], autoconf [i386 powerpc sparc amd64],
sharutils [i386 powerpc sparc amd64], pkg-config [i386 powerpc sparc amd64],
xutils [i386 powerpc sparc amd64], libfontconfig1-dev [i386 powerpc sparc
amd64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc],
zlib1g-dev [i386 powerpc sparc amd64], libfreetype6-dev [i386 powerpc sparc
amd64], libx11-dev [i386 powerpc sparc amd64], libsm-dev [i386 powerpc sparc
amd64], libxt-dev [i386 powerpc sparc amd64], libxext-dev [i386 powerpc sparc
amd64], libice-dev [i386 powerpc sparc amd64], libsane-dev [i386 powerpc sparc
amd64], libxrender-dev [i386 powerpc sparc amd64], libcupsys2-dev [i386 powerpc
sparc amd64], libarchive-zip-perl [i386 powerpc sparc amd64],
libstartup-notification0-dev [i386 powerpc sparc amd64], libpng12-dev [i386
powerpc sparc amd64], libjpeg62-dev [i386 powerpc sparc amd64], libxml2-dev
[i386 powerpc sparc amd64], dmake (>= 1:4.6) [i386 powerpc sparc amd64],
libldap2-dev [i386 powerpc sparc amd64], libexpat1-dev [i386 powerpc sparc
amd64], libgnomevfs2-dev [i386 powerpc sparc amd64], fastjar [i386 powerpc
sparc amd64], libsndfile1-dev [i386 powerpc sparc amd64], xsltproc [i386
powerpc sparc amd64], imagemagick [i386 powerpc sparc amd64], fdupes [i386
powerpc sparc amd64], xml-core [i386 powerpc sparc amd64], libxkbfile-dev [i386
powerpc sparc amd64], libxinerama-dev [i386 powerpc sparc amd64],
x11proto-render-dev [i386 powerpc sparc amd64], unixodbc-dev (>= 2.2.11) [i386
powerpc sparc amd64], libdb4.4-dev [i386 powerpc sparc amd64] ,
libcurl3-gnutls-dev [i386 powerpc sparc amd64] , python-central (>= 0.5) [i386
powerpc sparc amd64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386
powerpc sparc amd64] , dpkg-dev (>= 1.13.19) , xvfb [i386 powerpc sparc amd64],
xbase-clients [i386 powerpc sparc amd64], xfonts-base [i386 powerpc sparc
amd64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64] , ant (>=
1.6.5) [i386 powerpc sparc amd64] , libxt-java (>= 0.20050823) [i386 powerpc
sparc amd64] , libxerces2-java [i386 powerpc sparc amd64] , libxalan2-java (>=
2.6.0-1) [i386 powerpc sparc amd64] , libdb4.4-java [i386 powerpc sparc amd64]
, mingw32 [i386 powerpc sparc amd64] , libxul-dev [i386 powerpc sparc amd64],
libnss3-dev [i386 powerpc sparc amd64] , mono-mcs (>= 1.2.3) [i386 amd64],
mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3) [i386 amd64],
mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4) [i386 amd64] ,
libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64] , libaltlinuxhyph-dev
(>= 0.1.1-11) [i386 powerpc sparc amd64] , libstlport5.1-dev (>= 5.0.99rc2-5)
[i386 powerpc sparc amd64] , portaudio19-dev [i386 powerpc sparc amd64] ,
libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64] , libwps-dev [i386 powerpc
sparc amd64] , libicu36-dev [i386 powerpc sparc amd64] , libxslt1-dev [i386
powerpc sparc amd64] , libcairo2-dev [i386 powerpc sparc amd64],
libglitz-glx1-dev [i386 powerpc sparc amd64] , kdelibs4-dev (>= 4:3.4.3-2)
[i386 powerpc sparc amd64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc
amd64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64] , liblpsolve55-dev (>=
5.5.0.10-2) [i386 powerpc sparc amd64] , libufsparse-dev [i386 powerpc sparc
amd64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64] ,
libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64] , libneon25-dev
[i386 powerpc sparc amd64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64], flex [i386 powerpc sparc amd64], libpam0g-dev [i386 powerpc sparc
amd64], libxaw7-dev [i386 powerpc sparc amd64], unzip [i386 powerpc sparc
amd64], zip [i386 powerpc sparc amd64], autoconf [i386 powerpc sparc amd64],
sharutils [i386 powerpc sparc amd64], pkg-config [i386 powerpc sparc amd64],
xutils [i386 powerpc sparc amd64], libfontconfig1-dev [i386 powerpc sparc
amd64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc],
zlib1g-dev [i386 powerpc sparc amd64], libfreetype6-dev [i386 powerpc sparc
amd64], libx11-dev [i386 powerpc sparc amd64], libsm-dev [i386 powerpc sparc
amd64], libxt-dev [i386 powerpc sparc amd64], libxext-dev [i386 powerpc sparc
amd64], libice-dev [i386 powerpc sparc amd64], libsane-dev [i386 powerpc sparc
amd64], libxrender-dev [i386 powerpc sparc amd64], libcupsys2-dev [i386 powerpc
sparc amd64], libarchive-zip-perl [i386 powerpc sparc amd64],
libstartup-notification0-dev [i386 powerpc sparc amd64], libpng12-dev [i386
powerpc sparc amd64], libjpeg62-dev [i386 powerpc sparc amd64], libxml2-dev
[i386 powerpc sparc amd64], dmake (>= 1:4.6) [i386 powerpc sparc amd64],
libldap2-dev [i386 powerpc sparc amd64], libexpat1-dev [i386 powerpc sparc
amd64], libgnomevfs2-dev [i386 powerpc sparc amd64], fastjar [i386 powerpc
sparc amd64], libsndfile1-dev [i386 powerpc sparc amd64], xsltproc [i386
powerpc sparc amd64], imagemagick [i386 powerpc sparc amd64], fdupes [i386
powerpc sparc amd64], xml-core [i386 powerpc sparc amd64], libxkbfile-dev [i386
powerpc sparc amd64], libxinerama-dev [i386 powerpc sparc amd64],
x11proto-render-dev [i386 powerpc sparc amd64], unixodbc-dev (>= 2.2.11) [i386
powerpc sparc amd64], libdb4.4-dev [i386 powerpc sparc amd64] ,
libcurl3-gnutls-dev [i386 powerpc sparc amd64] , python-central (>= 0.5) [i386
powerpc sparc amd64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386
powerpc sparc amd64] , dpkg-dev (>= 1.13.19) , xvfb [i386 powerpc sparc amd64],
xbase-clients [i386 powerpc sparc amd64], xfonts-base [i386 powerpc sparc
amd64] , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64] , ant (>=
1.6.5) [i386 powerpc sparc amd64] , libxt-java (>= 0.20050823) [i386 powerpc
sparc amd64] , libxerces2-java [i386 powerpc sparc amd64] , libxalan2-java (>=
2.6.0-1) [i386 powerpc sparc amd64] , libdb4.4-java [i386 powerpc sparc amd64]
, mingw32 [i386 powerpc sparc amd64] , libxul-dev [i386 powerpc sparc amd64],
libnss3-dev [i386 powerpc sparc amd64] , mono-mcs (>= 1.2.3) [i386 amd64],
mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3) [i386 amd64],
mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4) [i386 amd64] ,
libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64] , libaltlinuxhyph-dev
(>= 0.1.1-11) [i386 powerpc sparc amd64] , libstlport5.1-dev (>= 5.0.99rc2-5)
[i386 powerpc sparc amd64] , portaudio19-dev [i386 powerpc sparc amd64] ,
libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64] , libwps-dev [i386 powerpc
sparc amd64] , libicu36-dev [i386 powerpc sparc amd64] , libxslt1-dev [i386
powerpc sparc amd64] , libcairo2-dev [i386 powerpc sparc amd64],
libglitz-glx1-dev [i386 powerpc sparc amd64] , kdelibs4-dev (>= 4:3.4.3-2)
[i386 powerpc sparc amd64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc
amd64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64] , liblpsolve55-dev (>=
5.5.0.10-2) [i386 powerpc sparc amd64], lp-solve (>= 5.5.0.10-2) [i386 powerpc
sparc amd64] , libufsparse-dev [i386 powerpc sparc amd64] , libdbus-glib-1-dev
(>= 0.60) [i386 powerpc sparc amd64] , libgstreamer-plugins-base0.10-dev [i386
powerpc sparc amd64] , libneon25-dev [i386 powerpc sparc amd64] , libgtk2.0-dev
(>= 2.10) [i386 powerpc sparc amd64]
Build-Conflicts: libcairo2 (= 1.4.8-1)
Standards-Version: 3.7.2
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2007-06-28 23:20:02 +0000
+++ b/rules 2007-07-01 20:11:21 +0000
@@ -559,7 +559,7 @@
endif
ifeq "$(USE_SYSTEM_LPSOLVE)" "y"
-ifneq "$(USE_SHARED_LPSOLVE)" "y"
+ifeq "$(USE_SHARED_LPSOLVE)" "y"
BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION) [$(OOO_ARCHS)],
lp-solve $(LPSOLVE_MIN_VERSION) [$(OOO_ARCHS)]
LPSOLVE_DEP = lp-solve $(LPSOLVE_MIN_VERSION)
else
