[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-166-gd5bd87a
The following commit has been merged in the debian-experimental-4.0 branch:
commit d5bd87a43f5919d86950ab13e1873d3329cf769e
Author: Rene Engelhard <rene@debian.org>
Date: Thu Nov 29 14:40:17 2012 +0100
move py2uno creation/patching into prepare so that the new auto-rule in Makefile.top would catch it...
diff --git a/patches/py2uno-module.diff b/patches/py2uno-module.diff
index bb4beaf..4fedf7e 100644
--- a/patches/py2uno-module.diff
+++ b/patches/py2uno-module.diff
@@ -1,13 +1,3 @@
---- a/Makefile.top-old 2012-04-06 14:26:46.828238642 +0200
-+++ b/Makefile.top 2012-04-06 14:26:58.308239187 +0200
-@@ -142,6 +142,7 @@ postgresql\
- psprint_config\
- python3 \
- pyuno\
-+py2uno\
- qadevOOo\
- readlicense_oo\
- registry\
diff --git a/Repository.mk b/Repository.mk
index 16ef7ba..ea257b1 100755
--- a/Repository.mk
diff --git a/rules b/rules
index 09da98c..c8b03ce 100755
--- a/rules
+++ b/rules
@@ -1553,6 +1553,16 @@ ifneq "$(PACKAGE_UNOWINREG_DLL)" "y"
fi
endif
endif
+
+ifeq "$(BUILD_PYUNO)" "y"
+ ifeq "$(ENABLE_PYTHON2)" "y"
+ rm -rf $(SOURCE_TREE)/py2uno
+ cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/py2uno
+ cd py2uno && \
+ patch -p1 < $(CURDIR)/debian/patches/pyuno-copy-for-python2.diff
+ endif
+endif
+
touch $@
build:
@@ -1579,10 +1589,6 @@ $(STAMP_DIR)/build-arch:
ifeq "$(BUILD_PYUNO)" "y"
ifeq "$(ENABLE_PYTHON2)" "y"
- rm -rf $(SOURCE_TREE)/py2uno
- cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/py2uno
- cd py2uno && \
- patch -p1 < $(CURDIR)/debian/patches/pyuno-copy-for-python2.diff
$(MAKE) py2uno.clean
make cmd cmd='cd py2uno; export PYTHON=$(PYTHON2); export PYTHON_CFLAGS="$(shell pkg-config --cflags python-$(PY2MAJOR).$(PY2MINOR))"; export PYTHON_LIBS="$(shell pkg-config --libs python-$(PY2MAJOR).$(PY2MINOR))"; $(MAKE)'
endif
--
LibreOffice packaging repository
Reply to: