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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-162-g4c27b19



The following commit has been merged in the debian-experimental-3.5 branch:
commit 4c27b198db8f9011fbb5ed274fd44a475fdac4f8
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Dec 20 17:06:26 2011 +0000

    fix patch apply again..

diff --git a/patches/disable-broken-checks.diff b/patches/disable-broken-checks.diff
index c9945d9..8475633 100644
--- a/patches/disable-broken-checks.diff
+++ b/patches/disable-broken-checks.diff
@@ -1,5 +1,5 @@
---- unoxml/Module_unoxml.mk-old	2011-12-20 17:15:05.000000000 +0100
-+++ unoxml/Module_unoxml.mk	2011-12-20 17:15:34.000000000 +0100
+--- libreoffice-3.5.0/unoxml/Module_unoxml.mk-old	2011-12-20 17:15:05.000000000 +0100
++++ libreoffice-3.5.0/unoxml/Module_unoxml.mk	2011-12-20 17:15:34.000000000 +0100
 @@ -35,7 +35,6 @@
  
  $(eval $(call gb_Module_add_subsequentcheck_targets,unoxml,\
diff --git a/patches/series b/patches/series
index c2d090c..04e0067 100644
--- a/patches/series
+++ b/patches/series
@@ -22,5 +22,4 @@ fix-armhf-build-in-bridges.diff
 disable-user-template-nonsense.diff
 fix-mailmerge-install.diff
 disable-broken-checks.diff
-disable-user-template-nonsense.diff
 visioimport-is-a-graphicfilter.diff

-- 
LibreOffice packaging repository


Reply to: