The following commit has been merged in the debian-experimental-3.6 branch:
commit 6a63a9c9c5a1b1ebd38b21df3fdabeb9ce5ed14c
Author: Rene Engelhard <[email protected]>
Date: Fri Jun 8 15:32:52 2012 +0200
fix -report-builder version gathering
diff --git a/rules b/rules
index 2be112d..eaf2ae1 100755
--- a/rules
+++ b/rules
@@ -3053,7 +3053,7 @@ ifeq "$(ENABLE_REPORTDESIGN)" "y"
-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/$(shell make -s cmd cmd="env | grep
OUTPATH\= | cut -d= -f2" | grep -v custom)$(shell make -s cmd cmd="env | grep
PROEXT\= | cut -d= -f2" | grep -v custom)/misc/description.xml | perl -pi -e
's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut
-d: -f2`
+ -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+//')+LibO`echo $(BINARY_VERSION) | cut
-d: -f2`
endif
dh_gencontrol -popenoffice.org-dtd-officedocument1.0 -- \
-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 |
bc):1.0+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
