r804 ./packages/openofficeorg/2.2.1/unstable: build against libneon26-gnutls (merge from 2.3)
------------------------------------------------------------
revno: 804
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Fri 2007-10-19 19:19:13 +0200
message:
build against libneon26-gnutls (merge from 2.3)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-10-19 17:13:18 +0000
+++ b/changelog 2007-10-19 17:19:13 +0000
@@ -1,14 +1,18 @@
-openoffice.org (2.2.1-10) unstable; urgency=medium
+openoffice.org (2.2.1-9.10pre) unstable; urgency=medium
* ooo-build:
- update (r10545)
+ ooo82608.vcl.gtkbadfree.diff: backport fix from i#82608 to fix
bad free on theme resources (closes: #444741)
+ * debian/rules:
+ - build against neon 0.26.x
* merge from 2.3 branch:
- debian/rules:
+ migrate from num-cpus= to parallel= in DEB_BUILD_OPTIONS, the latter
is the quasi standard and will also be used by -j of the new
dpkg-buildpackage
+ + we build against libcurl3-gnutls, so build against libneon26-gnutls for
+ consistency
+ use LC_ALL=C instead of LANG=C for date call, else LC_ALL or LC_TIME
might override it.
+ added mono-jit-dbg and mono-dbg to suggest list for debug packages
=== modified file 'rules'
--- a/rules 2007-10-19 17:10:31 +0000
+++ b/rules 2007-10-19 17:19:13 +0000
@@ -131,6 +131,7 @@
USE_LIBCURL4=y
USE_LIBSUITESPARSE=y
DBVER=4.5
+NEONSOVER=26
# when we have a package we want to have to be installed on older things with some older
# C++ ABI (like it was the case with openoffice.org2), we need to set this. Don't touch
@@ -194,6 +195,7 @@
USE_LIBSUITESPARSE=n
USE_SYSTEM_LIBWPG=n
DBVER=4.4
+ NEONSOVER=25
endif
#############
@@ -610,8 +612,8 @@
endif
ifeq "$(USE_SYSTEM_NEON)" "y"
- BUILD_DEPS += , libneon25-dev [$(OOO_ARCHS)]
- DBG_DBG_SUGGESTS+= , libneon25-dbg
+ BUILD_DEPS += , libneon$(NEONSOVER)-dev [$(OOO_ARCHS)]
+ DBG_DBG_SUGGESTS+= , libneon$(NEONSOVER)-dbg
CONFIGURE_FLAGS += --with-system-neon
endif
Reply to: