[SCM] LibreOffice packaging repository branch, ubuntu-saucy-4.1, updated. libreoffice_4.1.0_rc2-2-294-gfa4f09f
The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit f8578720813d0849336e0c869aa8f88b893fc227
Author: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon Jul 1 16:08:35 2013 +0200
fix mismerge
diff --git a/rules b/rules
index 0ed7dd7..f0b0823 100755
--- a/rules
+++ b/rules
@@ -2411,7 +2411,6 @@ ifeq "$(ENABLE_PYTHON)" "y"
debian/python-uno/$(OODIR)/program/libpython2loaderlo.so
ln -s libpython2loaderlo.so debian/python-uno/$(OODIR)/program/libpythonloaderlo.so
cp debian/python3-uno/$(OODIR)/program/pythonloader.py \
- cp debian/python3-uno/$(OODIR)/program/pythonloader.py \
debian/python-uno/$(OODIR)/program
cp debian/python3-uno/$(OODIR)/share/registry/pyuno.xcd \
debian/python-uno/$(OODIR)/share/registry
--
LibreOffice packaging repository
Reply to: