[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-149-g7769f6b
The following commit has been merged in the debian-experimental-4.0 branch:
commit b1a6d90e865cfab8fceeaca4b3b31b55587578fa
Author: Rene Engelhard <rene@debian.org>
Date: Mon Nov 26 15:32:58 2012 +0100
reverse logic (use python3 per default and and build python2 in a extra step); use 3.3 explicitely for now and rename to python3.3-uno
diff --git a/changelog b/changelog
index 133e906..6247efa 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.0.0~alpha1+git20121125-1) UNRELEASED; urgency=low
+libreoffice (1:4.0.0~alpha1+git20121126-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
@@ -19,9 +19,13 @@ libreoffice (1:4.0.0~alpha1+git20121125-1) UNRELEASED; urgency=low
- temporarily disable python3-uno as the new python-based wizards
(in comon!) don't work with it...
- use --disable-dependency-tracking instead of gb_FULLDEPS=
+ - python3 is default now; reverse logic (use python3 per default and
+ and build python2 in a extra step)
* debian/uno-libs3.symbols: update
* debian/control*.in, debian/rules, debian/scripts/gid2pkgdirs.sh: binfilter
is gone. yay.
+ * debian/control.in, debian/rules: until we have a default python of 3.3,
+ use 3.3 explicitely and build a python3.3-uno instead of a python3-uno
-- Rene Engelhard <rene@debian.org> Tue, 20 Nov 2012 14:16:33 +0100
diff --git a/control b/control
index bd862e8..24a845e 100644
--- a/control
+++ b/control
@@ -3,11 +3,12 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, bc,, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, python (>= 2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), default-jdk, defau
lt-jdk (>= 1:1.7-48) [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686 [i386 amd64], javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev, dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.6.0), liborcus-dev, libvigraimpex-dev, libclucene-dev (>= 2.3.3.4-2), libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev, libmspub-dev, libcmis-dev (>= 0.3.0), liblcms2-dev, libldap2-dev, liblangtag-dev (>= 0.3), libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~
), libebook1.2-dev, libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.70), libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386], libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2)
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, bc,, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, python (>= 2.6.6-3+squeeze4), python3.3-dev (>= 3.3), python-dev (>= 2.6), debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), default
-jdk, default-jdk (>= 1:1.7-48) [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686 [i386 amd64], javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev, dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.6.0), liborcus-dev, libvigraimpex-dev, libclucene-dev (>= 2.3.3.4-2), libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev, libmspub-dev, libcmis-dev (>= 0.3.0), liblcms2-dev, libldap2-dev, liblangtag-dev (>= 0.3), libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-d
ev (>= 3.2~), libebook1.2-dev, libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.70), libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386], libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2)
Build-Depends-Indep: fdupes, xml-core, imagemagick, doxygen, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, bsh (>= 2.0b
4), fontforge
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11), gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], g++-4.7 (<< 4.7.1-3), base-files (= 7.0), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
-XS-Python-Version: current
+XS-Python-Version: >= 3.3
+XS-Python3-Version: >= 3.3
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://git.debian.org/?p=pkg-openoffice/libreoffice.git;a=summary
Bugs:
@@ -346,7 +347,7 @@ Description: office productivity suite -- GNOME integration
Package: libreoffice-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno | python3-uno, libreoffice-core, ${misc:Depends}
+Depends: ${python:Depends}, python-uno | python3.3-uno, libreoffice-core, ${misc:Depends}
Enhances: libreoffice-writer
Replaces: python-uno (<< 1:2.4.1-5)
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@ -364,7 +365,7 @@ Section: python
Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Enhances: libreoffice
Depends: libreoffice-core (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: python3-uno, libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
+Conflicts: python3-uno, python3.3-uno,libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@ -373,10 +374,11 @@ Description: Python-UNO bridge
or the built in StarBasic scripting language.
Homepage: http://udk.openoffice.org/python/python-bridge.html
-Package: python3-uno
+Package: python3.3-uno
Section: python
Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Enhances: libreoffice
+Replaces: python3-uno
Depends: libreoffice-core (= ${binary:Version}), ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
Conflicts: python-uno
Description: Python-UNO bridge
@@ -430,7 +432,7 @@ Description: office productivity suite -- legacy 1.0 XML DTD
Package: libreoffice-script-provider-python
Architecture: all
Section: python
-Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, python-uno | python3-uno, ${misc:Depends}
+Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, python-uno | python3.3-uno, ${misc:Depends}
Replaces: python-uno (<< 1:3.5.2-2), python3-uno (<< 1:3.5.2-2)
Conflicts: libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: Python script support provider for LibreOffice scripting framework
diff --git a/control.in b/control.in
index 8512ef3..570efc4 100644
--- a/control.in
+++ b/control.in
@@ -38,7 +38,8 @@ Build-Depends: dpkg-dev (>= 1.16.1),
Build-Depends-Indep: fdupes, xml-core, imagemagick %BUILD_DEPS_INDEP%
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-3) [%OOO_GCJ_JDK_ARCHS%], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11), gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], g++-4.7 (<< 4.7.1-3)
Standards-Version: 3.9.1
-XS-Python-Version: @PYTHON_VERSION@
+XS-Python-Version: @PYTHON2_VERSION@
+XS-Python3-Version: @PYTHON_VERSION@
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://git.debian.org/?p=pkg-openoffice/libreoffice.git;a=summary
Bugs: @BUGS@
@@ -482,7 +483,7 @@ Description: office productivity suite -- GNOME integration
Package: libreofficeVER-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno | python3-uno, libreofficeVER-core, ${misc:Depends}
+Depends: ${python:Depends}, python-uno | python3.3-uno, libreofficeVER-core, ${misc:Depends}
Enhances: libreofficeVER-writer
Replaces: python-uno (<< 1:2.4.1-5)
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@ -503,7 +504,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
${python:Depends},
${shlibs:Depends},
${misc:Depends}
-Conflicts: python3-uno, libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
+Conflicts: python3-uno, python3.3-uno,libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@ -512,10 +513,11 @@ Description: Python-UNO bridge
or the built in StarBasic scripting language.
Homepage: http://udk.openoffice.org/python/python-bridge.html
-Package: python3-uno
+Package: python3.3-uno
Section: python
Architecture: %OOO_ARCHS%
Enhances: libreofficeVER
+Replaces: python3-uno
Depends: libreofficeVER-core (= ${binary:Version}),
${python3:Depends},
${shlibs:Depends},
@@ -581,7 +583,7 @@ Description: office productivity suite -- legacy 1.0 XML DTD
Package: libreoffice-script-provider-python
Architecture: all
Section: python
-Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, python-uno | python3-uno, ${misc:Depends}
+Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, python-uno | python3.3-uno, ${misc:Depends}
Replaces: python-uno (<< 1:3.5.2-2), python3-uno (<< 1:3.5.2-2)
Conflicts: libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: Python script support provider for LibreOffice scripting framework
diff --git a/patches/py3uno-module.diff b/patches/py2uno-module.diff
similarity index 86%
rename from patches/py3uno-module.diff
rename to patches/py2uno-module.diff
index ff81bb5..00bc18c 100644
--- a/patches/py3uno-module.diff
+++ b/patches/py2uno-module.diff
@@ -4,7 +4,7 @@
postgresql\
psprint_config\
pyuno\
-+py3uno\
++py2uno\
qadevOOo\
readlicense_oo\
registry\
@@ -16,9 +16,9 @@ index 3609d09..c0b11c2 100644
officebean \
package2 \
pyuno \
-+ py3uno \
++ py2uno \
pyuno_wrapper \
-+ py3uno_wrapper \
++ py2uno_wrapper \
recentfile \
scriptframe \
sdbc2 \
@@ -26,7 +26,7 @@ index 3609d09..c0b11c2 100644
OGLTrans \
passwordcontainer \
pythonloader \
-+ python3loader \
++ python2loader \
postgresql-sdbc \
postgresql-sdbc-impl \
simplecanvas \
@@ -38,7 +38,7 @@ index 6beb818..1a570e4 100644
else
# libpyuno_wrapper.so => pyuno.so
gb_Library_FILENAMES := $(patsubst pyuno_wrapper:libpyuno_wrapper.so,pyuno_wrapper:pyuno.so,$(gb_Library_FILENAMES))
-+gb_Library_FILENAMES := $(patsubst py3uno_wrapper:libpy3uno_wrapper.so,py3uno_wrapper:py3uno.so,$(gb_Library_FILENAMES))
++gb_Library_FILENAMES := $(patsubst py2uno_wrapper:libpy2uno_wrapper.so,py2uno_wrapper:py2uno.so,$(gb_Library_FILENAMES))
endif
ifneq ($(OS),ANDROID)
diff --git a/patches/pyuno-copy-for-python3.diff b/patches/pyuno-copy-for-python2.diff
similarity index 84%
rename from patches/pyuno-copy-for-python3.diff
rename to patches/pyuno-copy-for-python2.diff
index bd6360b..fb50560 100644
--- a/patches/pyuno-copy-for-python3.diff
+++ b/patches/pyuno-copy-for-python2.diff
@@ -1,6 +1,6 @@
-diff -urN pyuno/Library_py3uno.mk py3uno/Library_py3uno.mk
---- pyuno/Library_py3uno.mk 1970-01-01 01:00:00.000000000 +0100
-+++ py3uno/Library_py3uno.mk 2012-09-17 21:35:21.284382442 +0200
+diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+--- pyuno/Library_py2uno.mk 1970-01-01 01:00:00.000000000 +0100
++++ py2uno/Library_py2uno.mk 2012-09-17 21:35:21.284382442 +0200
@@ -0,0 +1,66 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
@@ -28,48 +28,48 @@ diff -urN pyuno/Library_py3uno.mk py3uno/Library_py3uno.mk
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
-+$(eval $(call gb_Library_Library,py3uno))
++$(eval $(call gb_Library_Library,py2uno))
+
-+$(eval $(call gb_Library_set_include,py3uno,\
-+ -I$(SRCDIR)/py3uno/source/loader \
-+ -I$(SRCDIR)/py3uno/inc \
++$(eval $(call gb_Library_set_include,py2uno,\
++ -I$(SRCDIR)/py2uno/source/loader \
++ -I$(SRCDIR)/py2uno/inc \
+ $$(INCLUDE) \
+))
+
-+$(eval $(call gb_Library_add_defs,py3uno,\
++$(eval $(call gb_Library_add_defs,py2uno,\
+ -DLO_DLLIMPLEMENTATION_PYUNO \
+))
+
-+$(eval $(call gb_Library_use_api,py3uno,\
++$(eval $(call gb_Library_use_api,py2uno,\
+ udkapi \
+))
+
-+$(eval $(call gb_Library_use_libraries,py3uno,\
++$(eval $(call gb_Library_use_libraries,py2uno,\
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+))
+
-+$(eval $(call gb_Library_use_externals,py3uno,\
++$(eval $(call gb_Library_use_externals,py2uno,\
+ python \
+))
+
-+$(eval $(call gb_Library_add_exception_objects,py3uno,\
-+ py3uno/source/module/pyuno_runtime \
-+ py3uno/source/module/pyuno \
-+ py3uno/source/module/pyuno_callable \
-+ py3uno/source/module/pyuno_module \
-+ py3uno/source/module/pyuno_type \
-+ py3uno/source/module/pyuno_util \
-+ py3uno/source/module/pyuno_except \
-+ py3uno/source/module/pyuno_adapter \
-+ py3uno/source/module/pyuno_gc \
++$(eval $(call gb_Library_add_exception_objects,py2uno,\
++ py2uno/source/module/pyuno_runtime \
++ py2uno/source/module/pyuno \
++ py2uno/source/module/pyuno_callable \
++ py2uno/source/module/pyuno_module \
++ py2uno/source/module/pyuno_type \
++ py2uno/source/module/pyuno_util \
++ py2uno/source/module/pyuno_except \
++ py2uno/source/module/pyuno_adapter \
++ py2uno/source/module/pyuno_gc \
+))
+
+# 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
++++ pyuno/Library_py2uno_wrapper.mk 2012-10-04 20:06:08.828380766 +0200
@@ -0,0 +1,70 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
@@ -97,16 +97,16 @@ diff -urN pyuno/Library_py3uno.mk py3uno/Library_py3uno.mk
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
-+$(eval $(call gb_Library_Library,py3uno_wrapper))
++$(eval $(call gb_Library_Library,py2uno_wrapper))
+
-+$(eval $(call gb_Library_use_packages,py3uno_wrapper,\
++$(eval $(call gb_Library_use_packages,py2uno_wrapper,\
+ sal_generated \
+ sal_inc \
+))
+
-+$(eval $(call gb_Library_set_include,py3uno_wrapper,\
-+ -I$(SRCDIR)/py3uno/source/module \
-+ -I$(SRCDIR)/py3uno/inc \
++$(eval $(call gb_Library_set_include,py2uno_wrapper,\
++ -I$(SRCDIR)/py2uno/source/module \
++ -I$(SRCDIR)/py2uno/inc \
+ $$(INCLUDE) \
+))
+
@@ -115,12 +115,12 @@ diff -urN pyuno/Library_py3uno.mk py3uno/Library_py3uno.mk
+# against python!
+# we need only -Idirective
+ifeq ($(SYSTEM_PYTHON),YES)
-+$(eval $(call gb_Library_set_include,py3uno_wrapper,\
++$(eval $(call gb_Library_set_include,py2uno_wrapper,\
+ $(PYTHON_CFLAGS) \
+ $$(INCLUDE) \
+))
+else
-+$(eval $(call gb_Library_set_include,py3uno_wrapper,\
++$(eval $(call gb_Library_set_include,py2uno_wrapper,\
+ -I$(OUTDIR)/inc/python \
+ $$(INCLUDE) \
+))
@@ -129,21 +129,21 @@ diff -urN pyuno/Library_py3uno.mk py3uno/Library_py3uno.mk
+ifneq ($(GUI)$(COM),WNTMSC)
+ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
+
-+$(eval $(call gb_Library_add_libs,py3uno_wrapper,\
++$(eval $(call gb_Library_add_libs,py2uno_wrapper,\
+ -ldl \
+))
+
+endif
+endif
+
-+$(eval $(call gb_Library_add_cobjects,py3uno_wrapper,\
-+ py3uno/source/module/pyuno_dlopenwrapper \
++$(eval $(call gb_Library_add_cobjects,py2uno_wrapper,\
++ py2uno/source/module/pyuno_dlopenwrapper \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
-diff -urN pyuno/Library_python3loader.mk py3uno/Library_python3loader.mk
---- pyuno/Library_python3loader.mk 1970-01-01 01:00:00.000000000 +0100
-+++ py3uno/Library_python3loader.mk 2012-09-17 21:36:02.252585588 +0200
+diff -urN pyuno/Library_python2loader.mk py2uno/Library_python2loader.mk
+--- pyuno/Library_python2loader.mk 1970-01-01 01:00:00.000000000 +0100
++++ py2uno/Library_python2loader.mk 2012-09-17 21:36:02.252585588 +0200
@@ -0,0 +1,56 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
@@ -171,39 +171,39 @@ diff -urN pyuno/Library_python3loader.mk py3uno/Library_python3loader.mk
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
-+$(eval $(call gb_Library_Library,python3loader))
++$(eval $(call gb_Library_Library,python2loader))
+
-+$(eval $(call gb_Library_set_componentfile,python3loader,py3uno/source/loader/pythonloader))
++$(eval $(call gb_Library_set_componentfile,python2loader,py2uno/source/loader/pythonloader))
+
-+$(eval $(call gb_Library_set_include,python3loader,\
-+ -I$(SRCDIR)/py3uno/source/loader \
-+ -I$(SRCDIR)/py3uno/inc \
++$(eval $(call gb_Library_set_include,python2loader,\
++ -I$(SRCDIR)/py2uno/source/loader \
++ -I$(SRCDIR)/py2uno/inc \
+ $$(INCLUDE) \
+))
+
-+$(eval $(call gb_Library_use_api,python3loader,\
++$(eval $(call gb_Library_use_api,python2loader,\
+ udkapi \
+))
+
-+$(eval $(call gb_Library_use_libraries,python3loader,\
++$(eval $(call gb_Library_use_libraries,python2loader,\
+ cppu \
+ cppuhelper \
-+ py3uno \
++ py2uno \
+ sal \
+))
+
-+$(eval $(call gb_Library_use_externals,python3loader,\
++$(eval $(call gb_Library_use_externals,python2loader,\
+ python \
+))
+
-+$(eval $(call gb_Library_add_exception_objects,python3loader,\
-+ py3uno/source/loader/pyuno_loader \
++$(eval $(call gb_Library_add_exception_objects,python2loader,\
++ py2uno/source/loader/pyuno_loader \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
-diff -urN pyuno/Library_pythonloader.mk py3uno/Library_pythonloader.mk
+diff -urN pyuno/Library_pythonloader.mk py2uno/Library_pythonloader.mk
--- pyuno/Library_pythonloader.mk 2012-06-18 20:36:22.723886656 +0200
-+++ py3uno/Library_pythonloader.mk 1970-01-01 01:00:00.000000000 +0100
++++ py2uno/Library_pythonloader.mk 1970-01-01 01:00:00.000000000 +0100
@@ -1,56 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
@@ -261,9 +261,9 @@ diff -urN pyuno/Library_pythonloader.mk py3uno/Library_pythonloader.mk
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
-diff -urN pyuno/Library_pyuno.mk py3uno/Library_pyuno.mk
+diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
--- pyuno/Library_pyuno.mk 2012-06-18 20:36:23.391889962 +0200
-+++ py3uno/Library_pyuno.mk 1970-01-01 01:00:00.000000000 +0100
++++ py2uno/Library_pyuno.mk 1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
@@ -404,9 +404,9 @@ diff -urN pyuno/Library_pyuno.mk py3uno/Library_pyuno.mk
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
-diff -urN pyuno/Module_py3uno.mk py3uno/Module_py3uno.mk
---- pyuno/Module_py3uno.mk 1970-01-01 01:00:00.000000000 +0100
-+++ py3uno/Module_py3uno.mk 2012-09-17 21:37:10.060921827 +0200
+diff -urN pyuno/Module_py2uno.mk py2uno/Module_py2uno.mk
+--- pyuno/Module_py2uno.mk 1970-01-01 01:00:00.000000000 +0100
++++ py2uno/Module_py2uno.mk 2012-09-17 21:37:10.060921827 +0200
@@ -0,0 +1,98 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
@@ -434,20 +434,20 @@ diff -urN pyuno/Module_py3uno.mk py3uno/Module_py3uno.mk
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
-+$(eval $(call gb_Module_Module,py3uno))
++$(eval $(call gb_Module_Module,py2uno))
+
+ifneq ($(DISABLE_PYTHON),TRUE)
+
-+$(eval $(call gb_Module_add_targets,py3uno,\
-+ Library_py3uno \
-+ Library_python3loader \
++$(eval $(call gb_Module_add_targets,py2uno,\
++ Library_py2uno \
++ Library_python2loader \
+ Package_pyunorc \
+ Package_python_scripts \
+))
+
+ifneq ($(OS),WNT)
-+$(eval $(call gb_Module_add_targets,py3uno,\
-+ Library_py3uno_wrapper \
++$(eval $(call gb_Module_add_targets,py2uno,\
++ Library_py2uno_wrapper \
+))
+endif
+
@@ -506,9 +506,9 @@ diff -urN pyuno/Module_py3uno.mk py3uno/Module_py3uno.mk
+endif # DISABLE_PYTHON
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
-diff -urN pyuno/Module_pyuno.mk py3uno/Module_pyuno.mk
+diff -urN pyuno/Module_pyuno.mk py2uno/Module_pyuno.mk
--- pyuno/Module_pyuno.mk 2012-07-20 11:13:03.401545847 +0200
-+++ py3uno/Module_pyuno.mk 1970-01-01 01:00:00.000000000 +0100
++++ py2uno/Module_pyuno.mk 1970-01-01 01:00:00.000000000 +0100
@@ -1,98 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/patches/series b/patches/series
index 28bb176..321d4cb 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
-py3uno-module.diff
+py2uno-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
diff --git a/rules b/rules
index 71afaef..be64764 100755
--- a/rules
+++ b/rules
@@ -96,7 +96,7 @@ BUILD_DEPS=
SYSTEM_STUFF = dicts
BUILD_PYUNO=y
-ENABLE_PYTHON3=y
+ENABLE_PYTHON2=y
ifeq "$(BUILD_PYUNO)" "y"
ENABLE_SCRIPT_PROVIDER_PYTHON=y
PACKAGE_LIBRELOGO=n
@@ -106,20 +106,20 @@ endif
# uses pythonX.Y directly (and the dh_pycentral-created dependencies allow
# also the non-working default python then) - see e.g. #587402. Also
# note we are NOT working with python < 2.6 anymore!
-PYTHON_VERSION=current
+PYTHON_VERSION=3.3
ifeq "$(PYTHON_VERSION)" "current"
- PYTHON=python (>= 2.6)
-export PYTHON=python
+ PYTHON=python3
+export PYTHON=python3
else
PYTHON=python$(PYTHON_VERSION)
export PYTHON=python$(PYTHON_VERSION)
endif
-ifeq "$(ENABLE_PYTHON3)" "y"
- PYTHON3_VERSION=current
- ifeq "$(PYTHON3_VERSION)" "current"
- PYTHON3=python3
+ifeq "$(ENABLE_PYTHON2)" "y"
+ PYTHON2_VERSION=current
+ ifeq "$(PYTHON2_VERSION)" "current"
+ PYTHON2=python
else
- PYTHON3=python$(PYTHON3_VERSION)
+ PYTHON2=python$(PYTHON2_VERSION)
endif
endif
PACKAGE_TTF_OPENSYMBOL=y
@@ -622,21 +622,21 @@ ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
endif
-PYMAJOR:=$(shell $(PYTHON) -c "import sys; print sys.version_info[0]")
-PYMINOR:=$(shell $(PYTHON) -c "import sys; print sys.version_info[1]")
-PYMINORPLUS1:=$(shell $(PYTHON) -c "import sys; print sys.version_info[1]+1")
-PYTHON_SITE:=debian/python-uno/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
-PY3MAJOR:=$(shell $(PYTHON3) -c "import sys; print (sys.version_info[0])")
-PY3MINOR:=$(shell $(PYTHON3) -c "import sys; print (sys.version_info[1])")
-PY3MINORPLUS1:=$(shell $(PYTHON3) -c "import sys; print (sys.version_info[1]+1)")
-PYTHON3_SITE:=debian/python3-uno/$(shell $(PYTHON3) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+PYMAJOR:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[0])")
+PYMINOR:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[1])")
+PYMINORPLUS1:=$(shell $(PYTHON) -c "import sys; print (sys.version_info[1]+1)")
+PYTHON_SITE:=debian/python3.3-uno/$(shell $(PYTHON) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+PY2MAJOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[0]")
+PY2MINOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[1]")
+PY2MINORPLUS1:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[1]+1")
+PYTHON2_SITE:=debian/python-uno/$(shell $(PYTHON2) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
ifeq "$(BUILD_PYUNO)" "y"
BUILD_DEPS += , python (>= 2.6.6-3+squeeze4)
DBG_DBG_SUGGESTS+= , python-dbg
- BUILD_DEPS += , $(PYTHON)-dev (>= 2.6)
- ifeq "$(ENABLE_PYTHON3)" "y"
- BUILD_DEPS += , $(PYTHON3)-dev
+ BUILD_DEPS += , $(PYTHON)-dev (>= 3.3)
+ ifeq "$(ENABLE_PYTHON2)" "y"
+ BUILD_DEPS += , $(PYTHON2)-dev (>= 2.6)
endif
else
BUILD_DEPS += , python
@@ -1053,7 +1053,7 @@ else
endif
ifneq "$(BUILD_PYUNO)" "y"
- DEBHELPER_OPTIONS+= -Npython-uno -Npython3-uno -Nlibreoffice-script-provider-python
+ DEBHELPER_OPTIONS+= -Npython-uno -Npython3.3-uno -Nlibreoffice-script-provider-python
CONFIGURE_FLAGS += --disable-python
endif
@@ -1263,7 +1263,7 @@ clean:
rm -rf */*.pro.obsolete
rm -rf $(SOURCE_TREE)/file-lists
- rm -rf $(SOURCE_TREE)/py3uno
+ rm -rf $(SOURCE_TREE)/py2uno
rm -f configure aclocal.m4 autogen.lastrun
rm -f build_error.log
@@ -1570,7 +1570,9 @@ $(STAMP_DIR)/build-arch:
# FIXME: Theoretically this should call ./configure instead of
# it exists but that causes the configure flags NOT to be hnoured
# somehow...
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS) \
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
+ PYTHON=$(PYTHON) PYTHON_CFLAGS="$(shell pkg-config --cflags python-$(PYMAJOR).$(PYMINOR))" PYTHON_LIBS="$(shell pkg-config --libs python-$(PYMAJOR).$(PYMINOR))" \
+ ./autogen.sh $(CONFIGURE_FLAGS) \
--without-help --without-doxygen --disable-ext-wiki-publisher \
--disable-ext-report-builder --disable-scripting-javascript \
--disable-scripting-beanshell
@@ -1578,17 +1580,13 @@ $(STAMP_DIR)/build-arch:
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build gb_Deliver_HARDLINK=T
ifeq "$(BUILD_PYUNO)" "y"
- ifeq "$(ENABLE_PYTHON3)" "y"
- rm -rf $(SOURCE_TREE)/py3uno
- cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/py3uno
- cd py3uno && \
- patch -p1 < $(CURDIR)/debian/patches/pyuno-copy-for-python3.diff
- $(MAKE) py3uno.clean
- ifeq "$(PYTHON3_VERSION)" "current"
- make cmd cmd='cd py3uno; export PYTHON=$(PYTHON3); export PYTHON_CFLAGS="$(shell pkg-config --cflags python$(PY3MAJOR))"; export PYTHON_LIBS="$(shell pkg-config --libs python$(PY3MAJOR))"; $(MAKE)'
- else
- make cmd cmd='cd py3uno; export PYTHON=$(PYTHON3); export PYTHON_CFLAGS="$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR))"; export PYTHON_LIBS="$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR))"; $(MAKE)'
- endif
+ 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
endif
@@ -2176,62 +2174,62 @@ endif
ifeq "$(BUILD_PYUNO)" "y"
# PyUNO packaging
install -d $(PYTHON_SITE)
- mv debian/python-uno/$(OODIR)/program/uno.py $(PYTHON_SITE)
- mv debian/python-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
- touch debian/python-uno/$(OODIR)/program/pythonloader.unorc
- chmod u+w debian/python-uno/$(OODIR)/program/pythonloader.unorc
+ mv debian/python3.3-uno/$(OODIR)/program/uno.py $(PYTHON_SITE)
+ mv debian/python3.3-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
+ touch debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
+ chmod u+w debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
( echo '[Bootstrap]'; \
echo 'PYTHONHOME=file:///usr/lib/python$(PYMAJOR).$(PYMINOR)' ;\
echo 'PYTHONPATH=$$PYTHONHOME $$PYTHONHOME/site-packages $$PYTHONHOME/lib-dynload $$PYTHONHOME/lib-tk $$ORIGIN' \
- ) > debian/python-uno/$(OODIR)/program/pythonloader.unorc
- chmod u-w debian/python-uno/$(OODIR)/program/pythonloader.unorc
- ifeq "$(ENABLE_PYTHON3)" "y"
- install -d $(PYTHON3_SITE)
+ ) > debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
+ chmod u-w debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
+ ifeq "$(ENABLE_PYTHON2)" "y"
+ install -d $(PYTHON2_SITE)
cp $(PYTHON_SITE)/uno.py \
- $(PYTHON3_SITE)
+ $(PYTHON2_SITE)
cp $(PYTHON_SITE)/unohelper.py \
- $(PYTHON3_SITE)
- mkdir -p debian/python3-uno/$(OODIR)/program
- mkdir -p debian/python3-uno/$(OODIR)/share/registry
- mkdir -p debian/python3-uno/$(OODIR)/share/Scripts
- cat debian/python-uno/$(OODIR)/program/pythonloader.unorc \
- | sed -e "s/$(PYMAJOR).$(PYMINOR)/$(PY3MAJOR).$(PY3MINOR)/" \
- > debian/python3-uno/$(OODIR)/program/pythonloader.unorc
- for i in py3uno.so libpy3uno.so; do \
+ $(PYTHON2_SITE)
+ mkdir -p debian/python-uno/$(OODIR)/program
+ mkdir -p debian/python-uno/$(OODIR)/share/registry
+ mkdir -p debian/python-uno/$(OODIR)/share/Scripts
+ cat debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc \
+ | sed -e "s/$(PYMAJOR).$(PYMINOR)/$(PY2MAJOR).$(PY2MINOR)/" \
+ > debian/python-uno/$(OODIR)/program/pythonloader.unorc
+ for i in py2uno.so libpy2uno.so; do \
install -m644 $(SOURCE_TREE)/workdir/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/LinkTarget/Library/$$i \
- debian/python3-uno/$(OODIR)/program/$$i; \
- ln -s $$i debian/python3-uno/$(OODIR)/program/`echo $$i | sed -e s/3//`; \
+ debian/python-uno/$(OODIR)/program/$$i; \
+ ln -s $$i debian/python-uno/$(OODIR)/program/`echo $$i | sed -e s/2//`; \
done
- install -m644 $(SOURCE_TREE)/workdir/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/LinkTarget/Library/python3loader.uno.so \
- debian/python3-uno/$(OODIR)/program/python3loader.uno.so
- ln -s python3loader.uno.so debian/python3-uno/$(OODIR)/program/pythonloader.uno.so
- cp debian/python-uno/$(OODIR)/program/pythonloader.py \
- debian/python3-uno/$(OODIR)/program
- cp debian/python-uno/$(OODIR)/share/registry/pyuno.xcd \
- debian/python3-uno/$(OODIR)/share/registry
- cp -r debian/python-uno/$(OODIR)/share/Scripts/python \
- debian/python3-uno/$(OODIR)/share/Scripts
+ install -m644 $(SOURCE_TREE)/workdir/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/LinkTarget/Library/python2loader.uno.so \
+ debian/python-uno/$(OODIR)/program/python2loader.uno.so
+ ln -s python2loader.uno.so debian/python-uno/$(OODIR)/program/pythonloader.uno.so
+ cp debian/python3.3-uno/$(OODIR)/program/pythonloader.py \
+ debian/python-uno/$(OODIR)/program
+ cp debian/python3.3-uno/$(OODIR)/share/registry/pyuno.xcd \
+ debian/python-uno/$(OODIR)/share/registry
+ cp -r debian/python3.3-uno/$(OODIR)/share/Scripts/python \
+ debian/python-uno/$(OODIR)/share/Scripts
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_PYTHON)" "y"
rm -f debian/libreoffice$(VER)-script-provider-python/$(OODIR)/share/extensions/script-provider-for-python/registration/LICENSE
endif
- mkdir -p debian/python-uno/usr/share/doc/python-uno
+ mkdir -p debian/python3.3-uno/usr/share/doc/python3.3-uno
cp -r $(SOURCE_TREE)/pyuno/demo \
- debian/python-uno/usr/share/doc/python-uno; \
+ debian/python3.3-uno/usr/share/doc/python3.3-uno; \
for i in $(SOURCE_TREE)/pyuno/doc/*; do \
- cp $$i debian/python-uno/usr/share/doc/python-uno; \
+ cp $$i debian/python3.3-uno/usr/share/doc/python-uno; \
done
- cd debian/python-uno/usr/share/doc/python-uno && \
+ cd debian/python3.3-uno/usr/share/doc/python3.3-uno && \
find . -type d -name "CVS" | xargs -r rm -rf
- ifeq "$(ENABLE_PYTHON3)" "y"
- mkdir -p debian/python3-uno/usr/share/doc/python3-uno
+ ifeq "$(ENABLE_PYTHON2)" "y"
+ mkdir -p debian/python-uno/usr/share/doc/python-uno
cp -r $(SOURCE_TREE)/pyuno/demo \
- debian/python3-uno/usr/share/doc/python3-uno; \
+ debian/python-uno/usr/share/doc/python-uno; \
for i in $(SOURCE_TREE)/pyuno/doc/*; do \
- cp $$i debian/python3-uno/usr/share/doc/python3-uno; \
+ cp $$i debian/python-uno/usr/share/doc/python-uno; \
done
- cd debian/python3-uno/usr/share/doc/python3-uno && \
+ cd debian/python-uno/usr/share/doc/python-uno && \
find . -type d -name "CVS" | xargs -r rm -rf
endif
endif
@@ -2784,9 +2782,13 @@ ifeq "$(ENABLE_JAVA)" "y"
dh_nativejava -plibreoffice$(VER)-gcj -o
endif
endif
+ dh_python3 -ppython3.3-uno --no-guessing-deps
+ifneq "$(PYTHON_VERSION)" "current"
+ sed -i -e 's/python$(PYMAJOR) (>= .*)/python$(PYMAJOR).$(PYMINOR)/g' \
+ debian/python3.3-uno.substvars
+endif
+ifeq "$(ENABLE_PYTHON2)" "y"
dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
-ifeq "$(ENABLE_PYTHON3)" "y"
- dh_python3 -ppython3-uno --no-guessing-deps
endif
dh_lintian -s
dh_bugfiles -s -A
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index f3aa94f..d5cbd5d 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -97,7 +97,7 @@ create_package_directory gid_Module_Brand_Prg_Draw pkg/libreoffice-
create_package_directory gid_Module_Brand_Prg_Wrt pkg/libreoffice-writer
create_package_directory gid_Module_Brand_Prg_Impress pkg/libreoffice-impress
create_package_directory gid_Module_Brand_Prg_Base pkg/libreoffice-base
-create_package_directory gid_Module_Optional_Pyuno pkg/python-uno
+create_package_directory gid_Module_Optional_Pyuno pkg/python3.3-uno
create_package_directory gid_Module_Optional_Extensions_Script_Provider_For_Python pkg/libreoffice-script-provider-python
create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome
create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde
--
LibreOffice packaging repository
Reply to: