[med-svn] [mricron] 03/03: Packaging update for new release; closes #729160

[Michael Hanke]

This is an automated email from the git hooks/post-receive script.

mih pushed a commit to annotated tag debian/0.20140804.1_dfsg.1-1
in repository mricron.

commit 848fdf63ad1512739567db526c7c9262ccff20df
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Fri Oct 3 15:32:45 2014 +0200

    Packaging update for new release; closes #729160
    
    Caused by special casing pigz on big-endian
---
 debian/changelog              |  9 +++++++++
 debian/control                |  1 +
 debian/patches/debian_version |  4 ++--
 debian/patches/pigz_compat    | 19 +++++++++++++++++++
 debian/patches/series         |  1 +
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e83fd31..1dc1aba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mricron (0.20140804.1~dfsg.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add pigz to recommended packages.
+  * Add patch to remove pigz special case on big-endian architectures
+    (Closes: #729160).
+
+ -- Michael Hanke <mih at debian.org>  Fri, 03 Oct 2014 15:19:39 +0200
+
 mricron (0.20140704.1~dfsg.1-1) unstable; urgency=medium
 
   * New upstream release (Closes: #722056).
diff --git a/debian/control b/debian/control
index 2d8f65b..78f57b3 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Package: mricron
 Section: science
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mricron-data
+Recommends: pigz
 Suggests: mricron-doc, fsl
 Description: magnetic resonance image conversion, viewing and analysis
  This is a GUI-based visualization and analysis tool for (functional) magnetic
diff --git a/debian/patches/debian_version b/debian/patches/debian_version
index b23c6e8..64cc4bb 100644
--- a/debian/patches/debian_version
+++ b/debian/patches/debian_version
@@ -9,8 +9,8 @@ index 589205f..e695faa 100755
          SysUtils,classes,IniFiles,
          {$IFDEF GUI} forms,userdir, dialogs{$ELSE}dialogsx{$ENDIF};
  const
--     kMRIcronVersDate = '4JULY2014';
-+     kMRIcronVersDate = '4JULY2014 (Debian)';
+-     kMRIcronVersDate = '4AUGUST2014';
++     kMRIcronVersDate = '4AUGUST2014 (Debian)';
       {$IFDEF FPC}
        {$ifdef CPU32}
        kMRIcronVers = kMRIcronVersDate+' 32bit BSD License';
diff --git a/debian/patches/pigz_compat b/debian/patches/pigz_compat
new file mode 100644
index 0000000..ee9c56d
--- /dev/null
+++ b/debian/patches/pigz_compat
@@ -0,0 +1,19 @@
+From: Michael Hanke <michael.hanke at gmail.com>
+Subject: No exceptions for pigz
+
+In Debian it does exist on powerpc and other big-endian architectures.
+
+--- a/dcm2nii/niftiutil.pas
++++ b/dcm2nii/niftiutil.pas
+@@ -202,11 +202,6 @@
+   exename: string;
+   {$IFDEF DARWIN}  temp: string;{$ENDIF}
+ begin
+-  {$IFDEF ENDIAN_BIG}
+-  Msg('pigz not available with PowerPC computers');
+-  result := '';
+-  exit;
+-  {$ENDIF}
+   for i := 1 to 2 do begin
+   {$IFDEF UNIX}
+     if i = 1 then
diff --git a/debian/patches/series b/debian/patches/series
index f2231ad..295a993 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+pigz_compat
 syntax_fixes
 lazarus_modern
 debian_paths

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mricron.git