[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.2_rc1-1-35-ge38d69b
The following commit has been merged in the debian-experimental-3.7 branch:
commit e38d69b4c5615d7d856611152902ebc42f7f0615
Author: Rene Engelhard <rene@debian.org>
Date: Mon Sep 17 23:09:28 2012 +0200
third time is a charm?: really commit changed py3uno-module.diff
diff --git a/patches/py3uno-module.diff b/patches/py3uno-module.diff
index fb2e77f..695c005 100644
--- a/patches/py3uno-module.diff
+++ b/patches/py3uno-module.diff
@@ -1,10 +1,32 @@
--- a/Makefile.top-old 2012-04-06 14:26:46.828238642 +0200
+++ b/Makefile.top 2012-04-06 14:26:58.308239187 +0200
-@@ -226,6 +226,7 @@
- postprocess\
- python\
+@@ -111,6 +111,7 @@ packimages\
+ padmin\
+ psprint_config\
pyuno\
-+pyuno-py3\
- readlicense_oo\
- redland\
- rhino\
++py3uno\
+ qadevOOo\
+ regexp\
+ registry\
+diff --git a/Repository.mk b/Repository.mk
+index 3609d09..c0b11c2 100644
+--- a/Repository.mk
++++ b/Repository.mk
+@@ -445,7 +445,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ officebean \
+ package2 \
+ pyuno \
++ py3uno \
+ pyuno_wrapper \
++ py3uno_wrapper \
+ recentfile \
+ scriptframe \
+ sdbc2 \
+@@ -555,6 +557,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+ OGLTrans \
+ passwordcontainer \
+ pythonloader \
++ python3loader \
+ postgresql-sdbc \
+ postgresql-sdbc-impl \
+ simplecanvas \
diff --git a/patches/series b/patches/series
index 0a82da7..def35eb 100644
--- a/patches/series
+++ b/patches/series
@@ -22,7 +22,7 @@ mediwiki-oor-replace.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
-pyuno-py3-module.diff
+py3uno-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
#disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
--
LibreOffice packaging repository
Reply to: