The following commit has been merged in the debian-experimental-4.0 branch:
commit 0f344164dc15d70e6d9a15c5d741ca99b956ede7
Author: Rene Engelhard <[email protected]>
Date: Tue Nov 27 13:25:37 2012 +0100
update pyuno-copy-for-python2.diff to apply again
diff --git a/patches/pyuno-copy-for-python2.diff
b/patches/pyuno-copy-for-python2.diff
index fb50560..47a58a8 100644
--- a/patches/pyuno-copy-for-python2.diff
+++ b/patches/pyuno-copy-for-python2.diff
@@ -70,7 +70,7 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
--- /dev/null 2012-09-07 17:14:08.612339087 +0200
+++ pyuno/Library_py2uno_wrapper.mk 2012-10-04 20:06:08.828380766 +0200
-@@ -0,0 +1,70 @@
+@@ -0,0 +1,72 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
@@ -121,7 +121,9 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+))
+else
+$(eval $(call gb_Library_set_include,py2uno_wrapper,\
-+ -I$(OUTDIR)/inc/python \
++ -I$(call gb_UnpackedTarball_get_dir,python3) \
++ -I$(call gb_UnpackedTarball_get_dir,python3)/PC \
++ -I$(call gb_UnpackedTarball_get_dir,python3)/Include \
+ $$(INCLUDE) \
+))
+endif
@@ -333,7 +335,7 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
--- pyuno/Library_pyuno_wrapper.mk 2012-09-30 14:39:02.759093832 +0200
+++ /dev/null 2012-09-07 17:14:08.612339087 +0200
-@@ -1,70 +0,0 @@
+@@ -1,72 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
@@ -384,7 +386,9 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
-))
-else
-$(eval $(call gb_Library_set_include,pyuno_wrapper,\
-- -I$(OUTDIR)/inc/python \
+- -I$(call gb_UnpackedTarball_get_dir,python3) \
+- -I$(call gb_UnpackedTarball_get_dir,python3)/PC \
+- -I$(call gb_UnpackedTarball_get_dir,python3)/Include \
- $$(INCLUDE) \
-))
-endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
