------------------------------------------------------------
revno: 1425
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Thu 2009-03-05 21:40:17 +0100
message:
fix getting the -report-builder version;lenny-backport fixes (internal icu,
internal jfreereport)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-03-05 18:35:23 +0000
+++ b/changelog 2009-03-05 20:40:17 +0000
@@ -17,8 +17,7 @@
* debian/rules, debian/openoffice.org-qa-tools.{preinst,postrm}.in,
openoffice.org-qa-tools.lintian-overrides: s/3.0/3.1/
* debian/rules:
- - bump minimal ICU version for sid to >= 4.0.0 to make sure
- we have OOos patches included
+ - bump minimal ICU version for sid to >= 4.0.0
- various 3.1-related updates
- remove option for internal writer2latex as it's now a (bundled) extension
upstream too and we have it packaged already.
=== modified file 'rules'
--- a/rules 2009-03-04 21:05:12 +0000
+++ b/rules 2009-03-05 20:40:17 +0000
@@ -272,12 +272,13 @@
# Debian Lenny
ifeq "$(LENNY_BACKPORT)" "y"
USE_SYSTEM_LUCENE=n
- ICU_MINVER=
+ USE_SYSTEM_ICU=n
MONO_MINVER= (>= 1.2.3)
MONO2=n
BOOST_VERSION=1.34
LPSOLVE_MIN_VERSION= (>= 5.5.0.10-10)
SUITESPARSE_MIN_VERSION= (>= 3.1.0)
+ USE_SYSTEM_JFREEREPORT=n
endif
#############
@@ -3262,7 +3263,7 @@
-V'base-version=$(BASE_VERSION)' \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
- -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep
"<version" $(SOURCE_TREE)/reportbuilder/util/description.xml | perl -pi -e
's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut
-d: -f2`
+ -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep
"<version" $(SOURCE_TREE)/reportbuilder/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version
value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
dh_md5sums -i
dh_builddeb -i $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
