diff -Nru libreoffice-vanilla-5.0.1~rc2/debian/changelog libreoffice-vanilla-5.0.1/debian/changelog --- libreoffice-vanilla-5.0.1~rc2/debian/changelog 2015-08-27 11:31:26.000000000 +0000 +++ libreoffice-vanilla-5.0.1/debian/changelog 2015-08-28 10:15:03.000000000 +0000 @@ -1,3 +1,23 @@ +libreoffice-vanilla (1:5.0.1-0ubuntu1~minimal1~vivid1) vivid; urgency=medium + + * merge from wily for test patch and final tarballs + + -- Bjoern Michaelsen Fri, 28 Aug 2015 12:14:17 +0200 + +libreoffice-vanilla (1:5.0.1-0ubuntu1~minimal1~wily1) wily; urgency=medium + + * 5.0.1~rc2 is final + * also make ~minimal1 more significant than ~wily1, to prevent trouble here + later + + -- Bjoern Michaelsen Fri, 28 Aug 2015 12:10:36 +0200 + +libreoffice-vanilla (1:5.0.1~rc2-0ubuntu1~wily1~minimal3) wily; urgency=medium + + * yank over patches/disable-tiledrendering-test.diff from Debian package + + -- Bjoern Michaelsen Fri, 28 Aug 2015 11:35:16 +0200 + libreoffice-vanilla (1:5.0.1~rc2-0ubuntu1~vivid2~minimal2) vivid; urgency=medium * merge from wily for arch dependant test code diff -Nru libreoffice-vanilla-5.0.1~rc2/debian/patches/disable-tiledrendering-test.diff libreoffice-vanilla-5.0.1/debian/patches/disable-tiledrendering-test.diff --- libreoffice-vanilla-5.0.1~rc2/debian/patches/disable-tiledrendering-test.diff 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-vanilla-5.0.1/debian/patches/disable-tiledrendering-test.diff 2015-08-28 10:15:03.000000000 +0000 @@ -0,0 +1,17 @@ +diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk +index 000c2fe..6d7e1c6 100644 +--- a/libreofficekit/Module_libreofficekit.mk ++++ b/libreofficekit/Module_libreofficekit.mk +@@ -11,9 +11,9 @@ $(eval $(call gb_Module_Module,libreofficekit)) + + ifeq ($(OS),LINUX) + +-$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\ +- CppunitTest_libreofficekit_tiledrendering \ +-)) ++#$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\ ++# CppunitTest_libreofficekit_tiledrendering \ ++#)) + + ifneq ($(ENABLE_GTK),) + $(eval $(call gb_Module_add_targets,libreofficekit,\ diff -Nru libreoffice-vanilla-5.0.1~rc2/debian/patches/series libreoffice-vanilla-5.0.1/debian/patches/series --- libreoffice-vanilla-5.0.1~rc2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-vanilla-5.0.1/debian/patches/series 2015-08-28 10:15:03.000000000 +0000 @@ -0,0 +1 @@ +disable-tiledrendering-test.diff