[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-6-58-g7a208db



The following commit has been merged in the debian-experimental-3.6 branch:
commit 7709c0ddf7088a14aee78332344e696a4380d2ae
Author: Rene Engelhard <rene@debian.org>
Date:   Thu May 3 13:52:33 2012 +0200

    don't run slowcheck on build

diff --git a/changelog b/changelog
index 4fe812c..89fc160 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,8 @@ libreoffice (1:3.6.0~alpha0~git20120503-1) UNRELEASED; urgency=low
     - fixes splashscreen location in multi-monitor setups
       (closes: #657444, #431473)
 
+  * debian/patches/build-dont-run-slowcheck.diff: as name says
+
   * debian/rules:
     - new conditionals for: doxygen, libcdr, liblcms2
     - remove liblucene2-java stuff; now clucene is used
diff --git a/patches/build-dont-run-slowcheck.diff b/patches/build-dont-run-slowcheck.diff
new file mode 100644
index 0000000..43e1bf5
--- /dev/null
+++ b/patches/build-dont-run-slowcheck.diff
@@ -0,0 +1,26 @@
+diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
+index e75444f..ec22d92 100644
+--- a/solenv/gbuild/Module.mk
++++ b/solenv/gbuild/Module.mk
+@@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT=
+ debugrun :| build
+ endif
+ 
+-all : build unitcheck
++all : build
+ 	$(info $(gb_Module_BUILDHINT))
+ 
+ build : 
+diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
+index 30f7c7b..cec5821 100755
+--- a/solenv/bin/build.pl
++++ b/solenv/bin/build.pl
+@@ -1837,7 +1837,7 @@ sub run_job {
+             return 1 if (! $path =~ /prj$/ );
+             mkpath("$workdir/Logs");
+             my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM};
+-            my $gbuild_target = 'all slowcheck';
++            my $gbuild_target = 'all';
+             if ($registered_name =~ /tail_build\/prj$/ )
+             {
+                 $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM};
diff --git a/patches/series b/patches/series
index ec39b07..ec0ddd4 100644
--- a/patches/series
+++ b/patches/series
@@ -26,3 +26,4 @@ gtk3-hack-explicit-gmodule.diff
 pyuno-py3-module.diff
 #tests-fix-build-with-jdk7.diff
 ignore-sc_cellrangesbase-fails.diff
++build-dont-run-slowcheck.diff

-- 
LibreOffice packaging repository


Reply to: