The following commit has been merged in the debian-experimental-4.0 branch:
commit 7af15bb1bb300d7308ae2ef1d4c23b6d49fa4f71
Merge: 07c19e412a2ed4a2dc5a8e1cce20843ffdf36233
0310156446ca608d6205be4cd196d9b1eddbc47a
Author: Rene Engelhard <[email protected]>
Date: Sun Jun 2 15:59:35 2013 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.0
Conflicts:
changelog
diff --combined changelog
index ed5454a,60e6166..e2a6c0b
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,10 +1,19 @@@
+libreoffice (1:4.0.4~rc1-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
+
+ * debian/rules:
+ - enable kk (kazakh) l10n (closes: #700835)
+
+ -- Rene Engelhard <[email protected]> Mon, 27 May 2013 19:45:10 +0200
+
+ libreoffice (1:4.0.3-4) UNRELEASED; urgency=low
+
+ * debian/control:
+ - regenerate; uses libservlet3.0-java instead of libservlet3.0-java now
+
+ -- Rene Engelhard <[email protected]> Tue, 28 May 2013 20:43:19 +0200
+
libreoffice (1:4.0.3-3) unstable; urgency=low
* debian/patches/uno-executables-link-to-xmlreader.diff: fix
diff --combined rules
index 5948f96,e483f08..971ca8b
--- 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)
@@@ -762,7 -762,7 +762,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"
@@@ -775,7 -775,7 +775,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
@@@ -967,9 -967,15 +967,15 @@@ ifneq (,$(filter boost, $(SYSTEM_STUFF)
ifneq "$(BOOST_VERSION)" "default"
BUILD_DEPS += , libboost$(BOOST_VERSION)-dev $(BOOST_MINVER),
libboost-date-time$(BOOST_VERSION)-dev $(BOOST_MINVER)
#BUILD_DEPS += , libboost-thread$(BOOST_VERSION)-dev,
libboost-program-options$(BOOST_VERSION)-dev
+ ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libboost-system$(BOOST_VERSION)-dev $(BOOST_MINVER)
+ endif
else
BUILD_DEPS += , libboost-dev $(BOOST_MINVER), libboost-date-time-dev
$(BOOST_MINVER)
#BUILD_DEPS += , libboost-thread-dev, libboost-program-options-dev
+ ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libboost-system-dev $(BOOST_MINVER)
+ endif
endif
endif
endif
--
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]
