diff -Nru dff-1.3.0+dfsg.1/debian/changelog dff-1.3.0+dfsg.1/debian/changelog --- dff-1.3.0+dfsg.1/debian/changelog 2013-12-27 03:49:20.000000000 +0000 +++ dff-1.3.0+dfsg.1/debian/changelog 2014-01-14 08:52:08.000000000 +0000 @@ -1,16 +1,10 @@ -dff (1.3.0+dfsg.1-3ubuntu2) trusty; urgency=medium +dff (1.3.0+dfsg.1-4) unstable; urgency=high - * No change rebuild against libicu52 + * Fix broken swig detection (Closes: #731743) + Urgency high, fix an RC bug + * Bump Standards Version to 3.9.5 - -- Dimitri John Ledkov Fri, 27 Dec 2013 03:49:20 +0000 - -dff (1.3.0+dfsg.1-3ubuntu1) trusty; urgency=low - - * Rip out swig version string from CMake, as 2.0.10 is less than - 2.0.7. Swig 2.0.7 build-dep is enforced in build dependency. - * Rebuild against libav 9. - - -- Dmitrijs Ledkovs Sat, 09 Nov 2013 17:28:20 +0000 + -- Pierre Chifflier Tue, 14 Jan 2014 09:51:19 +0100 dff (1.3.0+dfsg.1-3) unstable; urgency=low diff -Nru dff-1.3.0+dfsg.1/debian/control dff-1.3.0+dfsg.1/debian/control --- dff-1.3.0+dfsg.1/debian/control 2013-11-09 17:28:20.000000000 +0000 +++ dff-1.3.0+dfsg.1/debian/control 2014-01-14 08:44:47.000000000 +0000 @@ -1,8 +1,7 @@ Source: dff Section: admin Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Pierre Chifflier +Maintainer: Pierre Chifflier Build-Depends: debhelper (>= 9.0), cmake, python-all-dev (>= 2.6.6-3~), @@ -28,7 +27,7 @@ flex, bison X-Python-Version: >= 2.7 -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: http://www.digital-forensic.org/ #Vcs-Git: git://git.debian.org/collab-maint/dff.git #Vcs-Browser: http://git.debian.org/?p=collab-maint/dff.git;a=summary diff -Nru dff-1.3.0+dfsg.1/debian/patches/04-fix-swig-detection.patch dff-1.3.0+dfsg.1/debian/patches/04-fix-swig-detection.patch --- dff-1.3.0+dfsg.1/debian/patches/04-fix-swig-detection.patch 1970-01-01 00:00:00.000000000 +0000 +++ dff-1.3.0+dfsg.1/debian/patches/04-fix-swig-detection.patch 2014-01-14 08:34:37.000000000 +0000 @@ -0,0 +1,18 @@ +Index: dff/CMakeLists.txt +=================================================================== +--- dff.orig/CMakeLists.txt 2013-07-25 17:27:44.692360502 +0200 ++++ dff/CMakeLists.txt 2014-01-13 23:58:43.137066661 +0100 +@@ -23,11 +23,9 @@ + find_package(SWIG REQUIRED) + include(${SWIG_USE_FILE}) + +-STRING (COMPARE LESS "${SWIG_VERSION}" "2.0.7" SWIGOK) +- +-if (${SWIGOK}) ++if ("${SWIG_VERSION}" VERSION_LESS "2.0.7") + MESSAGE(FATAL_ERROR "Need SWIG version >= 2.0.7 (current version is ${SWIG_VERSION})") +-endif (${SWIGOK}) ++endif ("${SWIG_VERSION}" VERSION_LESS "2.0.7") + + set(CMAKE_INCLUDE_PATH "${INCLUDEDIR}") + set(CMAKE_LIBRARY_PATH "${LIBDIR}") diff -Nru dff-1.3.0+dfsg.1/debian/patches/rip-out-version-check.patch dff-1.3.0+dfsg.1/debian/patches/rip-out-version-check.patch --- dff-1.3.0+dfsg.1/debian/patches/rip-out-version-check.patch 2013-11-09 17:37:20.000000000 +0000 +++ dff-1.3.0+dfsg.1/debian/patches/rip-out-version-check.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Description: Rip out incorrect swig version string from CMake, as 2.0.10 is less than -Author: Dmitrijs Ledkovs - ---- dff-1.3.0+dfsg.1.orig/CMakeLists.txt -+++ dff-1.3.0+dfsg.1/CMakeLists.txt -@@ -23,8 +23,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DI - find_package(SWIG REQUIRED) - include(${SWIG_USE_FILE}) - --STRING (COMPARE LESS "${SWIG_VERSION}" "2.0.7" SWIGOK) -- - if (${SWIGOK}) - MESSAGE(FATAL_ERROR "Need SWIG version >= 2.0.7 (current version is ${SWIG_VERSION})") - endif (${SWIGOK}) diff -Nru dff-1.3.0+dfsg.1/debian/patches/series dff-1.3.0+dfsg.1/debian/patches/series --- dff-1.3.0+dfsg.1/debian/patches/series 2013-11-09 17:36:57.000000000 +0000 +++ dff-1.3.0+dfsg.1/debian/patches/series 2014-01-14 08:34:37.000000000 +0000 @@ -1,3 +1,3 @@ 02-do-not-rebuild-translation-files.patch 03-fix-ftbfs-libav9.patch -rip-out-version-check.patch +04-fix-swig-detection.patch