./packages/openofficeorg/3.1/experimental r1411: merge
------------------------------------------------------------
revno: 1411
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2009-02-21 23:11:21 +0100
message:
merge
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1332.1.69
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2009-02-16 07:28:17 +0100
message:
only build-dep on mono 2.0.1 when MONO2=y
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.70
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2009-02-17 01:07:35 +0100
message:
build against libdb-dev...
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1332.1.71
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2009-02-18 22:12:55 +0100
message:
downgrading/fixing build-deps, -2
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1332.1.72
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-02-19 22:30:51 +0100
message:
build with boost 1.37
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1332.1.73
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-02-19 22:34:40 +0100
message:
typo; add libdbX.Y-dbg to DBG_DBG_SUGGESTS
modified:
rules
------------------------------------------------------------
revno: 1332.1.74
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-02-19 22:41:40 +0100
message:
version the boost 1.37 build-dep for safety
modified:
control
rules
------------------------------------------------------------
revno: 1332.1.75
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-02-19 23:12:01 +0100
message:
oops, missing comma
modified:
rules
------------------------------------------------------------
revno: 1332.1.76
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-02-19 23:17:59 +0100
message:
update ooo-build; add missing changelog entry
modified:
changelog
------------------------------------------------------------
revno: 1332.1.77
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2009-02-20 18:43:28 +0100
message:
fix @ICONVERSION@
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.1.78
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2009-02-21 14:59:11 +0100
message:
make -common also conflict against openoffice.orgVER-core (<< ${Source-Version})
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2009-02-18 21:22:01 +0000
+++ b/changelog 2009-02-21 22:11:21 +0000
@@ -43,7 +43,21 @@
-- Rene Engelhard <rene@debian.org> Wed, 18 Feb 2009 22:21:07 +0100
-openoffice.org (1:3.0.1-1.2pre) unstable; urgency=low
+openoffice.org (1:3.0.1-2.3pre) unstable; urgency=low
+
+ * ooo-build:
+ - update (r15395)
+ * debian/rules:
+ - build with boost 1.37
+ - add libdbX.Y-dbg to DBG_DBG_SUGGESTS
+ - @ICONVERSION@ is 3 and not 30 (closes: #516257)
+ * debian/control.in:
+ - add Conflicts: openoffice.org-core (<< ${Source-Version}) for
+ openoffice.org-common (closes: #516090)
+
+ -- Rene Engelhard <rene@debian.org> Sat, 21 Feb 2009 14:09:31 +0100
+
+openoffice.org (1:3.0.1-2) unstable; urgency=low
[ Rene Engelhard ]
* upload to unstable
@@ -56,6 +70,12 @@
- add Recommends openoffice.org-math to openoffice.org-writer
- specify ARCH_FLAGS as -O0 when DEB_BULD_OPTIONS contains noopt
(closes: #514166)
+ - only build-dep on mono 2.0.1 when MONO2=y
+ - MONO2=n and revert lp-solve build-dep on the one built against
+ suitesparse 3.2.0/suitesparse builddep so that we build in sid right
+ now.
+ - build against default db (4.7) now (as librd0-dev depends on libdb-dev
+ which depends on libdb-dev...)
* debian/openoffice.org-{base,calc}.overrides.lintian: override
desktop-command-not-in-package here, too (like in all the other modules)
@@ -63,7 +83,7 @@
* ooo-build/patches/dev300/sfx2-recent-files.diff:
Update recent files list after save as and open (closes: #505879)
- -- Rene Engelhard <rene@debian.org> Thu, 12 Feb 2009 23:34:10 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 17 Feb 2009 00:57:26 +0100
openoffice.org (1:3.0.1-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2009-02-18 21:22:01 +0000
+++ b/control 2009-02-21 22:11:21 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), 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-1) [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) , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev , libdb4.6-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64] , 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] , libsaxonb-java [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 armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 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] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , 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 , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.13-3), lp-solve (>= 5.5.0.13-3) , libsuitesparse-dev (>> 1:3.2.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1), 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-1) [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) , libpoppler-dev (>= 0.8.0) , libcurl4-openssl-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64] , 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] , libsaxonb-java [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 armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , dmake (>= 1:4.11) , mono-mcs (>= 1.2.3) [i386 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] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost1.37-dev (>= 1.37.0-4) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4-1) [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), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.8.0
XS-Python-Version: current
@@ -102,7 +102,7 @@
Package: openoffice.org-core
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol, ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
-Conflicts: openoffice.org-thesaurus, openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome, openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0), openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0), openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0), openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0), openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0), openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0), openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0, openoffice.org-help-2.0.1, openoffice.org-help-2.0.2, openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core, openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<< ${Source-Version}), openoffice.org-impress (<< ${Source-Version}), openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<< ${Source-Version}), openoffice.org-gtk (<< ${Source-Version}), openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<< ${Source-Version}), openoffice.org-evolution (<< ${Source-Version}), openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean (<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>= ${base-version}.1), cacao-oj6-jre
+Conflicts: openoffice.org-thesaurus, openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome, openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0), openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0), openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0), openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0), openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0), openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0), openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0, openoffice.org-help-2.0.1, openoffice.org-help-2.0.2, openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core, openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-core (<< ${Source-Version}), openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<< ${Source-Version}), openoffice.org-impress (<< ${Source-Version}), openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<< ${Source-Version}), openoffice.org-gtk (<< ${Source-Version}), openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<< ${Source-Version}), openoffice.org-evolution (<< ${Source-Version}), openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean (<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>= ${base-version}.1), cacao-oj6-jre
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell
Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<< 2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<< 1:3.0.1~rc1-2), openoffice.org-calc (<< 2.2.1~oof680m15-2), openoffice.org-headless (<< 1:3.0.0~dev300m26)
Description: OpenOffice.org office suite architecture dependent files
=== modified file 'control.in'
--- a/control.in 2009-02-18 21:22:01 +0000
+++ b/control.in 2009-02-21 22:11:21 +0000
@@ -214,6 +214,7 @@
openoffice.org-crashrep,
openoffice.org2-hunspell,
openoffice.org-hunspell,
+ openoffice.orgVER-core (<< ${Source-Version}),
openoffice.orgVER-calc (<< ${Source-Version}),
openoffice.orgVER-writer (<< ${Source-Version}),
openoffice.orgVER-impress (<< ${Source-Version}),
=== modified file 'rules'
--- a/rules 2009-02-18 21:22:01 +0000
+++ b/rules 2009-02-21 22:11:21 +0000
@@ -115,8 +115,12 @@
JDK=java-gcj-compat
endif
ENABLE_MONO=y
-MONO_MINVER= (>= 2.0.1)
-MONO2=y
+MONO2=n
+ifeq "$(MONO2)" "y"
+ MONO_MINVER= (>= 2.0.1)
+else
+ MONO_MINVER= (>= 1.2.3)
+endif
USE_SYSTEM_HUNSPELL=y
HUNSPELL_MIN_VER= (>= 1.1.5-2)
SYSTEM_ALTLINUXHYPH=y
@@ -128,6 +132,10 @@
USE_STLPORT=n
USE_SYSTEM_STLPORT=y
USE_SYSTEM_BOOST=y
+BOOST_VERSION=1.37
+ifeq "$(BOOST_VERSION)" "1.37"
+ BOOST_MINVER= (>= 1.37.0-4)
+endif
USE_SYSTEM_VIGRA=y
USE_EXTERNAL_CXXLIBS=y
LIBWPD8_MINVER= (>= 0.8.3-3)
@@ -154,10 +162,11 @@
KDELIBS_MINVER= (>= 4:3.4.3-2)
USE_SYSTEM_LPSOLVE=y
USE_SHARED_LPSOLVE=y
-LPSOLVE_MIN_VERSION= (>= 5.5.0.13-3)
+LPSOLVE_MIN_VERSION= (>= 5.5.0.10-10)
USE_DBUS=y
USE_GSTREAMER=y
USE_SYSTEM_NEON=y
+NEONSONR=27
# will break with odfmetadata2 inclusion if librdf doesn't include some
# of OOos patches (as to 1.0.7), see issue 90956. Enabling this now here
# because otherwise we would build redland/raptor/rasqual uselessly
@@ -172,8 +181,6 @@
USE_LIBSUITESPARSE=y
USE_BZIP_COMPRESS=n
PRUNE_OOOBUILD=y
-DBVER=4.6
-NEONSONR=27
PARALLEL_BUILD=n
MOZILLA=iceape
ENABLE_OPENGL=n
@@ -261,6 +268,7 @@
ICU_MINVER=
MONO_MINVER= (>= 1.2.3)
MONO2=n
+ BOOST_VERSION=1.34
endif
#############
@@ -438,7 +446,8 @@
DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/libssl.so | cut -d"." -f3,4,5)-dbg
endif
- BUILD_DEPS += , libdb$(DBVER)-dev
+ BUILD_DEPS += , libdb-dev
+ DBG_DBG_SUGGESTS += , $(shell apt-cache show libdb-dev | grep Depends | awk '{ print $$2 }' | sed -e s/dev/dbg/)
ifneq "$(BUILD_DBG_PACKAGE)" "y"
# build with small symbols anyway
@@ -732,10 +741,14 @@
endif
ifeq "$(USE_SYSTEM_BOOST)" "y"
- ifeq "$(shell gcc --version | head -n 1 | cut -d' ' -f4 | cut -d. -f1,2)" "4.4"
+ ifeq "$(BOOST_VERSION)" "1.34"
+ ifeq "$(shell gcc --version | head -n 1 | cut -d' ' -f4 | cut -d. -f1,2)" "4.4"
BUILD_DEPS += , libboost-dev (>= 1.34.1-15)
- else
+ else
BUILD_DEPS += , libboost-dev
+ endif
+ else
+ BUILD_DEPS += , libboost$(BOOST_VERSION)-dev $(BOOST_MINVER)
endif
CONFIGURE_FLAGS += --with-system-boost
endif
@@ -884,7 +897,7 @@
CONFIGURE_FLAGS += --with-system-lpsolve
ifeq "$(USE_LIBSUITESPARSE)" "y"
DBG_DBG_SUGGESTS+= , libsuitesparse-dbg
- BUILD_DEPS += , libsuitesparse-dev (>> 1:3.2.0)
+ BUILD_DEPS += , libsuitesparse-dev (>> 3.1.0)
else
DBG_DBG_SUGGESTS+= , libufsparse-dbg
BUILD_DEPS += , libufsparse-dev
@@ -2157,7 +2170,7 @@
done
endif
# add version to .menu and .lintian-overrides
- ICONVERSION=`grep PRODUCTVERSION $(SOURCE_TREE)/sysui/desktop/productversion.mk | head -n 1 | cut -d"=" -f2 | sed -e s/\ //g | sed -e s/\\\.//`; \
+ ICONVERSION=`grep PRODUCTVERSION $(SOURCE_TREE)/sysui/desktop/productversion.mk | head -n 1 | cut -d"=" -f2 | cut -d"." -f1 | sed -e s/\ //g`; \
for i in base calc draw impress math writer; do \
cat debian/openoffice.org$(VER)-$$i.menu.in \
| sed -e s/@ICONVERSION@/$$ICONVERSION/ \
Reply to: