debian/patches/jessie-dsc-patch adjusted and linked to be applied on …

…zesty as well
neurodebian · Aug 30, 2017 · c0fac4b · c0fac4b
1 parent 4209d5d
commit c0fac4b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git 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 <debian@onerussian.com>  Wed, 30 Aug 2017 11:11:00 -0400
 

diff --git 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
@@ -0,0 +1 @@
+jessie-dsc-patch