[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.3_rc2-1-102-g1031120
The following commit has been merged in the debian-experimental-3.7 branch:
commit 6fd5c98e0e8f0f1a3affd14f8482bcdac4ff4cbc
Author: Rene Engelhard <rene@debian.org>
Date: Wed Oct 31 22:44:26 2012 +0100
make pyuno-copy-for-python3.diff apply again
diff --git a/patches/pyuno-copy-for-python3.diff b/patches/pyuno-copy-for-python3.diff
index f4e4fb6..bd6360b 100644
--- a/patches/pyuno-copy-for-python3.diff
+++ b/patches/pyuno-copy-for-python3.diff
@@ -70,7 +70,7 @@ diff -urN pyuno/Library_py3uno.mk py3uno/Library_py3uno.mk
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
--- /dev/null 2012-09-07 17:14:08.612339087 +0200
+++ pyuno/Library_py3uno_wrapper.mk 2012-10-04 20:06:08.828380766 +0200
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,70 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
@@ -99,6 +99,11 @@ diff -urN pyuno/Library_py3uno.mk py3uno/Library_py3uno.mk
+
+$(eval $(call gb_Library_Library,py3uno_wrapper))
+
++$(eval $(call gb_Library_use_packages,py3uno_wrapper,\
++ sal_generated \
++ sal_inc \
++))
++
+$(eval $(call gb_Library_set_include,py3uno_wrapper,\
+ -I$(SRCDIR)/py3uno/source/module \
+ -I$(SRCDIR)/py3uno/inc \
@@ -328,7 +333,7 @@ diff -urN pyuno/Library_pyuno.mk py3uno/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,65 +0,0 @@
+@@ -1,70 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
@@ -357,6 +362,11 @@ diff -urN pyuno/Library_pyuno.mk py3uno/Library_pyuno.mk
-
-$(eval $(call gb_Library_Library,pyuno_wrapper))
-
+-$(eval $(call gb_Library_use_packages,pyuno_wrapper,\
+- sal_generated \
+- sal_inc \
+-))
+-
-$(eval $(call gb_Library_set_include,pyuno_wrapper,\
- -I$(SRCDIR)/pyuno/source/module \
- -I$(SRCDIR)/pyuno/inc \
--
LibreOffice packaging repository
Reply to: