[med-svn] [libfastahack] 06/07: Use Debian packaged libdisorder

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libfastahack.

commit 316b25f77049582ad7c2b6cb21b7906b1f5fe3c5
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jul 5 15:24:43 2016 +0200

    Use Debian packaged libdisorder
---
 debian/control                |  3 ++-
 debian/patches/autoconf.patch | 26 ++------------------------
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/debian/control b/debian/control
index 2d3b89b..b26f4cf 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
-               d-shlibs
+               d-shlibs,
+               libdisorder-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libfastahack.git
 Vcs-Git: https://anonscm.debian.org/git/debian-med/libfastahack.git
diff --git a/debian/patches/autoconf.patch b/debian/patches/autoconf.patch
index 111d6cc..b75075b 100644
--- a/debian/patches/autoconf.patch
+++ b/debian/patches/autoconf.patch
@@ -9,14 +9,14 @@ Description: Add autoconf stuff to enable simple library creation
 +
 +libfastahackdir=$(includedir)/fastahack
 +libfastahack_HEADERS=Fasta.h LargeFileSupport.h Region.h
-+libfastahack_la_SOURCES = Fasta.cpp split.cpp disorder.c
++libfastahack_la_SOURCES = Fasta.cpp split.cpp
 +libfastahack_la_LDFLAGS = -version-info @LIB_VERSION@
 +
 +libfastahack_la_CPPFLAGS = $(INCLUDES)
 +
 +bin_PROGRAMS = fastahack
 +fastahack_SOURCES = FastaHack.cpp
-+LDADD = -lfastahack
++LDADD = -lfastahack -ldisorder
 +
 +pkgconfigdir=$(libdir)/pkgconfig
 +pkgconfig_DATA = libfastahack.pc
@@ -144,25 +144,3 @@ Description: Add autoconf stuff to enable simple library creation
 -	rm -rf fastahack *.o stage
 -
 -.PHONY: clean
---- a/disorder.h
-+++ b/disorder.h
-@@ -24,6 +24,10 @@
- #ifndef __DISORDER_H_
- #define __DISORDER_H_
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+  
- /** Max number of bytes (i.e., tokens) */
- #define LIBDO_MAX_BYTES      256
- 
-@@ -59,4 +63,8 @@ float    get_max_entropy(void);
- /** Returns the ratio of entropy to maxentropy */
- float    get_entropy_ratio(void);
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+  
- #endif

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