From c0fac4b2223229b007e12ac62d32739247acbf20 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Wed, 30 Aug 2017 15:11:43 -0400 Subject: [PATCH] debian/patches/jessie-dsc-patch adjusted and linked to be applied on zesty as well --- debian/changelog | 2 ++ debian/patches/jessie-dsc-patch | 10 +++++----- debian/patches/zesty-dsc-patch | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) create mode 120000 debian/patches/zesty-dsc-patch diff --git a/debian/changelog b/debian/changelog index 2cd8617b..7f586c11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dcm2niix (1:1.0.20170818+git8-gdd1d994-1) neurodebian; urgency=medium * New upstream snapshot from v1.0.20170818-8-gdd1d994 + * debian/patches/jessie-dsc-patch adjusted and linked to be applied on zesty + as well -- Yaroslav Halchenko Wed, 30 Aug 2017 11:11:00 -0400 diff --git a/debian/patches/jessie-dsc-patch b/debian/patches/jessie-dsc-patch index 2c8aff89..c8deb1ac 100644 --- a/debian/patches/jessie-dsc-patch +++ b/debian/patches/jessie-dsc-patch @@ -1,17 +1,17 @@ diff --git a/debian/control b/debian/control -index 3086559..f7a8584 100644 +index 1013dc4..695e2cf 100644 --- a/debian/control +++ b/debian/control -@@ -7,7 +7,6 @@ Priority: optional +@@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 9~), cmake, pkg-config, libboost-dev, - libturbojpeg0-dev, + libopenjp2-7-dev, libyaml-cpp-dev, zlib1g-dev, - Standards-Version: 3.9.8 diff --git a/debian/rules b/debian/rules -index 7d138ab..2ee10b5 100755 +index 575ceb6..6466bdb 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ export DH_VERBOSE = 1 @@ -20,6 +20,6 @@ index 7d138ab..2ee10b5 100755 -DUSE_STATIC_RUNTIME:BOOL=OFF \ - -DUSE_SYSTEM_TURBOJPEG:BOOL=ON \ + -DUSE_SYSTEM_TURBOJPEG:BOOL=OFF \ + -DUSE_OPENJPEG:BOOL=ON \ -DUSE_SYSTEM_ZLIB:BOOL=ON \ -DBATCH_VERSION:BOOL=ON - diff --git a/debian/patches/zesty-dsc-patch b/debian/patches/zesty-dsc-patch new file mode 120000 index 00000000..69a56dc5 --- /dev/null +++ b/debian/patches/zesty-dsc-patch @@ -0,0 +1 @@ +jessie-dsc-patch \ No newline at end of file