[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0_rc2-1-17-gbc8880d
The following commit has been merged in the debian-experimental-4.2 branch:
commit bc8880d93aa8feb8637fe59fb0b29e07f4c139b9
Merge: 043be286e468338763a8cdccf332020bf61fa764 c6dee2e2218248b0c982200c190f24e60ff462f6
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jul 8 22:45:05 2013 +0200
Merge remote-tracking branch 'origin/debian-experimental-4.1' into debian-experimental-4.2
Conflicts:
changelog
control
patches/javadoc-optional.diff
patches/series
diff --combined changelog
index 2b34afa,79b4d2f..ffa3019
--- a/changelog
+++ b/changelog
@@@ -1,16 -1,31 +1,44 @@@
+libreoffice (1:4.2.0~alpha0~git20130708-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ * debian/rules:
+ - autodoc got replaced by doxygen. bump doxygen build-dep to needed
+ (>= 1.8.4-1) and disable packaging the SDK docs on wheezy-backports.
+ Run dh_doxygen
+ - build-depend on fonts-liberation when running the tests - the
+ sc_macros_tests VBA tests need Arial etc.-similar fonts
+
+ -- Rene Engelhard <rene@debian.org> Sun, 02 Jun 2013 20:49:18 +0200
+
+ libreoffice (1:4.1.0~rc2-2) UNRELEASED; urgency=low
+
+ * build with proper DEB_BUILD_OPTIONS so we actually get l10n
+ (closes: #715353)
+
+ * debian/rules:
+ - also filter out binutils so that the mips(el)-only build-dep doesn't
+ end up in -subsequentbases depends for everything
+ * debian/rules, debian/control.in:
+ - revert python3-uno -> python3.3-uno move now that python 3.3 is default
+ and prefer python3-uno (>= 4.0~) in dependencies again
+
+ -- Rene Engelhard <rene@debian.org> Tue, 02 Jul 2013 22:12:36 +020
+
+ libreoffice (1:4.1.0~rc2-1) experimental; urgency=low
+
+ * new upstream release candidate
+
+ * debian/patches/hack-interlck_sparc.diff: hack around sparc build failure,
+ #undef __sparcv8plus, __sparcv9 and __sparc_v9__ for interlck_sparc.o as
+ we otherwise miss osl_InterlockedCountSetV9...
+
+ * debian/rules:
+ - revert gcc 4.6 hack; armel built fine with g++-4.8, including checks,
+ so let's try with it everywhere.
+
+ -- Rene Engelhard <rene@debian.org> Tue, 02 Jul 2013 22:12:36 +0200
+
libreoffice (1:4.1.0~rc1-1) experimental; urgency=low
* new upstream release candidate
diff --combined control
index d1585cf,185e993..1634e4b
--- a/control
+++ b/control
@@@ -16,10 -16,7 +16,8 @@@ Build-Depends: ant (>= 1.7.0)
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
+ fonts-liberation,
- g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
g++-mingw-w64-i686 [i386 amd64],
- gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64],
gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386],
gdb,
@@@ -67,7 -64,7 +65,7 @@@
liblcms2-dev,
libldap2-dev,
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.8.0),
+ libmdds-dev (>= 0.9.0),
libmspub-dev,
libmwaw-dev,
libmysqlclient-dev,
@@@ -109,14 -106,13 +107,14 @@@
libxtst-dev,
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
+ ocl-icd-opencl-dev,
openjdk-6-jdk (>= 6b23~pre8-2) [mips mipsel],
openjdk-7-jdk [amd64 armel armhf i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc],
pkg-config,
python (>= 2.6.6-3+squeeze4),
python-dev (>= 2.6),
python3,
- python3.3-dev (>= 3.3),
+ python3-dev (>= 3.3),
unixodbc-dev (>= 2.2.11),
unzip,
x11proto-render-dev,
@@@ -125,7 -121,7 +123,7 @@@
zip,
zlib1g-dev
Build-Depends-Indep: bsh (>= 2.0b4),
- doxygen,
+ doxygen (>= 1.8.4),
fdupes,
fontforge,
imagemagick,
@@@ -146,8 -142,7 +144,8 @@@
libservlet3.0-java,
libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386],
xml-core
-Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
+Build-Conflicts: amd-libopencl1,
+ 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],
flex (= 2.5.34-1) [amd64],
@@@ -166,11 -161,10 +164,11 @@@
libxul-dev (= 1.8.0.13~pre070720-0etch1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
+ nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
XS-Python-Version: current
--XS-Python3-Version: 3.3
++XS-Python3-Version: 3.2
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
@@@ -729,11 -723,10 +727,10 @@@ Description: Python-UNO bridge (suppor
or the built in StarBasic scripting language.
.
This package is for compatibility with applications/libraries not ported
- to python 3 yet. Prefer python3.3-uno over this.
+ to python 3 yet. Prefer python3-uno over this.
Homepage: http://udk.openoffice.org/python/python-bridge.html
- Package: python3.3-uno
- #Provides: ${python3:Provides}
+ Package: python3-uno
Section: python
Architecture: amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
Enhances: libreoffice
@@@ -741,9 -734,8 +738,8 @@@ Depends: libreoffice-core (= ${binary:V
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
- Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2)
- Replaces: python3-uno (<< 1:4.0.2~rc2)
- Provides: python3-uno
+ Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2), python3.3-uno
+ Replaces: python3-uno (<< 1:4.0.2~rc2), python3.3-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@@ -4442,21 -4434,17 +4438,18 @@@ Depends: ant (>= 1.7.0)
autoconf,
automake,
bc,
- binutils (>= 2.23),
bison,
bsh (>= 2.0b4),
bzip2,
cpp-4.7,
debhelper (>= 7.2.3~),
- doxygen,
+ doxygen (>= 1.8.4),
dpkg-dev (>= 1.16.1),
fastjar,
flex | flex-old,
fontforge,
+ fonts-liberation,
- g++-4.6,
g++-mingw-w64-i686,
- gcc-4.6,
gcj-jdk,
gcj-native-helper,
gdb,
@@@ -4512,7 -4500,7 +4505,7 @@@
libldap2-dev,
libloader-java (>= 1.1.6),
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.8.0),
+ libmdds-dev (>= 0.9.0),
libmspub-dev,
libmwaw-dev,
libmysqlclient-dev,
@@@ -4561,13 -4549,12 +4554,13 @@@
libxtst-dev,
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
+ ocl-icd-opencl-dev,
openjdk-6-jdk (>= 6b23~pre8-2),
pkg-config,
python (>= 2.6.6-3+squeeze4),
python-dev (>= 2.6),
python3,
- python3.3-dev (>= 3.3),
+ python3-dev (>= 3.3),
unixodbc-dev (>= 2.2.11),
unzip,
x11proto-render-dev,
diff --combined control.in
index 1ae7012,e784a76..93de837
--- a/control.in
+++ b/control.in
@@@ -23,9 -23,7 +23,9 @@@ Build-Conflicts: ant (= 1.8.0-1) [%OOO_
libxul-dev (= 1.8.0.13~pre070720-0etch1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
- qt3-dev-tools
+ qt3-dev-tools,
+ amd-libopencl1,
+ nvidia-libopencl1
Standards-Version: 3.9.4
XS-Python-Version: @PYTHON2_VERSION@
XS-Python3-Version: @PYTHON_VERSION_CONTROL@
@@@ -584,11 -582,10 +584,10 @@@ Description: Python-UNO bridge (suppor
or the built in StarBasic scripting language.
.
This package is for compatibility with applications/libraries not ported
- to python 3 yet. Prefer python3.3-uno over this.
+ to python 3 yet. Prefer python3-uno over this.
Homepage: http://udk.openoffice.org/python/python-bridge.html
- Package: python3.3-uno
- #Provides: ${python3:Provides}
+ Package: python3-uno
Section: python
Architecture: %OOO_ARCHS%
Enhances: libreoffice
@@@ -596,9 -593,8 +595,8 @@@ Depends: libreoffice-core (= ${binary:V
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
- Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2)
- Replaces: python3-uno (<< 1:4.0.2~rc2)
- Provides: python3-uno
+ Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2), python3.3-uno
+ Replaces: python3-uno (<< 1:4.0.2~rc2), python3.3-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
diff --combined patches/series
index d81fff2,bc8d93f..0532a05
--- a/patches/series
+++ b/patches/series
@@@ -27,4 -27,5 +27,5 @@@ wheezy-backports-python.dif
fix-internal-hsqldb-build.diff
javadoc-optional.diff
show-the-startcenter.diff
-fix-kk-in-lo-xlate-lang.diff
+ hack-interlck_sparc.diff
+opencl-multiarch.diff
diff --combined rules
index 975068e,e3497b5..114c2cb
--- a/rules
+++ b/rules
@@@ -23,7 -23,7 +23,7 @@@ BASE_VERSION:=$(shell echo $(DEB_VERSIO
BINARY_VERSION=$(DEB_VERSION)
#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d: -f2 | tr [~] [\\-])
HELP_L10N_VIRTUAL_VERSION:=4.1
-OOVER:=4.1
+OOVER:=4.2
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@@ -70,7 -70,7 +70,7 @@@ lo_sources_ver=$(shell grep AC_INIT $(S
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
GIT_TAG=libreoffice-$(lo_sources_ver)
- GIT_BRANCH=libreoffice-4-1
+ GIT_BRANCH=libreoffice-4-1-0
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@@ -113,6 -113,8 +113,8 @@@ BUILD_DEPS=
zip,\
zlib1g-dev\
+
+ CHECKTARGET:=check
# These are components which can be built from internal copies, or used from the
# distribution. See configure --help for valid values (--with-system-<value>).
SYSTEM_STUFF = dicts
@@@ -128,8 -130,7 +130,7 @@@ endi
# 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!
- # Also note that you need to adapt all package names...
- PYTHON_VERSION=3.3
+ PYTHON_VERSION=current
ifeq "$(PYTHON_VERSION)" "current"
PYTHON=python3
export PYTHON=python3
@@@ -373,7 -374,6 +374,7 @@@ ifeq "$(USE_UCPP)" "y
endif
ENABLE_MERGELIBS=n
PACKAGE_LIBLIBREOFFICE=n
+USE_OPENCL=y
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@@ -540,7 -540,6 +541,7 @@@ endi
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "wheezy-backports"
BUGS=mailto:debian-backports@lists.debian.org
SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw libodfgen mdds liblangtag orcus harfbuzz, $(SYSTEM_STUFF))
+ PACKAGE_SDK_DOCS=n
WHEEZY_BACKPORT=y
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@@ -551,14 -550,14 +552,14 @@@ CONFIGURE_FLAGS += $(foreach i, $(SYSTE
CC_PREFIX:=$(shell gcc -dumpmachine)-
- BUILD_DEPS += , gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64] ,g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
- ifeq (,$(findstring i386,$(DEB_HOST_ARCH)))
- ifeq (,$(findstring amd64,$(DEB_HOST_ARCH)))
- ifneq "$(SYSTEM_GCC_VERSION)" "4.6"
- GCC_VERSION := 4.6
- endif
- endif
- endif
+ # BUILD_DEPS += , gcc-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64] ,g++-4.6 [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64]
+ #ifeq (,$(findstring i386,$(DEB_HOST_ARCH)))
+ # ifeq (,$(findstring amd64,$(DEB_HOST_ARCH)))
+ # ifneq "$(SYSTEM_GCC_VERSION)" "4.6"
+ # GCC_VERSION := 4.6
+ # endif
+ # endif
+ #endif
ifneq "$(GCC_VERSION)" ""
ifneq "$(SYSTEM_GCC_VERSION)" "$(GCC_VERSION)"
BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
@@@ -586,7 -585,7 +587,7 @@@ ifneq "$(PACKAGE_SDK)" "y
endif
else
ifeq "$(PACKAGE_SDK_DOCS)" "y"
- BUILD_DEPS_INDEP += , doxygen
+ BUILD_DEPS_INDEP += , doxygen (>= 1.8.4)
endif
endif
@@@ -644,10 -643,6 +645,10 @@@ ifneq (,$(filter openssl, $(SYSTEM_STUF
BUILD_DEPS += , libssl-dev
DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/$(DEB_HOST_MULTIARCH)/libssl.so | cut -d"." -f3,4,5)-dbg
endif
+ifeq "$(USE_OPENCL)" "y"
+ BUILD_DEPS += , ocl-icd-opencl-dev
+ CONFIGURE_FLAGS += --with-opencl-sdk=/usr
+endif
ifeq "$(BUILD_DBG_PACKAGE)" "y"
ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
@@@ -682,7 -677,7 +683,7 @@@ ifneq "$(WHEEZY_BACKPORT)" "y
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())')
ifeq "$(ENABLE_PYTHON2)" "y"
PY2MAJOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[0]")
PY2MINOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[1]")
@@@ -693,8 -688,8 +694,8 @@@ els
PYMAJOR:=$(shell $(PYTHON2) -c "import sys; print (sys.version_info[0])")
PYMINOR:=$(shell $(PYTHON2) -c "import sys; print (sys.version_info[1])")
PYMINORPLUS1:=$(shell $(PYTHON2) -c "import sys; print (sys.version_info[1]+1)")
- # YES, really! python3.3-uno. see "OMG!" below :-)
- PYTHON_SITE:=debian/python3.3-uno/$(shell $(PYTHON2) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+ # YES, really! python3-uno. see "OMG!" below :-)
+ PYTHON_SITE:=debian/python3-uno/$(shell $(PYTHON2) -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
PYTHON:=$(PYTHON2)
endif
@@@ -738,11 -733,6 +739,11 @@@ ifneq (,$(filter cppunit, $(SYSTEM_STUF
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
BUILD_DEPS += , gdb
+ ifeq "$(WHEEZY_BACKPORT)" "y"
+ BUILD_DEPS += , ttf-liberation
+ else
+ BUILD_DEPS += , fonts-liberation
+ endif
ifeq "$(ENABLE_JUNIT4)" "y"
BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
else
@@@ -988,7 -978,7 +989,7 @@@ ifneq (,$(filter boost, $(SYSTEM_STUFF)
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmdds-dev (>= 0.8.0)
+ BUILD_DEPS += , libmdds-dev (>= 0.9.0)
endif
ifneq (,$(filter orcus, $(SYSTEM_STUFF)))
@@@ -1153,7 -1143,7 +1154,7 @@@ els
endif
ifneq "$(ENABLE_PYTHON)" "y"
- DEBHELPER_OPTIONS+= -Npython-uno -Npython3.3-uno -Nlibreoffice-script-provider-python
+ DEBHELPER_OPTIONS+= -Npython-uno -Npython3-uno -Nlibreoffice-script-provider-python
ifeq "$(BUILD_ISOS)" "en-US"
CONFIGURE_FLAGS += --disable-python
else
@@@ -1161,10 -1151,10 +1162,10 @@@
endif
else
ifeq "$(WHEEZY_BACKPORT)" "y"
- DEBHELPER_OPTIONS+= -Npython3.3-uno
+ DEBHELPER_OPTIONS+= -Npython3-uno
PYUNO_DEPENDS = python-uno
else
- PYUNO_DEPENDS = python3.3-uno | python3-uno (>= 4.0~) | python-uno
+ PYUNO_DEPENDS = python3-uno (>= 4.0~) | python-uno
endif
CONFIGURE_FLAGS += --enable-python=system
endif
@@@ -1575,8 -1565,9 +1576,9 @@@ ifeq "$(BUILD_TEST_PACKAGE)" "y
# we want the build deps as dep on subsequentcheckbase, but strip the arch
# specifics as we are arch-all
# for now we filter out the arch-specific libc* and ia64, which is ugly,
- # but better than manual bookkeeping
- perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v libc6| grep -v ia64|sed -e 's/\[[^]]*\]//g'))#g" debian/control
+ # but better than manual bookkeeping. Also filter out the mips(el)-only
+ # binutils build-dep...
+ perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v libc6| grep -v ia64|grep -v binutils|sed -e 's/\[[^]]*\]//g'))#g" debian/control
endif
ifeq "$(BUILD_KDE)" "y"
perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-kde/' debian/control
@@@ -1802,7 -1793,7 +1804,7 @@@ endi
export HOME=$$t; \
export SAL_USE_VCLPLUGIN="svp"; \
if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
- $(MAKE) -k check || $(MAKE) check && \
+ $(MAKE) -k $(CHECKTARGET) || $(MAKE) $(CHECKTARGET) && \
rm -rf $$t
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
@@@ -2346,16 -2337,16 +2348,16 @@@ ifeq "$(ENABLE_PYTHON)" "y
echo "import sys, os" > $(PYTHON_SITE)/uno.py
echo "sys.path.append('$(OODIR)/program')" >> $(PYTHON_SITE)/uno.py
echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:$(OODIR)/program/fundamentalrc')" >> $(PYTHON_SITE)/uno.py
- cat debian/python3.3-uno/$(OODIR)/program/uno.py >> $(PYTHON_SITE)/uno.py
- rm -f debian/python3.3-uno/$(OODIR)/program/uno.py
- 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
+ cat debian/python3-uno/$(OODIR)/program/uno.py >> $(PYTHON_SITE)/uno.py
+ rm -f debian/python3-uno/$(OODIR)/program/uno.py
+ 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
ifneq "$(WHEEZY_BACKPORT)" "y"
ifeq "$(ENABLE_PYTHON2)" "y"
install -d $(PYTHON2_SITE)
@@@ -2366,7 -2357,7 +2368,7 @@@
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 \
@@@ -2377,11 -2368,11 +2379,11 @@@
install -m644 $(SOURCE_TREE)/workdir/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/LinkTarget/Library/libpython2loaderlo.so \
debian/python-uno/$(OODIR)/program/libpython2loaderlo.so
ln -s libpython2loaderlo.so debian/python-uno/$(OODIR)/program/libpythonloaderlo.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
endif
@@@ -2389,13 -2380,13 +2391,13 @@@
rm -f debian/libreoffice-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/python3.3-uno; \
+ cp $$i debian/python3-uno/usr/share/doc/python3-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
ifneq "$(WHEEZY_BACKPORT)" "y"
ifeq "$(ENABLE_PYTHON2)" "y"
@@@ -2414,7 -2405,7 +2416,7 @@@ endi
ifeq "$(WHEEZY_BACKPORT)" "y"
# OMG!!
rm -rf debian/python-uno
- mv debian/python3.3-uno debian/python-uno
+ mv debian/python3-uno debian/python-uno
endif
# should be empty now, remove if there
@@@ -2934,14 -2925,14 +2936,14 @@@ endi
ifeq "$(WHEEZY_BACKPORT)" "y"
dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
else
- dh_python3 -ppython3.3-uno --no-guessing-deps
+ dh_python3 -ppython3-uno --no-guessing-deps
# adds a python3 (>= 3.2.3-3~)
ifeq "$(PYTHON_VERSION)" "current"
sed -i -e 's/python$(PYMAJOR) (>= .*)/python$(PYMAJOR) (>= 3.3~)/g' \
- debian/python3.3-uno.substvars
+ debian/python3-uno.substvars
else
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
@@@ -3167,9 -3158,6 +3169,9 @@@ endi
ifeq "$(PACKAGE_LIBRELOGO)" "y"
dh_installchangelogs -plibreoffice-librelogo -k librelogo/source/ChangeLog
endif
+ifeq "$(PACKAGE_SDK_DOCS)" "y"
+ dh_doxygen -plibreoffice-dev-doc
+endif
dh_installmime -i
dh_lintian -i
dh_bugfiles -i -A
--
LibreOffice packaging repository
Reply to: