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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0_rc2-2-21-g139f38a



The following commit has been merged in the debian-experimental-4.2 branch:
commit 139f38a135e67c6d279695f73f622a04b7cce7ea
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Jul 19 10:39:01 2013 +0200

    wheezys libatomic-ops-dev doesn't have atomic_ops.pc

diff --git a/rules b/rules
index 76844b4..ea64c56 100755
--- a/rules
+++ b/rules
@@ -544,7 +544,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 libmwaw libodfgen mdds liblangtag orcus harfbuzz, $(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw libodfgen mdds liblangtag orcus harfbuzz atomic-ops, $(SYSTEM_STUFF))
   PACKAGE_SDK_DOCS=n
   WHEEZY_BACKPORT=y
 endif
@@ -1117,7 +1117,7 @@ ifeq "$(ENABLE_MYSQLNATIVE)" "y"
 endif
 
 ifneq (,$(filter libatomic-ops, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , libatomic-ops-dev
+	BUILD_DEPS += , libatomic-ops-dev (>= 7.3~alpha3+git20121114-1)
 endif
 ifneq (,$(filter firebird, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , firebird-dev

-- 
LibreOffice packaging repository


Reply to: