The following commit has been merged in the debian-experimental-4.0 branch:
commit 64ab21ba7588a1c1bb2116aacceff0138fad8125
Author: Rene Engelhard <[email protected]>
Date: Mon Nov 26 17:19:00 2012 +0100
new python3-defaults in experimental; revert back to python3-uno. Fix
XS-Python* headers
diff --git a/control b/control
index 24a845e..5c73417 100644
--- a/control
+++ b/control
@@ -3,12 +3,12 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <[email protected]>
Uploaders: Rene Engelhard <[email protected]>
-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: 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-dev (>= 3.3), python-dev (>= 2.6), debhelper (>= 7.2.3~),
libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), default-j
dk, 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-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-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: >= 3.3
-XS-Python3-Version: >= 3.3
+XS-Python-Version: current
+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:
@@ -347,7 +347,7 @@ Description: office productivity suite -- GNOME integration
Package: libreoffice-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno | python3.3-uno, libreoffice-core,
${misc:Depends}
+Depends: ${python:Depends}, python-uno | python3-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)
@@ -365,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, python3.3-uno,libreoffice-core (<< 1:3.5~),
libreoffice-common (<< 1:3.5~)
+Conflicts: python3-uno, python3-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
@@ -374,11 +374,10 @@ Description: Python-UNO bridge
or the built in StarBasic scripting language.
Homepage: http://udk.openoffice.org/python/python-bridge.html
-Package: python3.3-uno
+Package: python3-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
@@ -432,7 +431,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.3-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-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 570efc4..8f8ed77 100644
--- a/control.in
+++ b/control.in
@@ -39,7 +39,7 @@ 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: @PYTHON2_VERSION@
-XS-Python3-Version: @PYTHON_VERSION@
+XS-Python3-Version: @PYTHON_VERSION_CONTROL@
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@
@@ -483,7 +483,7 @@ Description: office productivity suite -- GNOME integration
Package: libreofficeVER-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno | python3.3-uno, libreofficeVER-core,
${misc:Depends}
+Depends: ${python:Depends}, python-uno | python3-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)
@@ -504,7 +504,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
${python:Depends},
${shlibs:Depends},
${misc:Depends}
-Conflicts: python3-uno, python3.3-uno,libreoffice-core (<< 1:3.5~),
libreoffice-common (<< 1:3.5~)
+Conflicts: python3-uno, python3-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
@@ -513,11 +513,10 @@ Description: Python-UNO bridge
or the built in StarBasic scripting language.
Homepage: http://udk.openoffice.org/python/python-bridge.html
-Package: python3.3-uno
+Package: python3-uno
Section: python
Architecture: %OOO_ARCHS%
Enhances: libreofficeVER
-Replaces: python3-uno
Depends: libreofficeVER-core (= ${binary:Version}),
${python3:Depends},
${shlibs:Depends},
@@ -583,7 +582,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.3-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-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/rules b/rules
index 4662aef..988a971 100755
--- a/rules
+++ b/rules
@@ -106,7 +106,7 @@ 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=3.3
+PYTHON_VERSION=current
ifeq "$(PYTHON_VERSION)" "current"
PYTHON=python3
export PYTHON=python3
@@ -625,12 +625,18 @@ 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/python3.3-uno/$(shell $(PYTHON) -c 'from distutils import
sysconfig; print(sysconfig.get_python_lib())')
+PYTHON_SITE:=debian/python3-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 "$(PYTHON_VERSION)" "current"
+ PYTHON_VERSION_CONTROL := $(PYMAJOR).$(PYMINOR)
+else
+ PYTHON_VERSION_CONTROL := $(PYTHON_VERSION)
+endif
+
ifeq "$(BUILD_PYUNO)" "y"
BUILD_DEPS += , python (>= 2.6.6-3+squeeze4)
DBG_DBG_SUGGESTS+= , python-dbg
@@ -1053,7 +1059,7 @@ else
endif
ifneq "$(BUILD_PYUNO)" "y"
- DEBHELPER_OPTIONS+= -Npython-uno -Npython3.3-uno
-Nlibreoffice-script-provider-python
+ DEBHELPER_OPTIONS+= -Npython-uno -Npython3-uno
-Nlibreoffice-script-provider-python
CONFIGURE_FLAGS += --disable-python
endif
@@ -1290,7 +1296,8 @@ debian/control: $(wildcard debian/control*in)
$(SOURCE_TREE)/bin/lo-xlate-lang
-e "s#%[A-Za-z]*=[^%]*%##g#" \
-e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" \
-e "s#%BUILD_DEPS_INDEP%#$(strip $(BUILD_DEPS_INDEP))#g" \
- -e "s#@PYTHON_VERSION@#$(PYTHON_VERSION)#g" \
+ -e "s#@PYTHON_VERSION_CONTROL@#$(PYTHON_VERSION_CONTROL)#g" \
+ -e "s#@PYTHON2_VERSION@#$(PYTHON2_VERSION)#g" \
-e "s#@BUGS@#$(BUGS)#g" \
< debian/control.in > debian/control
@@ -2174,15 +2181,15 @@ endif
ifeq "$(BUILD_PYUNO)" "y"
# PyUNO packaging
install -d $(PYTHON_SITE)
- 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
+ mv debian/python3-uno/$(OODIR)/program/uno.py $(PYTHON_SITE)
+ mv debian/python3-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
+ touch debian/python3-uno/$(OODIR)/program/pythonloader.unorc
+ chmod u+w debian/python3-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/python3.3-uno/$(OODIR)/program/pythonloader.unorc
- chmod u-w debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
+ ) > debian/python3-uno/$(OODIR)/program/pythonloader.unorc
+ chmod u-w debian/python3-uno/$(OODIR)/program/pythonloader.unorc
ifeq "$(ENABLE_PYTHON2)" "y"
install -d $(PYTHON2_SITE)
cp $(PYTHON_SITE)/uno.py \
@@ -2192,7 +2199,7 @@ ifeq "$(BUILD_PYUNO)" "y"
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 \
+ cat debian/python3-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 \
@@ -2203,24 +2210,24 @@ ifeq "$(BUILD_PYUNO)" "y"
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 \
+ cp debian/python3-uno/$(OODIR)/program/pythonloader.py \
debian/python-uno/$(OODIR)/program
- cp debian/python3.3-uno/$(OODIR)/share/registry/pyuno.xcd \
+ cp debian/python3-uno/$(OODIR)/share/registry/pyuno.xcd \
debian/python-uno/$(OODIR)/share/registry
- cp -r debian/python3.3-uno/$(OODIR)/share/Scripts/python \
+ cp -r debian/python3-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/python3.3-uno/usr/share/doc/python3.3-uno
+ mkdir -p debian/python3-uno/usr/share/doc/python3-uno
cp -r $(SOURCE_TREE)/pyuno/demo \
- debian/python3.3-uno/usr/share/doc/python3.3-uno; \
+ debian/python3-uno/usr/share/doc/python3-uno; \
for i in $(SOURCE_TREE)/pyuno/doc/*; do \
- cp $$i debian/python3.3-uno/usr/share/doc/python-uno; \
+ cp $$i debian/python3-uno/usr/share/doc/python-uno; \
done
- cd debian/python3.3-uno/usr/share/doc/python3.3-uno && \
+ cd debian/python3-uno/usr/share/doc/python3-uno && \
find . -type d -name "CVS" | xargs -r rm -rf
ifeq "$(ENABLE_PYTHON2)" "y"
mkdir -p debian/python-uno/usr/share/doc/python-uno
@@ -2782,10 +2789,10 @@ ifeq "$(ENABLE_JAVA)" "y"
dh_nativejava -plibreoffice$(VER)-gcj -o
endif
endif
- dh_python3 -ppython3.3-uno --no-guessing-deps
+ dh_python3 -ppython3-uno --no-guessing-deps
ifneq "$(PYTHON_VERSION)" "current"
sed -i -e 's/python$(PYMAJOR) (>= .*)/python$(PYMAJOR).$(PYMINOR)/g' \
- debian/python3.3-uno.substvars
+ debian/python3-uno.substvars
endif
ifeq "$(ENABLE_PYTHON2)" "y"
dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index d5cbd5d..f7c325a 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/python3.3-uno
+create_package_directory gid_Module_Optional_Pyuno pkg/python3-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
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
