[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.3-3-17-g98557c3
The following commit has been merged in the debian-experimental-4.0 branch:
commit 98557c34ea9069148fa79752bab2d9079429ad7a
Merge: 9703590673e3e84e3e982a1a322bbec40e521dd2 0348fc6bb9f0e216d19fec78b13706d1acc826ad
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Tue Jun 11 00:21:23 2013 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.0
Conflicts:
changelog
diff --combined changelog
index 1c7e2c4,28bf9bf..5cc1ed7
--- a/changelog
+++ b/changelog
@@@ -1,14 -1,12 +1,15 @@@
-libreoffice (1:4.0.3-4) UNRELEASED; urgency=low
+libreoffice (1:4.0.4~rc1-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
- * debian/control:
- - regenerate; uses libservlet3.0-java instead of libservlet2.5-java now
* debian/rules:
+ - enable kk (kazakh) l10n (closes: #700835)
- enable graphite2 on all archs now that it's fixed on armel/sparc
+ * debian/control:
+ - regenerate; uses libservlet3.0-java instead of libservlet2.5-java now
-
- -- Rene Engelhard <rene@debian.org> Tue, 28 May 2013 20:43:19 +0200
+ - fix -dbg suggests: s/python/$(PYTHON)/. to suggest python3.3-dbg
+
+ -- Rene Engelhard <rene@debian.org> Tue, 11 Jun 2013 00:17:34 +0200
libreoffice (1:4.0.3-3) unstable; urgency=low
diff --combined rules
index b96a1a5,241290f..d265705
--- a/rules
+++ b/rules
@@@ -69,11 -69,11 +69,11 @@@ USE_SOURCE_TARBALLS=
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=4.0.3.3
+lo_sources_ver=4.0.4.1
# 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-0-3
+GIT_BRANCH=libreoffice-4-0-4
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@@ -672,10 -672,12 +672,12 @@@ PYMAJOR:=$(shell $(PYTHON) -c "import s
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())')
+ 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]")
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())')
+ endif
else
PYMAJOR:=$(shell $(PYTHON2) -c "import sys; print (sys.version_info[0])")
PYMINOR:=$(shell $(PYTHON2) -c "import sys; print (sys.version_info[1])")
@@@ -695,7 -697,7 +697,7 @@@ ifeq "$(ENABLE_PYTHON)" "y
BUILD_DEPS += , python (>= 2.6.6-3+squeeze4)
# for dh_python3
BUILD_DEPS += , python3
- DBG_DBG_SUGGESTS+= , python-dbg
+ DBG_DBG_SUGGESTS+= , $(PYTHON)-dbg
ifneq "$(WHEEZY_BACKPORT)" "y"
BUILD_DEPS += , $(PYTHON)-dev (>= 3.3)
ifeq "$(ENABLE_PYTHON2)" "y"
@@@ -752,7 -754,7 +754,7 @@@ ifneq "$(BUILD_ONLY_EN_US)" "y
#ISOS=$(shell $(SOURCE_TREE)/bin/lo-xlate-lang -i all')
ISOS:=en-US af ar as ast be bg bn br bs ca ca-XV cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja \
- ka km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
+ ka kk km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
ifeq "$(ENABLE_HELP)" "n"
@@@ -765,7 -767,7 +767,7 @@@
#LANGPACKISOS:=$(shell $(SOURCE_TREE)/bin/lo-xlate-lang -i all')
LANGPACKISOS:=en-US af ar as ast be bg bn br bs ca ca-XV cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja \
- ka km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
+ ka kk km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
endif
--
LibreOffice packaging repository
Reply to: