From 9aa0377cd2e59b2366e62e76afd63f83271ba157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= Date: Thu, 1 Jul 2010 16:50:00 +0200 Subject: [PATCH] Use the system libarchive and not the embedded copy. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kai Wasserbäch --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/rules | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 554c729dd..d85b76800 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cmake (2.8.2-2) UNRELEASED; urgency=low + + * debian/control: Added libarchive-dev to Build-Depends. + * debian/rules: Use system libarchive. + + -- Kai Wasserbäch Thu, 01 Jul 2010 16:42:43 +0200 + cmake (2.8.2-1) unstable; urgency=low * New upstream release: diff --git a/debian/control b/debian/control index 9ba1fd6b3..aee9c9387 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Modestas Vainius Uploaders: A. Maitland Bottoms , Kai Wasserbäch Build-Depends: debhelper (>= 7.3), libcurl4-gnutls-dev, libxmlrpc-c3-dev, libexpat1-dev, zlib1g-dev, - libncurses5-dev, libqt4-dev (>= 4.4.0), procps + libncurses5-dev, libqt4-dev (>= 4.4.0), procps, libarchive-dev Standards-Version: 3.9.0 Vcs-Git: git://git.debian.org/git/collab-maint/cmake.git Vcs-Browser: http://git.debian.org/?p=collab-maint/cmake.git;a=summary diff --git a/debian/rules b/debian/rules index 1f6568aed..dfc3b72d1 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,7 @@ $(BUILD_FLAGS_FILE): # echo 'set(TARGET_SOVERSION CACHE STRING "" FORCE)' >> $@ # echo 'set(BUILD_DOCUMENTATION ON CACHE BOOL "" FORCE)' >> $@ # echo 'set(BUILD_DOXYGEN ON CACHE BOOL "" FORCE)' >> $@ + echo 'set(CMAKE_USE_SYSTEM_LIBARCHIVE YES CACHE BOOL "" FORCE)' >> $@ override_dh_auto_configure: $(BUILD_FLAGS_FILE) rm -rf Build && mkdir -p Build