The following commit has been merged in the ubuntu-saucy-4.1 branch:
commit f8578720813d0849336e0c869aa8f88b893fc227
Author: Rico Tzschichholz <ric...@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
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1v2ic9-0000zz...@vasks.debian.org
