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

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-3-3-g9994a32



The following commit has been merged in the master branch:
commit 9994a324642c9aa3c016573056dd5b32687fb995
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Sep 30 03:16:58 2011 +0200

    fix libsslX.Y.Z in -dbgs suggests for multiarch

diff --git a/changelog b/changelog
index 547f9c5..92f6f7c 100644
--- a/changelog
+++ b/changelog
@@ -6,8 +6,9 @@ libreoffice (1:3.4.3-4) UNRELEASED; urgency=low
   * debian/rules:
     - use jh_manifest instead of manual MANIFEST.MF hacking for jurt.jar 
     - build-depend on libpoppler-cpp-dev
+    - fix libsslX.Y.Z in -dbgs suggests for multiarch
 
- -- Rene Engelhard <rene@debian.org>  Thu, 29 Sep 2011 23:50:56 +0000
+ -- Rene Engelhard <rene@debian.org>  Fri, 30 Sep 2011 03:15:57 +0200
 
 libreoffice (1:3.4.3-3) unstable; urgency=low
 
diff --git a/rules b/rules
index c308074..3b599ae 100755
--- a/rules
+++ b/rules
@@ -551,7 +551,11 @@ endif
 
 ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libssl-dev
+  ifeq "$(SQUEEZE_BACKPORTS)" "y"
 	DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/libssl.so | cut -d"." -f3,4,5)-dbg
+  else
+	DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libssl.so | cut -d"." -f3,4,5)-dbg
+endif
 endif
 
 	BUILD_DEPS += , libdb-dev

-- 
LibreOffice packaging repository


Reply to: