[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.3_rc1-3-9-gac94395

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

The following commit has been merged in the debian-experimental-4.0 branch:
commit ac943951486cb0c0d4a85d7b61e94f4ae524d6ac
Author: Rene Engelhard <rene@debian.org>
Date:   Fri May 3 05:27:49 2013 +0200

    Revert "don't create gtk dependencies in -core for libplllo.so, downgrade to suggests"
    
    This reverts commit ca256e1b44cf2f18c7dbc4a5d9d181e6d652566b.

diff --git a/changelog b/changelog
index 56181b7..25c9813 100644
--- a/changelog
+++ b/changelog
@@ -10,8 +10,6 @@ libreoffice (1:4.0.3~rc3-1) UNRELEASED; urgency=low
   * debian/uno-libs3.symbols: update and cleanup - use (symver) instead
     of *@...
   * debian/copyright: mention gbuild (and its makefiles) are MPL-2.0
-  * debian/rules, debian/control.in: don't create gtk dependencies in -core
-    for libplllo.so, downgrade to suggests
 
  -- Rene Engelhard <rene@debian.org>  Thu, 02 May 2013 21:06:26 +0200
 
diff --git a/control b/control
index c471b66..67deea5 100644
--- a/control
+++ b/control
@@ -299,7 +299,6 @@ Depends: fontconfig,
          libreoffice-common (>> ${base-version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Suggests: ${shlibs:Suggests}
 Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
         hunspell-ar (<< 0.0.0+20080110-1.1),
         hunspell-da (<< 1:3.1.0-3),
diff --git a/control.in b/control.in
index 85d07c0..7159d4b 100644
--- a/control.in
+++ b/control.in
@@ -164,7 +164,6 @@ Depends: fontconfig,
          libreoffice-common (>> ${base-version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Suggests: ${shlibs:Suggests}
 Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
         hunspell-ar (<< 0.0.0+20080110-1.1),
         hunspell-da (<< 1:3.1.0-3),
diff --git a/rules b/rules
index d6706c1..997f358 100755
--- a/rules
+++ b/rules
@@ -1082,7 +1082,6 @@ ifeq "$(BUILD_GTK)" "n"
 	CONFIGURE_FLAGS+= --disable-gtk
 	DEBHELPER_OPTIONS+= -Nlibreoffice-gtk -Nlibreoffice-gnome
 	CONFIGURE_FLAGS+= --with-theme="$(patsubst galaxy,default,$(IMAGES))"
-	SHLIBS_OVERRIDE += -Xlibpllo.so
 else
 	BUILD_DEPS += , libgtk2.0-dev (>= 2.10)
 endif
@@ -2963,10 +2962,6 @@ ifneq (,$(filter redland, $(SYSTEM_STUFF)))
 	# which quickly can get outdated
 	perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/$(shell dpkg -S /usr/lib/`objdump -p $(PKGDIR)-core/$(OODIR)/program/libunordf*.so | grep NEEDED | grep librdf | awk '{ print $$2 }'` | cut -d: -f1).shlibs | awk '{ print $$3,$$4,$$5 }')/' $(PKGDIR)-core.substvars
 endif
-ifeq "$(BUILD_GTK)" "y"
-	dpkg-shlibdeps -dSuggests -T$(PKGDIR)-core.substvars \
-		$(PKGDIR)-core/$(OODIR)/program/libpllo.so
-endif
 	# don't make uno-libs3 depend on ure...
 	perl -pi -e 's/, ure$$//' debian/uno-libs3.substvars
 	# .. and prevent ure to depend on itself..

-- 
LibreOffice packaging repository