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

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.3-2-1-g8c2d1e7



The following commit has been merged in the master branch:
commit 8c2d1e7be588a726b60b8fd384b2e02bca5cba8a
Author: Rene Engelhard <rene@debian.org>
Date:   Wed May 9 08:49:12 2012 +0200

    make .IGNORE in ignore-sc_cellrangesbase-fails.diff actually work

diff --git a/changelog b/changelog
index 0fef14d..2dd4b1f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.5.3-3) UNRELEASED; urgency=low
+
+  * debian/patches/ignore-sc_cellrangesbase-fails.diff:
+    make .IGNORE actually work
+
+ -- Rene Engelhard <rene@debian.org>  Tue, 08 May 2012 11:37:43 +0200
+
 libreoffice (1:3.5.3-2) unstable; urgency=low
 
   * upload to unstable
diff --git a/patches/ignore-sc_cellrangesbase-fails.diff b/patches/ignore-sc_cellrangesbase-fails.diff
index 8888976..73c9c21 100644
--- a/patches/ignore-sc_cellrangesbase-fails.diff
+++ b/patches/ignore-sc_cellrangesbase-fails.diff
@@ -1,9 +1,9 @@
---- a/sc/Module_sc.mk-old	2012-04-27 09:24:15.000000000 +0200
-+++ b/sc/Module_sc.mk	2012-04-27 15:34:11.698071587 +0200
-@@ -48,4 +48,6 @@
- ))
- #    JunitTest_sc_unoapi \
+--- a/sc/CppunitTest_sc_cellrangesbase.mk-old	2012-05-09 01:02:30.359827642 +0200
++++ b/sc/CppunitTest_sc_cellrangesbase.mk	2012-05-09 01:04:10.416323786 +0200
+@@ -139,4 +139,6 @@
+ # b) explicitly depend on the sc resource files needed at unit-test runtime
+ $(call gb_CppunitTest_get_target,sc_cellrangesbase) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc
  
-+.IGNORE: $(call gb_Module_get_target,CppunitTest_sc_cellrangesbase)
++.IGNORE: $(call gb_CppunitTest_get_target,sc_cellrangesbase)
 +
  # vim: set noet sw=4 ts=4:

-- 
LibreOffice packaging repository


Reply to: