The following commit has been merged in the debian-experimental-4.1 branch:
commit 7c2c3ebf9f776dcf192683477a5e298dac9e253f
Author: Rene Engelhard <r...@debian.org>
Date: Mon Mar 4 23:01:58 2013 +0100
make pyuno-copy-for-python2.diff apply again
diff --git a/patches/pyuno-copy-for-python2.diff
b/patches/pyuno-copy-for-python2.diff
index 63085df..004e406 100644
--- a/patches/pyuno-copy-for-python2.diff
+++ b/patches/pyuno-copy-for-python2.diff
@@ -52,6 +52,7 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+))
+
+$(eval $(call gb_Library_use_externals,py2uno,\
++ boost_headers \
+ python \
+))
+
@@ -67,7 +68,7 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+ py2uno/source/module/pyuno_gc \
+))
+
-+# vim:set shiftwidth=4 softtabstop=4 expandtab:
++# vim:set noet sw=4 ts=4:
--- /dev/null 2012-11-27 20:03:56.000000000 +0100
+++ py2uno/Library_py2uno_wrapper.mk 2012-11-27 17:57:31.000000000 +0100
@@ -0,0 +1,59 @@
@@ -101,7 +102,7 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+
+$(eval $(call gb_Library_use_packages,py2uno_wrapper,\
+ sal_generated \
-+ sal_inc \
++ sal_odk_headers \
+))
+
+$(eval $(call gb_Library_set_include,py2uno_wrapper,\
@@ -129,7 +130,7 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+ py2uno/source/module/pyuno_dlopenwrapper \
+))
+
-+# vim:set shiftwidth=4 softtabstop=4 expandtab:
++# vim:set noet sw=4 ts=4:
diff -urN pyuno/Library_python2loader.mk py2uno/Library_python2loader.mk
--- pyuno/Library_python2loader.mk 1970-01-01 01:00:00.000000000 +0100
+++ py2uno/Library_python2loader.mk 2012-09-17 21:36:02.252585588 +0200
@@ -189,7 +190,7 @@ diff -urN pyuno/Library_python2loader.mk
py2uno/Library_python2loader.mk
+ py2uno/source/loader/pyuno_loader \
+))
+
-+# vim:set shiftwidth=4 softtabstop=4 expandtab:
++# vim:set noet sw=4 ts=4:
diff -urN pyuno/Library_pythonloader.mk py2uno/Library_pythonloader.mk
--- pyuno/Library_pythonloader.mk 2012-06-18 20:36:22.723886656 +0200
+++ py2uno/Library_pythonloader.mk 1970-01-01 01:00:00.000000000 +0100
@@ -249,11 +250,11 @@ diff -urN pyuno/Library_pythonloader.mk
py2uno/Library_pythonloader.mk
- pyuno/source/loader/pyuno_loader \
-))
-
--# vim:set shiftwidth=4 softtabstop=4 expandtab:
+-# vim:set noet sw=4 ts=4:
diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
--- pyuno/Library_pyuno.mk 2012-06-18 20:36:23.391889962 +0200
+++ py2uno/Library_pyuno.mk 1970-01-01 01:00:00.000000000 +0100
-@@ -1,66 +0,0 @@
+@@ -1,67 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
@@ -304,6 +305,7 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
-))
-
-$(eval $(call gb_Library_use_externals,pyuno,\
+- boost_headers \
- python \
-))
-
@@ -319,7 +321,7 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
- pyuno/source/module/pyuno_gc \
-))
-
--# vim:set shiftwidth=4 softtabstop=4 expandtab:
+-# vim:set noet sw=4 ts=4:
--- pyuno/Library_pyuno_wrapper.mk 2012-11-27 17:57:31.000000000 +0100
+++ /dev/null 2012-11-27 20:03:56.000000000 +0100
@@ -1,59 +0,0 @@
@@ -353,7 +355,7 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
-
-$(eval $(call gb_Library_use_packages,pyuno_wrapper,\
- sal_generated \
-- sal_inc \
+- sal_odk_headers \
-))
-
-$(eval $(call gb_Library_set_include,pyuno_wrapper,\
@@ -381,11 +383,11 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
- pyuno/source/module/pyuno_dlopenwrapper \
-))
-
--# vim:set shiftwidth=4 softtabstop=4 expandtab:
+-# vim:set noet sw=4 ts=4:
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,98 @@
+@@ -0,0 +1,96 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
@@ -436,10 +438,8 @@ diff -urN pyuno/Module_py2uno.mk py2uno/Module_py2uno.mk
+# with SYSTEM_PYTHON=YES and SYSTEM_PYTHON=NO
+
+# zipcore: pyuno/python.exe on Windows
-+# zipcore: pyversion.hxx on Windows
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,pyuno,\
-+ CustomTarget_pyversion \
+ Executable_python_wrapper \
+))
+endif
@@ -483,11 +483,11 @@ diff -urN pyuno/Module_py2uno.mk py2uno/Module_py2uno.mk
+
+endif # DISABLE_PYTHON
+
-+# vim:set shiftwidth=4 softtabstop=4 expandtab:
++# 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,98 +0,0 @@
+@@ -1,96 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
@@ -538,10 +538,8 @@ diff -urN pyuno/Module_pyuno.mk py2uno/Module_pyuno.mk
-# with SYSTEM_PYTHON=YES and SYSTEM_PYTHON=NO
-
-# zipcore: pyuno/python.exe on Windows
--# zipcore: pyversion.hxx on Windows
-ifeq ($(OS),WNT)
-$(eval $(call gb_Module_add_targets,pyuno,\
-- CustomTarget_pyversion \
- Executable_python_wrapper \
-))
-endif
@@ -585,4 +583,4 @@ diff -urN pyuno/Module_pyuno.mk py2uno/Module_pyuno.mk
-
-endif # DISABLE_PYTHON
-
--# vim:set shiftwidth=4 softtabstop=4 expandtab:
+-# vim:set noet sw=4 ts=4:
--
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/e1ucdb4-00081h...@vasks.debian.org
