[med-svn] [gmap] 10/11: d/changelog: update d/patches/install-data-local: refresh and remove obsoleted patches

Alex Mestiashvili malex-guest at moszumanska.debian.org
Sat Aug 22 06:26:00 UTC 2015


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

malex-guest pushed a commit to branch master
in repository gmap.

commit a3a5fd8c0ef4bd55f5268c4c57a6891eda3c1967
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Fri Aug 21 20:28:36 2015 +0200

    d/changelog: update
    d/patches/install-data-local: refresh and remove obsoleted patches
---
 debian/changelog                          |  8 ++++++--
 debian/patches/drop_tests_i386.patch      | 20 --------------------
 debian/patches/fix-big-endian-build.patch | 20 --------------------
 debian/patches/install-data-local         |  2 +-
 debian/patches/series                     |  1 -
 5 files changed, 7 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64ea4a4..e2e78f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gmap (2015-06-10-1) UNRELEASED; urgency=medium
+gmap (2015-07-23-1) UNRELEASED; urgency=medium
 
   * Imported Upstream version 2014-12-29
   * d/copyright: update year for debian/*
@@ -9,8 +9,12 @@ gmap (2015-06-10-1) UNRELEASED; urgency=medium
     big-endian architectures
   * Imported Upstream version 2015-06-10
   * d/patches: refresh
+  * d/control: add help2man Build-dep 
+  * d/*.1: removed 
+  * d/manpages: removed
+  * Imported Upstream version 2015-07-23
 
- -- Alexandre Mestiashvili <alex at biotec.tu-dresden.de>  Mon, 15 Jun 2015 11:35:07 +0200
+ -- Alexandre Mestiashvili <alex at biotec.tu-dresden.de>  Fri, 21 Aug 2015 20:24:29 +0200
 
 gmap (2014-12-24-2) experimental; urgency=medium
  
diff --git a/debian/patches/drop_tests_i386.patch b/debian/patches/drop_tests_i386.patch
deleted file mode 100644
index c74a775..0000000
--- a/debian/patches/drop_tests_i386.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: do not run tests on i386 because they fail.
-Author: Alex Mestiashvili <alex at biotec.tu-dresden.de>
---- gmap.orig/Makefile.in
-+++ gmap/Makefile.in
-@@ -252,7 +252,14 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = src util tests
-+ARCH := $(shell getconf LONG_BIT)
-+ifeq (64,$(ARCH))
-+    SUBDIRS = src util tests
-+endif
-+ifeq (32,$(ARCH))
-+    SUBDIRS = src util
-+endif
-+
- EXTRA_DIST = VERSION NOTICE config.site
- CLEANFILES = so_locations
- ACLOCAL_AMFLAGS = -I config
diff --git a/debian/patches/fix-big-endian-build.patch b/debian/patches/fix-big-endian-build.patch
deleted file mode 100644
index 5b47834..0000000
--- a/debian/patches/fix-big-endian-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix big-endian build
- This patch fixes a typo in src/iit-read-univ.c
- which caused a FTBFS on big-endian architectures.
-Author: Graham Inggs <graham at nerve.org.za>
-Forwarded: no
-Last-Update: 2015-03-15
---- gmap.orig/src/iit-read-univ.c
-+++ gmap/src/iit-read-univ.c
-@@ -1058,9 +1058,9 @@
-     }
-   } else {
-     for (i = 0; i < new->total_nintervals; i++) {
--      Bigendian_fread_uint(&unit4,fp);
-+      Bigendian_fread_uint(&uint4,fp);
-       new->intervals[i].low = (Univcoord_T) uint4;
--      Bigendian_fread_uint(&unit4,fp);
-+      Bigendian_fread_uint(&uint4,fp);
-       new->intervals[i].high = (Univcoord_T) uint4;
-       Bigendian_fread_int(&(new->intervals[i].type),fp);
-     }
diff --git a/debian/patches/install-data-local b/debian/patches/install-data-local
index 9027a0e..4bb0709 100644
--- a/debian/patches/install-data-local
+++ b/debian/patches/install-data-local
@@ -2,7 +2,7 @@ Description: Install data local
 
 --- gmap.orig/Makefile.in
 +++ gmap/Makefile.in
-@@ -740,7 +740,7 @@
+@@ -741,7 +741,7 @@
  
  
  install-data-local:
diff --git a/debian/patches/series b/debian/patches/series
index 89e0962..f01aaaa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix-big-endian-build.patch
 install-data-local

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



More information about the debian-med-commit mailing list