The following commit has been merged in the debian-experimental-3.7 branch:
commit f1af62c9e6a94eb883a58d94f755e03f871288b6
Author: Rene Engelhard <[email protected]>
Date: Fri Nov 9 23:34:40 2012 +0100
fix librelogo unzip/dh_gencontrol
diff --git a/rules b/rules
index 338a946..6bdc848 100755
--- a/rules
+++ b/rules
@@ -2754,7 +2754,7 @@ endif
ifeq "$(PACKAGE_LIBRELOGO)" "y"
rm -rf $(PKGDIR)-librelogo
mkdir -p $(PKGDIR)-librelogo/$(OODIR)/share/extensions/librelogo && \
- unzip -d solver/$(shell . $(SOURCE_TREE)/config_host.mk.source;
echo $$OUTPATH$$PROEXT)/bin/librelogo.oxt
+ unzip $(CURDIR)/solver/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/librelogo.oxt
endif
touch $@
@@ -3062,7 +3062,7 @@ ifeq "$(ENABLE_REPORTDESIGN)" "y"
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`
+ -v$(shell grep "<version"
$(SOURCE_TREE)/librelogo/source/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`
--
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]
