[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-172-g7e70e59
The following commit has been merged in the debian-experimental-4.0 branch:
commit 7e70e59b45bdf1c2fcd689de9968969689cfad55
Author: Rene Engelhard <rene@debian.org>
Date: Thu Nov 29 18:51:46 2012 +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 47a58a8..8a27578 100644
--- a/patches/pyuno-copy-for-python2.diff
+++ b/patches/pyuno-copy-for-python2.diff
@@ -68,9 +68,9 @@ 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,72 @@
+--- /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 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
@@ -110,23 +110,10 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+ $$(INCLUDE) \
+))
+
-+# not using here external
-+# because we do not want to link here
-+# against python!
-+# we need only -Idirective
-+ifeq ($(SYSTEM_PYTHON),YES)
-+$(eval $(call gb_Library_set_include,py2uno_wrapper,\
-+ $(PYTHON_CFLAGS) \
-+ $$(INCLUDE) \
-+))
-+else
-+$(eval $(call gb_Library_set_include,py2uno_wrapper,\
-+ -I$(call gb_UnpackedTarball_get_dir,python3) \
-+ -I$(call gb_UnpackedTarball_get_dir,python3)/PC \
-+ -I$(call gb_UnpackedTarball_get_dir,python3)/Include \
-+ $$(INCLUDE) \
++# not using external "python" because we do not want to link against python
++$(eval $(call gb_Library_use_externals,py2uno_wrapper,\
++ python_headers \
+))
-+endif
+
+ifneq ($(GUI)$(COM),WNTMSC)
+ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
@@ -333,9 +320,9 @@ 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,72 +0,0 @@
+--- 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 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
@@ -375,23 +362,10 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
- $$(INCLUDE) \
-))
-
--# not using here external
--# because we do not want to link here
--# against python!
--# we need only -Idirective
--ifeq ($(SYSTEM_PYTHON),YES)
--$(eval $(call gb_Library_set_include,pyuno_wrapper,\
-- $(PYTHON_CFLAGS) \
-- $$(INCLUDE) \
--))
--else
--$(eval $(call gb_Library_set_include,pyuno_wrapper,\
-- -I$(call gb_UnpackedTarball_get_dir,python3) \
-- -I$(call gb_UnpackedTarball_get_dir,python3)/PC \
-- -I$(call gb_UnpackedTarball_get_dir,python3)/Include \
-- $$(INCLUDE) \
+-# not using external "python" because we do not want to link against python
+-$(eval $(call gb_Library_use_externals,pyuno_wrapper,\
+- python_headers \
-))
--endif
-
-ifneq ($(GUI)$(COM),WNTMSC)
-ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
--
LibreOffice packaging repository
Reply to: