[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.4_dfsg-3-33-g8c23d04



The following commit has been merged in the debian-experimental-3.5 branch:
commit e38cb19ad4f0121a7ae7452861b76dd2d9546e37
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Oct 22 21:28:45 2012 +0200

    don't add version from librsvg*.shlibs (as for libebook) as we dlopen() it anyway.

diff --git a/changelog b/changelog
index 27ab036..44a0018 100644
--- a/changelog
+++ b/changelog
@@ -18,6 +18,8 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
       extremely slowing down the install target...
     - document truth and remove alpha from supported architectures
     - fix typo in finding gcj dir detection, thanks Rico Tzschichholz
+    - don't add version from librsvg*.shlibs (as for libebook) as we
+      dlopen() it anyway.
   * debian/control.in:
     - remove obsolete sharutils, po-debconf and wget | curl build-deps
 
diff --git a/rules b/rules
index b83e4f3..8d8d2bc 100755
--- a/rules
+++ b/rules
@@ -2832,7 +2832,7 @@ endif
 ifeq "$(ENABLE_LIBRSVG)" "y"
   ifeq "$(SYSTEM_LIBRSVG)" "y"
 	# dlopen()'ed only for some weird reason (even when --with-librsvg=internal!)
-	perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/librsvg*.shlibs | awk '{ print $$3,$$4,$$5 }')/' $(PKGDIR)-core.substvars
+	perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/librsvg*.shlibs | awk '{ print $$3 }')/' $(PKGDIR)-core.substvars
   endif
 endif
 	# don't make uno-libs3 depend on ure...

-- 
LibreOffice packaging repository


Reply to: