[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4-7-12-g454fe22
The following commit has been merged in the debian-experimental-3.5 branch:
commit 454fe223b87b672b2c01b07f8f8a16159dad647d
Merge: 0e641d7224e25c3cc1081bf25ff53636967bc3c1 faac6575392efb8fa0a9d7bc316c5976e3cb8a26
Author: Rene Engelhard <rene@debian.org>
Date: Mon Aug 13 22:48:30 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index ff4c965,5da9251..f68ac00
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,13 +1,20 @@@
+libreoffice (1:3.5.6~rc2-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
+ - caches fontconfig font substitutions (closes: #631308)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 13 Jun 2012 19:25:17 +0200
+
+ libreoffice (1:3.5.4-8) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - fix python3-dev builddep to >= 3.2; 3.1 didn't have a .pc yet..
+ * debian/libreoffice-common.links.in:
+ - s/libreofficeoasis/libreoffice-oasis/, thanks Jakub Wilk
+ (closes: #683784)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 13 Aug 2012 22:23:49 +0200
+
libreoffice (1:3.5.4-7) unstable; urgency=high
* debian/patches/CVE-2012-2665*.diff: fix CVE-2012-2665
diff --combined rules
index bac7d48,c9bb8b4..174e743
--- a/rules
+++ b/rules
@@@ -69,9 -69,9 +69,9 @@@ USE_SOURCE_TARBALLS=
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.5.4.2
+lo_sources_ver=3.5.6.2
# NOT in proper libreoffice-3-5 branch
-# use ./g checkout -b tag-libreoffice-3.5.4.2 libreoffice-3.5.4.2
+# use ./g checkout -b tag-libreoffice-3.5.6.2 libreoffice-3.5.6.2
GIT_TAG=libreoffice-$(lo_sources_ver)
GIT_BRANCH=tag-libreoffice-$(lo_sources_ver)
endif
@@@ -643,7 -643,7 +643,7 @@@ ifeq "$(BUILD_PYUNO)" "y
DBG_DBG_SUGGESTS+= , python-dbg
BUILD_DEPS += , $(PYTHON)-dev (>= 2.6)
ifeq "$(ENABLE_PYTHON3)" "y"
- BUILD_DEPS += , $(PYTHON3)-dev
+ BUILD_DEPS += , $(PYTHON3)-dev (>= 3.2)
endif
else
BUILD_DEPS += , python
--
LibreOffice packaging repository
Reply to: