[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-82-g1309fd5

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-4.1 branch:
commit 1309fd5934987927a0e364314f669885b62bee83
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Mar 13 10:22:43 2013 +0100

    git update; add conditional for system-libmwaw

diff --git a/changelog b/changelog
index f05f339..fd9821d 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1~git20130312-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~alpha1~git20130313-1) UNRELEASED; urgency=low
 
   * new upstream snapshot
 
diff --git a/control b/control
index 8272cc6..e23b8e7 100644
--- a/control
+++ b/control
@@ -65,6 +65,7 @@ Build-Depends: ant (>= 1.7.0),
                liblpsolve55-dev (>= 5.5.0.13-5+b1),
                libmdds-dev (>= 0.7.0),
                libmspub-dev,
+               libmwaw-dev,
                libmysqlclient-dev,
                libmysqlcppconn-dev (>= 1.1.0~r791),
                libmythes-dev (>= 2:1.2),
diff --git a/rules b/rules
index 536e85a..e365f64 100755
--- a/rules
+++ b/rules
@@ -152,6 +152,7 @@ SYSTEM_STUFF += libwpd libwpg libwps
 SYSTEM_STUFF += libvisio
 SYSTEM_STUFF += libcdr
 SYSTEM_STUFF += libmspub
+SYSTEM_STUFF += libmwaw
 #SYSTEM_STUFF += xmlsec
 BUILD_CAIROCANVAS=y
 SYSTEM_STUFF += cairo
@@ -487,7 +488,7 @@ endif
 # Debian WHeezy
 ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "wheezy-backports"
   BUGS=mailto:debian-backports@lists.debian.org
-  SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub mdds liblangtag orcus, $(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw mdds liblangtag orcus, $(SYSTEM_STUFF))
   WHEEZY_BACKPORT=y
 endif
 ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@ -965,6 +966,9 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
   ifneq (,$(filter libmspub, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libmspub-dev
   endif
+  ifneq (,$(filter libmwaw, $(SYSTEM_STUFF)))
+	BUILD_DEPS += , libmwaw-dev
+  endif
   ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libcmis-dev (>= 0.3.1)
   endif

-- 
LibreOffice packaging repository