./packages/openofficeorg/2.4.1/experimental r1115: update ooo-build; fix dependencies/conflicts
------------------------------------------------------------
revno: 1115
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-05-28 10:40:10 +0200
message:
update ooo-build; fix dependencies/conflicts
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-05-27 08:18:35 +0000
+++ b/changelog 2008-05-28 08:40:10 +0000
@@ -5,7 +5,7 @@
building
* ooo-build:
- use ooo-build-2-4-1 branch
- - update (r12674 - ooo-build 2.4.1.1)
+ - update (r12682)
+ allows to change broken java configuration
This closes: #451928, #452925
Most probably also closes: #454996
@@ -25,7 +25,7 @@
- libsapdbc-java was removed, stop suggesting it and adding it to OOos
CLASSPATH
- -- Rene Engelhard <rene@debian.org> Mon, 26 May 2008 23:36:56 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 27 May 2008 22:44:43 +0200
openoffice.org (1:2.4.1~ooh680m14-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-05-27 08:18:35 +0000
+++ b/rules 2008-05-28 08:40:10 +0000
@@ -21,8 +21,8 @@
PKGSOURCE := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2;exit 0}')
SOURCE_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
-UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d":" -f2 | cut -d- -f1)
-BASE_VERSION:=$(UPSTREAM_VERSION)
+UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d: -f2 | cut -d- -f1)
+BASE_VERSION:=$(shell echo $(SOURCE_VERSION) | cut -d: -f1):$(UPSTREAM_VERSION)
#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
HELP_L10N_VIRTUAL_VERSION:=2.4
@@ -417,7 +417,7 @@
BUILD_DEPS += , python-central (>= 0.5)
endif
BUILD_DEPS += , python-dev (>= 2.4)
- WRITER_PYUNO_DEP = python-uno (>= $(UPSTREAM_VERSION))
+ WRITER_PYUNO_DEP = python-uno (>= $(BASE_VERSION))
DBG_DBG_SUGGESTS+= , python-dbg
else
BUILD_DEPS += , python
Reply to: