[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.3_rc2-1-113-g04c4013
The following commit has been merged in the debian-experimental-3.7 branch:
commit 04c4013b46d87dd83f8ce37910beeca43bb51f81
Author: Rene Engelhard <rene@debian.org>
Date: Fri Nov 9 17:02:42 2012 +0100
librelogo is arch-idep...
diff --git a/rules b/rules
index 4282f36..338a946 100755
--- a/rules
+++ b/rules
@@ -2937,10 +2937,6 @@ ifeq "$(PACKAGE_BASE)" "y"
endif
endif
endif
-ifeq "$(PACKAGE_LIBRELOGO)" "y"
- dh_gencontrol -plibreoffice$(VER)-librelogo -- \
- -v$(shell grep "<version" $(SOURCE_TREE)/librelogo/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
-endif
dh_gencontrol -pure -pure-dbg -puno-libs3 -puno-libs3-dbg -- \
-V"ure:Version=`echo $(BINARY_VERSION) | cut -d: -f2`" \
-v"`echo $(BINARY_VERSION) | cut -d: -f2`"
@@ -3064,6 +3060,10 @@ ifeq "$(ENABLE_REPORTDESIGN)" "y"
-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+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
+ifeq "$(PACKAGE_LIBRELOGO)" "y"
+ dh_gencontrol -plibreoffice$(VER)-librelogo -- \
+ -v$(shell grep "<version" $(SOURCE_TREE)/librelogo/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; 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`
dh_md5sums -i
--
LibreOffice packaging repository
Reply to: