[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3_rc1-3-105-g6f917e2
The following commit has been merged in the debian-experimental-4.1 branch:
commit dc13c76f957649187ebebe3dbf742468c62fd12a
Author: Rene Engelhard <rene@debian.org>
Date: Mon May 6 20:31:17 2013 +0200
update pyuno-copy-for-python2.diff
diff --git a/patches/pyuno-copy-for-python2.diff b/patches/pyuno-copy-for-python2.diff
index e57fabf..738b693 100644
--- a/patches/pyuno-copy-for-python2.diff
+++ b/patches/pyuno-copy-for-python2.diff
@@ -275,7 +275,7 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
diff -urN pyuno/Module_py2uno.mk py2uno/Module_py2uno.mk
--- pyuno/Module_py2uno.mk 1970-01-01 01:00:00.000000000 +0100
+++ py2uno/Module_py2uno.mk 2012-09-17 21:37:10.060921827 +0200
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,71 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
@@ -338,13 +338,19 @@ diff -urN pyuno/Module_py2uno.mk py2uno/Module_py2uno.mk
+
+endif # SYSTEM_PYTHON
+
++ifneq ($(gb_RUNNABLE_INSTDIR),)
++$(eval $(call gb_Module_add_targets,py2uno,\
++ Package_python_scripts_install \
++))
++endif
++
+endif # DISABLE_PYTHON
+
+# vim:set noet sw=4 ts=4:
diff -urN pyuno/Module_pyuno.mk py2uno/Module_pyuno.mk
--- pyuno/Module_pyuno.mk 2012-07-20 11:13:03.401545847 +0200
+++ py2uno/Module_pyuno.mk 1970-01-01 01:00:00.000000000 +0100
-@@ -1,65 +0,0 @@
+@@ -1,71 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
@@ -407,6 +413,12 @@ diff -urN pyuno/Module_pyuno.mk py2uno/Module_pyuno.mk
-
-endif # SYSTEM_PYTHON
-
+-ifneq ($(gb_RUNNABLE_INSTDIR),)
+-$(eval $(call gb_Module_add_targets,pyuno,\
+- Package_python_scripts_install \
+-))
+-endif
+-
-endif # DISABLE_PYTHON
-
-# vim:set noet sw=4 ts=4:
--
LibreOffice packaging repository
Reply to: