[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4-6-7-gb9ce3e5
The following commit has been merged in the debian-experimental-3.5 branch:
commit b9ce3e59c7f7b1a5a5968ff2c34b3eb7d7fbb5a9
Merge: cca42c38f88c0c69458da6756d96b6443ef4bb67 cc5326462f648b9adddc353a062f71455872d6e8
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jul 20 21:33:52 2012 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index 480f72e,5b0e865..ab02f88
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,18 +1,25 @@@
+libreoffice (1:3.5.5-1) UNRELEASED; urgency=low
+
+ * new upstream release
+ - caches fontconfig font substitutions (closes: #631308)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 13 Jun 2012 19:25:17 +0200
+
+ libreoffice (1:3.5.4-6) unstable; urgency=medium
+
+ * debian/patches/CVE-2012-2334-clip-max-entries.diff: add additional
+ fix for CVE-2012-2334 from Florian Weimer which we missed to apply
+ so far..
+
+ * debian/templates/soffice-template.desktop.in: fix Icon= (remove
+ obsolete 3), thanks Miros◈aw Zalewski (closes: #678313)
+ * debian/control.in: make -filter-mobiledev Break libreoffice-core
+ (<< 1:3.5~) (closes: #633929)
+ * debian/control.mediawiki.in: add missing epoch to -core dependency
+ * debian/rules: re-enable -gcj
+
+ -- Rene Engelhard <rene@debian.org> Tue, 17 Jul 2012 20:21:31 +0200
+
libreoffice (1:3.5.4-5) unstable; urgency=low
* debian/patches/evolution-3.4.diff: as name says,
diff --combined rules
index 5fd2f04,939fef0..4a30c15
--- 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.5.3
# 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.5.3 libreoffice-3.5.5.3
GIT_TAG=libreoffice-$(lo_sources_ver)
GIT_BRANCH=tag-libreoffice-$(lo_sources_ver)
endif
@@@ -443,7 -443,7 +443,7 @@@ ifeq (ia64,$(findstring ia64,$(OOO_OPEN
endif
endif
ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
- BUILD_JARS_NATIVE=n
+ BUILD_JARS_NATIVE=y
endif
ifeq "$(PACKAGE_NSPLUGIN)" "y"
@@@ -1377,10 -1377,10 +1377,10 @@@ endi
>> debian/control < debian/control.ure.in
ifeq "$(ENABLE_JAVA)" "y"
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
- ifeq "$(BUILD_JARS_NATIVE)" "y"
+ # ifeq "$(BUILD_JARS_NATIVE)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.gcj.in
- endif
+ # endif
endif
endif
ifneq "$(OOO_NSPLUGIN_ARCHS)" ""
--
LibreOffice packaging repository
Reply to: