[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-2-32-g1e431e8

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

The following commit has been merged in the debian-experimental-3.6 branch:
commit 1e431e8f9f8b22f636d97296c55b895fe621ff12
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Apr 9 16:06:50 2012 +0200

    unfuzzy patches

diff --git a/patches/gtk3-hack-explicit-gmodule.diff b/patches/gtk3-hack-explicit-gmodule.diff
index 38cb2c2..aae1702 100644
--- a/patches/gtk3-hack-explicit-gmodule.diff
+++ b/patches/gtk3-hack-explicit-gmodule.diff
@@ -2,14 +2,14 @@ For whatever reason we get undefined referenced to g_module_*.
 
 --- a/vcl/Library_vclplug_gtk3.mk-old	2012-04-01 23:57:18.435192769 +0200
 +++ b/vcl/Library_vclplug_gtk3.mk	2012-04-02 00:07:03.610693627 +0200
-@@ -55,6 +55,7 @@
+@@ -56,6 +56,7 @@
  $(eval $(call gb_Library_add_libs,vclplug_gtk3,\
      $$(GTK3_LIBS) \
      $$(GTHREAD_LIBS) \
 +    $$(GMODULE_LIBS) \
  ))
  
- $(eval $(call gb_Library_add_linked_libs,vclplug_gtk3,\
+ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
 --- a/configure.in-old	2012-04-01 23:57:57.091193585 +0200
 +++ a/configure.in	2012-04-01 23:58:51.926693332 +0200
 @@ -6996,10 +6996,13 @@
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index 6dfdb32..61a1a80 100644
--- a/patches/install-fixes.diff
+++ b/patches/install-fixes.diff
@@ -2,9 +2,9 @@ diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
 index eaabf9c..c1b1ec6 100755
 --- libreoffice-3.5.0/bin/distro-install-file-lists
 +++ libreoffice-3.5.0/bin/distro-install-file-lists
-@@ -2,6 +2,8 @@
- 
- . ./*[Ee]nv.[Hh]ost.sh
+@@ -8,6 +8,8 @@
+     exit 1
+ fi
  
 +export OOO_VENDOR=Debian
 +
diff --git a/patches/mention-java-common-package.diff b/patches/mention-java-common-package.diff
index 345227c..0d3f1a4 100644
--- a/patches/mention-java-common-package.diff
+++ b/patches/mention-java-common-package.diff
@@ -28,8 +28,8 @@ Index: logit/svtools/source/java/javainteractionhandler.cxx
  namespace svt
  {
  
-@@ -156,6 +157,9 @@
-             WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_INVALIDJAVASETTINGS ) );
+@@ -158,6 +158,9 @@
+ #endif
              String aTitle( SvtResId(STR_WARNING_INVALIDJAVASETTINGS));
              aWarningBox.SetText( aTitle );
 +            String aText = String(aWarningBox.GetMessText());
diff --git a/patches/search-usr-share-for-images.diff b/patches/search-usr-share-for-images.diff
index 72c0034..6b91fcc 100644
--- a/patches/search-usr-share-for-images.diff
+++ b/patches/search-usr-share-for-images.diff
@@ -83,7 +83,7 @@ index 03442fc..cfe6c45 100644
      }
      {
          rtl::OUString url(
-@@ -310,10 +325,7 @@ void ImplImageTree::resetZips() {
+@@ -310,10 +310,7 @@
          b.appendAscii(RTL_CONSTASCII_STRINGPARAM(".zip"));
          bool ok = u.Append(b.makeStringAndClear(), INetURLObject::ENCODE_ALL);
          OSL_ASSERT(ok); (void) ok;
@@ -91,9 +91,9 @@ index 03442fc..cfe6c45 100644
 -            std::make_pair(
 -                u.GetMainURL(INetURLObject::NO_DECODE),
 -                css::uno::Reference< css::container::XNameAccess >()));
-+        addUrlToZips(u.GetMainURL(INetURLObject::NO_DECODE));
++	addUrlToZips(u.GetMainURL(INetURLObject::NO_DECODE));
      }
-     if ( m_style.equals(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("default"))) )
+     if ( m_style == "default" )
      {
 @@ -321,9 +333,7 @@ void ImplImageTree::resetZips() {
              RTL_CONSTASCII_USTRINGPARAM(

-- 
LibreOffice packaging repository