[med-svn] r4814 - trunk/packages/staden-io-lib/trunk/debian

Sat May 22 14:27:58 UTC 2010

Author: plessy
Date: 2010-05-22 14:27:58 +0000 (Sat, 22 May 2010)
New Revision: 4814

Added:
   trunk/packages/staden-io-lib/trunk/debian/endianness.patch
Modified:
   trunk/packages/staden-io-lib/trunk/debian/changelog
   trunk/packages/staden-io-lib/trunk/debian/control
Log:
Restrict staden-io-lib on i386 and amd64, which are the only architectures where I am confident it works.


Modified: trunk/packages/staden-io-lib/trunk/debian/changelog
===================================================================

--- trunk/packages/staden-io-lib/trunk/debian/changelog	2010-05-21 09:34:57 UTC (rev 4813)
+++ trunk/packages/staden-io-lib/trunk/debian/changelog	2010-05-22 14:27:58 UTC (rev 4814)
@@ -1,3 +1,14 @@
+staden-io-lib (1.12.2-2) unstable; urgency=low
+
+  * Restrict staden-io-lib to i386 and amd64 platforms, which are the
+    only ones where it is known to work and be used (debian/control).
+  * Provide a patch for helping people interested in building this
+    package on other architectures (debian/endianness.patch).
+  * Incremented Standards-Version to reflect conformance with Policy 3.8.4
+    (debian/control, no changes needed).
+
+ -- Charles Plessy <plessy at debian.org>  Sat, 22 May 2010 22:50:35 +0900
+
 staden-io-lib (1.12.2-1) unstable; urgency=low
 
   * New upstream release: extra options in srf2fastq and API changes in

Modified: trunk/packages/staden-io-lib/trunk/debian/control
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/control	2010-05-21 09:34:57 UTC (rev 4813)
+++ trunk/packages/staden-io-lib/trunk/debian/control	2010-05-22 14:27:58 UTC (rev 4814)
@@ -6,13 +6,13 @@
 Uploaders: Charles Plessy <plessy at debian.org>
 Build-Depends:
  debhelper (>= 7), autotools-dev, zlib1g-dev
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://staden.sourceforge.net/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/staden-io-lib/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/staden-io-lib/trunk/
 
 Package: staden-io-lib-utils
-Architecture: any
+Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: programs for maniuplating DNA sequencing files
  The io_lib from the Staden package is a library of file reading and writing
@@ -27,7 +27,7 @@
 
 Package: libstaden-read-dev
 Section: libdevel
-Architecture: any
+Architecture: i386 amd64
 Depends: libstaden-read1 (= ${binary:Version}), ${misc:Depends}
 Description: development files for libstaden-read
  This package contains the header and development files needed to build
@@ -40,7 +40,7 @@
 
 Package: libstaden-read1
 Section: libs
-Architecture: any
+Architecture: i386 amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Staden library for reading and writing DNA sequencing results
  This package contains the Staden io_lib, that is renamed in Debian and

Added: trunk/packages/staden-io-lib/trunk/debian/endianness.patch
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/endianness.patch	                        (rev 0)
+++ trunk/packages/staden-io-lib/trunk/debian/endianness.patch	2010-05-22 14:27:58 UTC (rev 4814)
@@ -0,0 +1,107 @@
+Description: Corrects description of machine endianness.
+Bug-Debian: 579239
+Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3005086&group_id=100316&atid=627058
+Author: Bastian Blank <waldi at debian.org>
+
+diff -Nru staden-io-lib-1.12.2/io_lib/os.h staden-io-lib-1.12.2/io_lib/os.h
+--- staden-io-lib-1.12.2/io_lib/os.h	2009-09-15 13:29:23.000000000 +0000
++++ staden-io-lib-1.12.2/io_lib/os.h	2010-04-27 16:54:18.000000000 +0000
+@@ -189,91 +189,19 @@
+ /*
+  *-----------------------------------------------------------------------------
+  * Machine endianness.
+- * These are overridden at the end when using autoconf, but are here for
+- * when being built as part of the Staden Package.
+  *-----------------------------------------------------------------------------
+  */
+ 
+-/*
+- * First guess via autoconf. This is here as endianness can only be computed
+- * by autoconf for the machine we're building on. Hence cross-compilations
+- * or MacOSX "fat binaries" cannot work via autoconf in this manner.
+- *
+- * These provide a default for when the machine specific ifdefs below do you
+- * catch your system type.
+- */
+-#ifdef HAVE_CONFIG_H
+-#    if defined(WORDS_BIGENDIAN)
+-#        ifdef SP_LITTLE_ENDIAN
+-#            undef SP_LITTLE_ENDIAN
+-#        endif
+-#        define SP_BIG_ENDIAN
+-#    else
+-#        ifdef SP_BIG_ENDIAN
+-#            undef SP_BIG_ENDIAN
+-#        endif
+-#        define SP_LITTLE_ENDIAN
+-#    endif
+-#endif
+-
+-/*
+- * x86 equivalents
+- */
+-#if defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64)
+-#  if defined(SP_BIG_ENDIAN)
+-#    undef SP_BIG_ENDIAN
+-#  endif
+-#  define SP_LITTLE_ENDIAN
+-#endif
+-
+-/*
+- * DEC Alpha
+- */
+-#if defined(__alpha__) || defined(__alpha)
+-#  if defined(SP_LITTLE_ENDIAN)
+-#    undef SP_LITTLE_ENDIAN
+-#  endif
+-#  define SP_BIG_ENDIAN
+-#endif
+-
+-/*
+- * SUN Sparc
+- */
+-#if defined(__sparc__) || defined(__sparc)
+-#  if defined(SP_LITTLE_ENDIAN)
+-#    undef SP_LITTLE_ENDIAN
+-#  endif
+-#  define SP_BIG_ENDIAN
+-#endif
++#include <endian.h>
+ 
+-/*
+- * PowerPC
+- */
+-#if defined(__ppc__) || defined(__ppc)
+-#  if defined(SP_LITTLE_ENDIAN)
+-#    undef SP_LITTLE_ENDIAN
+-#  endif
+-#  define SP_BIG_ENDIAN
+-#endif
+-
+-/* Some catch-alls */
+-#if defined(__LITTLE_ENDIAN__) || defined(__LITTLEENDIAN__)
++#if __BYTE_ORDER == __LITTLE_ENDIAN
+ #    define SP_LITTLE_ENDIAN
+-#endif
+-
+-#if defined(__BIG_ENDIAN__) || defined(__BIGENDIAN__)
++#elif __BYTE_ORDER == __BIG_ENDIAN
+ #    define SP_BIG_ENDIAN
++#else
++#    error Unknown endianess
+ #endif
+ 
+-#if defined(SP_BIG_ENDIAN) && defined(SP_LITTLE_ENDIAN)
+-#    error Both BIG and LITTLE endian defined. Fix os.h and/or Makefile
+-#endif
+-
+-#if !defined(SP_BIG_ENDIAN) && !defined(SP_LITTLE_ENDIAN)
+-#    error Neither BIG nor LITTLE endian defined. Fix os.h and/or Makefile
+-#endif
+-
+-
+ /*
+  *-----------------------------------------------------------------------------
+  * Typedefs for data sizes. Note there's umpteen versions of typedefs here
+
+


