[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.1_rc1-2-5-g5602ec2
The following commit has been merged in the debian-experimental-4.0 branch:
commit 5602ec2a236be8a9972d6c58312816bed320832b
Author: Rene Engelhard <rene@debian.org>
Date: Wed Mar 6 00:46:25 2013 +0100
use $(OOVER) instead of hardcoded 3.6 for the README...
diff --git a/changelog b/changelog
index 25ffc3a..e724588 100644
--- a/changelog
+++ b/changelog
@@ -28,6 +28,7 @@ libreoffice (1:4.0.1~rc1-1) experimental; urgency=low
- conditionalize pyuno build/install more so that we can build only
python-uno on wheezy-backports. Bit obscure, but...
- explicitly use cpp-4.7 as cpp 4.8 would fail
+ - use $(OOVER) instead of hardcoded 3.6 for the README...
-- Rene Engelhard <rene@debian.org> Tue, 19 Feb 2013 18:46:05 +0100
diff --git a/rules b/rules
index 8417cdd..9562738 100755
--- a/rules
+++ b/rules
@@ -2837,7 +2837,7 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/
mkdir -p debian/$$p/usr/share/doc/$$p; \
cat solver/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/osl/README_en-US \
| sed -e 's/$${PRODUCTNAME}/LibreOffice/g' \
- | sed -e 's/$${PRODUCTVERSION}/3.6/g' \
+ | sed -e 's/$${PRODUCTVERSION}/$(OOVER)/g' \
> debian/$$p/usr/share/doc/$$p/README; \
done
dh_installdebconf -s
@@ -3069,7 +3069,7 @@ endif
mkdir -p debian/$$p/usr/share/doc/$$p; \
cat solver/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/osl/README_en-US \
| sed -e 's/$${PRODUCTNAME}/LibreOffice/g' \
- | sed -s 's/$${PRODUCTVERSION}/3.6/g' \
+ | sed -s 's/$${PRODUCTVERSION}/$(OOVER)/g' \
> debian/$$p/usr/share/doc/$$p/README; \
done
dh_installman -i
--
LibreOffice packaging repository
Reply to: