[DebianGIS-dev] r2926 - in packages/libhdf4/trunk/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2010-09-13 20:59:34 +0000 (Mon, 13 Sep 2010)
New Revision: 2926

Modified:
   packages/libhdf4/trunk/debian/changelog
   packages/libhdf4/trunk/debian/control
   packages/libhdf4/trunk/debian/control.in
   packages/libhdf4/trunk/debian/patches/hdfi.h
Log:
Reverted changes which are not compatible with current freezing state of squeeze.
Fixing a FTBS.



Modified: packages/libhdf4/trunk/debian/changelog
===================================================================
--- packages/libhdf4/trunk/debian/changelog	2010-09-12 15:00:03 UTC (rev 2925)
+++ packages/libhdf4/trunk/debian/changelog	2010-09-13 20:59:34 UTC (rev 2926)
@@ -1,14 +1,10 @@
-libhdf4 (4.2r4-11) UNRELEASED; urgency=low
+libhdf4 (4.2r4-11) unstable; urgency=high
 
-  [ David Paleino ]
-  * debian/control: build-depend on libjpeg-dev rather than
-    libjpeg62-dev (Closes: #569249)
+  * Fixes hdfi.h for SPARC. Thanks Aurelien Jarno.
+    (closes: #596603)
 
-  [ Francesco Paolo Lovergine ]
-  * Policy bumped to 3.8.4, without changes.
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 13 Sep 2010 22:56:23 +0200
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 09 Mar 2010 12:57:13 +0100
-
 libhdf4 (4.2r4-10) unstable; urgency=low
 
   * Revised hdfi.h to support superH arch.

Modified: packages/libhdf4/trunk/debian/control
===================================================================
--- packages/libhdf4/trunk/debian/control	2010-09-12 15:00:03 UTC (rev 2925)
+++ packages/libhdf4/trunk/debian/control	2010-09-13 20:59:34 UTC (rev 2926)
@@ -5,7 +5,7 @@
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Build-depends: debhelper (>= 7), sharutils, libjpeg-dev, zlib1g-dev, bison, flex, groff, autotools-dev, quilt,
  chrpath, gfortran
-Standards-Version: 3.8.4
+Standards-Version: 3.8.3
 Homepage: http://www.hdfgroup.com/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/libhdf4/trunk
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/libhdf4/trunk

Modified: packages/libhdf4/trunk/debian/control.in
===================================================================
--- packages/libhdf4/trunk/debian/control.in	2010-09-12 15:00:03 UTC (rev 2925)
+++ packages/libhdf4/trunk/debian/control.in	2010-09-13 20:59:34 UTC (rev 2926)
@@ -5,7 +5,7 @@
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Build-depends: debhelper (>= 7), sharutils, libjpeg-dev, zlib1g-dev, bison, flex, groff, autotools-dev, quilt,
  chrpath, gfortran
-Standards-Version: 3.8.4
+Standards-Version: 3.8.3
 Homepage: http://www.hdfgroup.com/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/libhdf4/trunk
 Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/libhdf4/trunk

Modified: packages/libhdf4/trunk/debian/patches/hdfi.h
===================================================================
--- packages/libhdf4/trunk/debian/patches/hdfi.h	2010-09-12 15:00:03 UTC (rev 2925)
+++ packages/libhdf4/trunk/debian/patches/hdfi.h	2010-09-13 20:59:34 UTC (rev 2926)
@@ -58,7 +58,7 @@
  
  #ifndef MIPSEL
  #define MIPSEL
-@@ -1039,6 +1049,340 @@
+@@ -1039,6 +1049,349 @@
  #endif /* INTEL86 */
  #endif /* !(defined(macintosh) || defined(MAC)) */
  
@@ -144,14 +144,23 @@
 +typedef unsigned char     uint8;
 +typedef short int         int16;
 +typedef unsigned short int uint16;
++#ifdef _LP64 /* 64-bit environment */
++typedef int               int32;
++typedef unsigned int      uint32;
++#else /* 32-bit environment */
 +typedef long int          int32;
 +typedef unsigned long int uint32;
++#endif
 +typedef int               intn;
 +typedef unsigned int      uintn;
 +typedef float             float32;
 +typedef double            float64;
 +typedef long              intf;     /* size of INTEGERs in Fortran compiler */
++#ifdef _LP64 /* 64-bit environment */
++typedef long              hdf_pint_t;   /* an integer the same size as a pointer */
++#else /* 32-bit environment */
 +typedef int               hdf_pint_t;   /* an integer the same size as a pointer */
++#endif
 +#define FNAME_POST_UNDERSCORE
 +#define _fcdtocp(desc) (desc)
 +