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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-2-73-ge57f76e



The following commit has been merged in the debian-experimental-3.5 branch:
commit e543e933984a482f234b7734824d8d24ce32610a
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Mar 12 22:17:23 2012 +0100

    prevent .obsolete dir in sax

diff --git a/patches/prevent-sax-obsolete-dir.diff b/patches/prevent-sax-obsolete-dir.diff
new file mode 100644
index 0000000..3fb5d0d
--- /dev/null
+++ b/patches/prevent-sax-obsolete-dir.diff
@@ -0,0 +1,17 @@
+From 4572e00ec358f507e64cbab9d9f3430ea6f97d51 Mon Sep 17 00:00:00 2001
+From: Matúš Kukan <matus.kukan@gmail.com>
+Date: Wed, 04 Jan 2012 22:06:57 +0000
+Subject: sax: this had to be accidentally added when merging
+
+---
+diff --git a/sax/prj/build.lst b/sax/prj/build.lst
+index 940ef70..34e520f 100644
+--- a/sax/prj/build.lst
++++ b/sax/prj/build.lst
+@@ -1,4 +1,2 @@
+ ax	sax	:	offapi cppuhelper EXPAT:expat comphelper LIBXSLT:libxslt NULL
+ ax	sax\prj									nmake	-	all	ax_prj NULL
+-
+-ax  sax\test							nmake	-	all ax_test NULL
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index 0d4d4e1..2591c75 100644
--- a/patches/series
+++ b/patches/series
@@ -34,3 +34,4 @@ debian-hardened-buildflags.diff
 fix-quickstart-shutdown.diff
 bibliography-no-crash-if-no-base.diff
 pyuno_fix_python2.diff
+prevent-sax-obsolete-dir.diff

-- 
LibreOffice packaging repository


Reply to: