[med-svn] r10314 - in trunk/packages/libics/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2012-04-04 10:56:23 +0000 (Wed, 04 Apr 2012)
New Revision: 10314

Modified:
   trunk/packages/libics/trunk/debian/changelog
   trunk/packages/libics/trunk/debian/patches/bigendianfix.patch
Log:
Use DEP3

Modified: trunk/packages/libics/trunk/debian/changelog
===================================================================
--- trunk/packages/libics/trunk/debian/changelog	2012-04-04 10:48:02 UTC (rev 10313)
+++ trunk/packages/libics/trunk/debian/changelog	2012-04-04 10:56:23 UTC (rev 10314)
@@ -1,3 +1,9 @@
+libics (1.5.2-2) UNRELEASED; urgency=low
+
+  * Pull svn rev 10 to fix big endian issues
+
+ -- Mathieu Malaterre <malat at debian.org>  Wed, 04 Apr 2012 12:53:48 +0200
+
 libics (1.5.2-1) unstable; urgency=low
 
   * Initial Debian Upload (Closes: #666082)

Modified: trunk/packages/libics/trunk/debian/patches/bigendianfix.patch
===================================================================
--- trunk/packages/libics/trunk/debian/patches/bigendianfix.patch	2012-04-04 10:48:02 UTC (rev 10313)
+++ trunk/packages/libics/trunk/debian/patches/bigendianfix.patch	2012-04-04 10:56:23 UTC (rev 10314)
@@ -1,7 +1,13 @@
-Index: libics_write.c
+Description: Fix big endian test
+Forwarded: Cris Luengo <clluengo users.sourceforge.net>
+Author: Cris Luengo <clluengo users.sourceforge.net>
+Applied-Upstream: 10, http://libics.svn.sf.net/viewvc/libics?view=revision&revision=10
+Last-Update: 2012-04-04
+
+Index: libics-1.5.2/libics_write.c
 ===================================================================
---- libics_write.c	(revision 9)
-+++ libics_write.c	(revision 10)
+--- libics-1.5.2.orig/libics_write.c	2010-06-07 13:51:39.000000000 +0200
++++ libics-1.5.2/libics_write.c	2012-04-04 12:48:59.000000000 +0200
 @@ -321,7 +321,7 @@
  static Ics_Error WriteIcsRep (Ics_Header* IcsStruct, FILE* fp)
  {
@@ -30,19 +36,10 @@
     problem = IcsFirstToken (line, ICSTOK_REPRES);
     problem |= IcsAddToken (line, ICSTOK_BYTEO);
     for (ii = 0; ii < (int)IcsGetDataTypeSize (IcsStruct->Imel.DataType) - 1; ii++) {
-@@ -608,7 +614,7 @@
-    ICSINIT;
-    char line[ICS_LINE_LENGTH];
- 
--   if ((IcsStruct->Version ~= 1) && (IcsStruct->SrcFile[0] == '\0')) {
-+   if ((IcsStruct->Version != 1) && (IcsStruct->SrcFile[0] == '\0')) {
-       error = IcsFirstToken (line, ICSTOK_END);
-       ICSTR( error, IcsErr_FailWriteLine );
-       IcsAppendChar (line, ICS_EOL);
-Index: test_ics2a.c
+Index: libics-1.5.2/test_ics2a.c
 ===================================================================
---- test_ics2a.c	(revision 9)
-+++ test_ics2a.c	(revision 10)
+--- libics-1.5.2.orig/test_ics2a.c	2010-06-16 18:19:22.000000000 +0200
++++ libics-1.5.2/test_ics2a.c	2012-04-04 12:48:59.000000000 +0200
 @@ -52,6 +52,8 @@
     IcsSetLayout (ip, dt, ndims, dims);
     IcsGetIdsName (datafile, argv[1]);
@@ -52,23 +49,10 @@
     IcsSetCompression (ip, IcsCompr_uncompressed, 0);
     retval = IcsClose (ip);
     if (retval != IcsErr_Ok) {
-Index: README
+Index: libics-1.5.2/TODO
 ===================================================================
---- README	(revision 9)
-+++ README	(revision 10)
-@@ -138,6 +138,8 @@
-    - Fixed documentation and made explicit the current default to version
-    2.0 files.
-    - Added a "links" page to the documentation.
-+   - Fixed tests 1 and 2a, which didn't work for big-endian machines.
-+   - IcsWriteIcs() no longer overwrites data in the ByteOrder array.
- 
- 
- version 1.5.2
-Index: TODO
-===================================================================
---- TODO	(revision 9)
-+++ TODO	(revision 10)
+--- libics-1.5.2.orig/TODO	2010-06-18 09:52:48.000000000 +0200
++++ libics-1.5.2/TODO	2012-04-04 12:48:59.000000000 +0200
 @@ -21,3 +21,7 @@
    with some NULL pointers. Maybe even macros?
  
@@ -77,10 +61,10 @@
 +- test_ics2a shows an issue with endianness and the ICS file pointing to
 +  an existing data file: we have no good way of determining the endianness
 +  of this data file, and are stuck with using the machine's endinanness.
-Index: test_ics1.sh
+Index: libics-1.5.2/test_ics1.sh
 ===================================================================
---- test_ics1.sh	(revision 9)
-+++ test_ics1.sh	(revision 10)
+--- libics-1.5.2.orig/test_ics1.sh	2010-06-18 10:20:07.000000000 +0200
++++ libics-1.5.2/test_ics1.sh	2012-04-04 12:48:59.000000000 +0200
 @@ -1,2 +1 @@
 -#!/bin/bash
 -./test_ics1 $srcdir/test/testim.ics result_v1.ics && cmp -s $srcdir/test/testim.ids result_v1.ids && (( `diff $srcdir/test/testim.ics result_v1.ics | grep -v filename | grep -v -- --- | grep -v 3c3 | wc -l` == 0 ))