[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_beta2-2-343-g6f91b7c
The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit 6f91b7c747f33d24a63eb63351e5d47351ca7135
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sat Jun 22 13:52:14 2013 +0200
remove double echo
diff --git a/changelog b/changelog
index f39f5fa..6eb071f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.1.0~rc1-buildfix1-0ubuntu1~ppa2) saucy; urgency=low
+
+ * remove double echo
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Sat, 22 Jun 2013 13:27:08 +0200
+
libreoffice (1:4.1.0~rc1-buildfix1-0ubuntu1~ppa1) saucy; urgency=low
* new upstream release candidate
diff --git a/rules b/rules
index 383a73c..0ed7dd7 100755
--- a/rules
+++ b/rules
@@ -2378,7 +2378,7 @@ ifeq "$(ENABLE_PYTHON)" "y"
# as otherwise the python-based unittests fail miserably.
echo "import sys, os" > $(PYTHON_SITE)/uno.py
echo "sys.path.append('$(OODIR)/program')" >> $(PYTHON_SITE)/uno.py
- echo echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:$(OODIR)/program/fundamentalrc')" >> $(PYTHON_SITE)/uno.py
+ echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:$(OODIR)/program/fundamentalrc')" >> $(PYTHON_SITE)/uno.py
cat debian/python3-uno/$(OODIR)/program/uno.py >> $(PYTHON_SITE)/uno.py
rm -f debian/python3-uno/$(OODIR)/program/uno.py
mv debian/python3-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
--
LibreOffice packaging repository
Reply to: