[med-svn] r20746 - in trunk/packages/ltrsift/trunk/debian: . patches upstream

[Sascha Steinbiss]

Author: sascha-guest
Date: 2015-12-12 10:49:56 +0000 (Sat, 12 Dec 2015)
New Revision: 20746

Added:
   trunk/packages/ltrsift/trunk/debian/patches/use_deterministic_file_order
Modified:
   trunk/packages/ltrsift/trunk/debian/changelog
   trunk/packages/ltrsift/trunk/debian/patches/build_on_64bit
   trunk/packages/ltrsift/trunk/debian/patches/series
   trunk/packages/ltrsift/trunk/debian/rules
   trunk/packages/ltrsift/trunk/debian/upstream/metadata
Log:
work on compatibility and reproducibility


Modified: trunk/packages/ltrsift/trunk/debian/changelog
===================================================================
--- trunk/packages/ltrsift/trunk/debian/changelog	2015-12-12 07:05:13 UTC (rev 20745)
+++ trunk/packages/ltrsift/trunk/debian/changelog	2015-12-12 10:49:56 UTC (rev 20746)
@@ -1,26 +1,34 @@
+ltrsift (1.0.2-5) unstable; urgency=low
+
+  * use deterministic file order for build
+  * fix Metadata-Screenshots
+  * fix build on x32
+
+ -- Sascha Steinbiss <sascha at steinbiss.name>  Sat, 12 Dec 2015 09:38:35 +0000
+
 ltrsift (1.0.2-4) unstable; urgency=low
 
   * remove menu file
-  * remove timestamp from example .gz 
+  * remove timestamp from example .gz
 
  -- Sascha Steinbiss <sascha at steinbiss.name>  Sat, 17 Oct 2015 15:24:49 +0000
 
 ltrsift (1.0.2-3) unstable; urgency=low
 
-  * include patches 
+  * include patches
 
  -- Sascha Steinbiss <sascha at steinbiss.name>  Tue, 18 Nov 2014 20:12:45 +0000
 
 ltrsift (1.0.2-2) unstable; urgency=low
 
-  * fix FTBFS on 64bit archs 
+  * fix FTBFS on 64bit archs
   * lintian cleanups
 
  -- Sascha Steinbiss <sascha at steinbiss.name>  Tue, 18 Nov 2014 19:36:18 +0000
 
 ltrsift (1.0.2-1) unstable; urgency=low
 
-  * New upstream release 
+  * New upstream release
 
  -- Sascha Steinbiss <steinbiss at zbh.uni-hamburg.de>  Mon, 11 Mar 2013 13:39:05 +0100
 

Modified: trunk/packages/ltrsift/trunk/debian/patches/build_on_64bit
===================================================================
--- trunk/packages/ltrsift/trunk/debian/patches/build_on_64bit	2015-12-12 07:05:13 UTC (rev 20745)
+++ trunk/packages/ltrsift/trunk/debian/patches/build_on_64bit	2015-12-12 10:49:56 UTC (rev 20746)
@@ -9,14 +9,28 @@
  ifeq ($(64bit),yes)
    ifneq ($(MACHINE),x86_64)
      m64=yes
-@@ -41,7 +42,9 @@
+@@ -36,14 +37,19 @@
+   STATICBIN := bin/ltrsift_static bin/ltrsift_encode_static
  endif
  
- ifeq ($(m64),yes)
+-ifeq ($(m32),yes)
+-  CFLAGS += -m32
+-endif
++ifneq ($(x32),yes)
++  ifeq ($(m32),yes)
++    CFLAGS += -m32
++  endif
+ 
+-ifeq ($(m64),yes)
 -  CFLAGS += -m64
-+  ifeq (,$(filter $(MACHINE),arm64 ia64 alpha mips64 mips64el aarch64))
-+    CFLAGS += -m64
++  ifeq ($(m64),yes)
++    ifeq (,$(filter $(MACHINE),arm64 ia64 alpha mips64 mips64el aarch64))
++      CFLAGS += -m64
++    endif
 +  endif
  endif
  
++
  ifneq ($(errorcheck),no)
+   CFLAGS += -Werror
+ endif

Modified: trunk/packages/ltrsift/trunk/debian/patches/series
===================================================================
--- trunk/packages/ltrsift/trunk/debian/patches/series	2015-12-12 07:05:13 UTC (rev 20745)
+++ trunk/packages/ltrsift/trunk/debian/patches/series	2015-12-12 10:49:56 UTC (rev 20746)
@@ -1 +1,2 @@
 build_on_64bit
+use_deterministic_file_order

Added: trunk/packages/ltrsift/trunk/debian/patches/use_deterministic_file_order
===================================================================
--- trunk/packages/ltrsift/trunk/debian/patches/use_deterministic_file_order	                        (rev 0)
+++ trunk/packages/ltrsift/trunk/debian/patches/use_deterministic_file_order	2015-12-12 10:49:56 UTC (rev 20746)
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,7 @@
+ GT_FLAGS_STATIC := $(GT_FLAGS) `pkg-config --cflags --libs pango pangocairo`
+ GT_FLAGS += -lgenometools -L$(gt_prefix)/lib $(LDFLAGS)
+ GTK_FLAGS = `pkg-config --cflags --libs gtk+-2.0 gthread-2.0`
+-SOURCES := $(wildcard src/*.c)
++SOURCES := $(sort $(wildcard src/*.c))
+ OBJECTS := $(filter-out obj/src/ltrsift.o obj/src/ltrsift_encode.o, $(SOURCES:%.c=obj/%.o))
+ 
+ # system specific stuff (concerning 64bit compilation)

Modified: trunk/packages/ltrsift/trunk/debian/rules
===================================================================
--- trunk/packages/ltrsift/trunk/debian/rules	2015-12-12 07:05:13 UTC (rev 20745)
+++ trunk/packages/ltrsift/trunk/debian/rules	2015-12-12 10:49:56 UTC (rev 20746)
@@ -5,7 +5,15 @@
 export DESTDIR=$(CURDIR)/debian/tmp
 export gt_prefix=/usr
 
-BITS:=$(shell dpkg-architecture | grep DEB_BUILD_ARCH_BITS | cut -f 2 -d'=')
+DARCH:=$(shell dpkg-architecture | fgrep DEB_TARGET_ARCH= | cut -f 2 -d'=')
+BITS:=$(shell dpkg-architecture | fgrep DEB_TARGET_ARCH_BITS= | cut -f 2 -d'=')
+
+ifeq ($(DARCH),x32)
+  X32:=yes
+else
+  X32:=no
+endif
+
 ifeq ($(BITS),64)
   64BIT:=yes
 else
@@ -19,10 +27,10 @@
 	$(MAKE) cleanup
 
 override_dh_auto_build:
-	dh_auto_build --parallel -- 64bit=$(64BIT) errorcheck=no
+	dh_auto_build --parallel -- x32=$(X32) 64bit=$(64BIT) errorcheck=no
 
 override_dh_auto_test:
-	#dh_auto_test -- useshared=yes 64bit=$(64BIT) testthreads=5
+	#dh_auto_test -- useshared=yes x32=$(X32) 64bit=$(64BIT) testthreads=5
 
 override_dh_auto_install:
 	gunzip sample_data/dmel-2L-chromosome-r5.8.fasta.gz

Modified: trunk/packages/ltrsift/trunk/debian/upstream/metadata
===================================================================
--- trunk/packages/ltrsift/trunk/debian/upstream/metadata	2015-12-12 07:05:13 UTC (rev 20745)
+++ trunk/packages/ltrsift/trunk/debian/upstream/metadata	2015-12-12 10:49:56 UTC (rev 20746)
@@ -17,6 +17,6 @@
   URL: http://www.mobilednajournal.com/content/3/1/18/abstract
   eprint: http://www.mobilednajournal.com/content/pdf/1759-8753-3-18.pdf
 Repository: http://github.com/satta/ltrsift
-Screenshots: http://www.zbh.uni-hamburg.de/en/research/genome-informatics/software/ltrsift.html
+Screenshots: http://www.zbh.uni-hamburg.de/?id=378
 Watch: |
   https://github.com/satta/ltrsift/tags .*/zipball/v(\d[\d\.]+)