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

Charles Plessy plessy at alioth.debian.org
Wed May 27 01:48:59 UTC 2009 

Author: plessy
Date: 2009-05-27 01:48:58 +0000 (Wed, 27 May 2009)
New Revision: 3436

Added:
   trunk/packages/staden-io-lib/trunk/debian/patches/libtoolization-and-renaming.patch
Removed:
   trunk/packages/staden-io-lib/trunk/debian/patches/libtoolization.patch
Modified:
   trunk/packages/staden-io-lib/trunk/debian/patches/series
Log:
Cosmetic renaming.


Copied: trunk/packages/staden-io-lib/trunk/debian/patches/libtoolization-and-renaming.patch (from rev 3435, trunk/packages/staden-io-lib/trunk/debian/patches/libtoolization.patch)
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/patches/libtoolization-and-renaming.patch	                        (rev 0)
+++ trunk/packages/staden-io-lib/trunk/debian/patches/libtoolization-and-renaming.patch	2009-05-27 01:48:58 UTC (rev 3436)
@@ -0,0 +1,155 @@
+diff --git a/configure.in b/configure.in
+index dab45b5..fffd268 100644
+--- a/configure.in
++++ b/configure.in
+@@ -7,7 +7,7 @@ AM_MAINTAINER_MODE
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
+-AC_PROG_RANLIB
++AC_PROG_LIBTOOL
+ 
+ dnl Check for libcurl and zlib
+ LIBCURL_CHECK_CONFIG(,,[have_curl=yes], [have_curl=no])
+diff --git a/io_lib/Makefile.am b/io_lib/Makefile.am
+index c10175f..4a270e9 100644
+--- a/io_lib/Makefile.am
++++ b/io_lib/Makefile.am
+@@ -1,6 +1,6 @@
+-lib_LIBRARIES = libread.a
++lib_LTLIBRARIES = libstaden-read.la
+ 
+-libread_a_SOURCES = \
++libstaden_read_la_SOURCES = \
+ 	Read.c \
+ 	Read.h \
+ 	scf_extras.c \
+@@ -67,8 +67,8 @@ libread_a_SOURCES = \
+ 	os.h \
+ 	stdio_hack.h
+ 
+-libread_a_CPPFLAGS = @LIBCURL_CPPFLAGS@
++libstaden_read_la_CPPFLAGS = @LIBCURL_CPPFLAGS@
+ 
+-#libread_a_LDFLAGS = -avoid-version
++#libstaden-read_la_LDFLAGS = -avoid-version
+ 
+ INCLUDES = -I${top_srcdir}
+diff --git a/progs/Makefile.am b/progs/Makefile.am
+index 4744daa..2b1660a 100644
+--- a/progs/Makefile.am
++++ b/progs/Makefile.am
+@@ -1,86 +1,86 @@
+ bin_PROGRAMS = convert_trace makeSCF extract_seq extract_qual extract_fastq index_tar scf_dump scf_info scf_update get_comment hash_tar hash_extract hash_list trace_dump hash_sff append_sff ztr_dump illumina2srf srf2illumina srf_dump_all srf_index_hash srf_extract_linear srf_extract_hash srf2fastq srf2fasta srf_filter srf_info srf_list
+ 
+ convert_trace_SOURCES = convert_trace.c
+-convert_trace_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++convert_trace_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ get_comment_SOURCES = get_comment.c
+-get_comment_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++get_comment_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ makeSCF_SOURCES = makeSCF.c
+-makeSCF_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++makeSCF_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ extract_seq_SOURCES = extract_seq.c
+-extract_seq_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++extract_seq_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ extract_qual_SOURCES = extract_qual.c
+-extract_qual_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++extract_qual_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ extract_fastq_SOURCES = extract_fastq.c
+-extract_fastq_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++extract_fastq_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ index_tar_SOURCES = index_tar.c
+ 
+ scf_dump_SOURCES = scf_dump.c
+-scf_dump_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++scf_dump_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ scf_info_SOURCES = scf_info.c
+-scf_info_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++scf_info_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ scf_update_SOURCES = scf_update.c
+-scf_update_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++scf_update_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ hash_tar_SOURCES = hash_tar.c
+-hash_tar_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++hash_tar_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ hash_list_SOURCES = hash_list.c
+-hash_list_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++hash_list_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ hash_sff_SOURCES = hash_sff.c
+-hash_sff_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++hash_sff_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ append_sff_SOURCES = append_sff.c
+-append_sff_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++append_sff_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ hash_extract_SOURCES = hash_extract.c
+-hash_extract_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++hash_extract_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ trace_dump_SOURCES = trace_dump.c
+-trace_dump_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++trace_dump_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ ztr_dump_SOURCES = ztr_dump.c
+-ztr_dump_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++ztr_dump_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ illumina2srf_SOURCES = solexa2srf.c
+-illumina2srf_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++illumina2srf_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ srf2illumina_SOURCES = srf2solexa.c
+-srf2illumina_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++srf2illumina_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ srf2fastq_SOURCES = srf2fastq.c
+-srf2fastq_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++srf2fastq_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ srf2fasta_SOURCES = srf2fasta.c
+-srf2fasta_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++srf2fasta_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ srf_dump_all_SOURCES = srf_dump_all.c
+-srf_dump_all_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++srf_dump_all_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ srf_extract_linear_SOURCES = srf_extract_linear.c
+-srf_extract_linear_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++srf_extract_linear_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ srf_extract_hash_SOURCES = srf_extract_hash.c
+-srf_extract_hash_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++srf_extract_hash_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ srf_index_hash_SOURCES = srf_index_hash.c
+-srf_index_hash_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++srf_index_hash_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ srf_filter_SOURCES = srf_filter.c
+-srf_filter_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++srf_filter_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ srf_info_SOURCES = srf_info.c
+-srf_info_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++srf_info_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ srf_list_SOURCES = srf_list.c
+-srf_list_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
++srf_list_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
+ 
+ INCLUDES= -I${top_srcdir}


Property changes on: trunk/packages/staden-io-lib/trunk/debian/patches/libtoolization-and-renaming.patch
___________________________________________________________________
Added: svn:mergeinfo
   + 

Deleted: trunk/packages/staden-io-lib/trunk/debian/patches/libtoolization.patch
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/patches/libtoolization.patch	2009-05-26 13:25:19 UTC (rev 3435)
+++ trunk/packages/staden-io-lib/trunk/debian/patches/libtoolization.patch	2009-05-27 01:48:58 UTC (rev 3436)
@@ -1,155 +0,0 @@
-diff --git a/configure.in b/configure.in
-index dab45b5..fffd268 100644
---- a/configure.in
-+++ b/configure.in
-@@ -7,7 +7,7 @@ AM_MAINTAINER_MODE
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_INSTALL
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- 
- dnl Check for libcurl and zlib
- LIBCURL_CHECK_CONFIG(,,[have_curl=yes], [have_curl=no])
-diff --git a/io_lib/Makefile.am b/io_lib/Makefile.am
-index c10175f..4a270e9 100644
---- a/io_lib/Makefile.am
-+++ b/io_lib/Makefile.am
-@@ -1,6 +1,6 @@
--lib_LIBRARIES = libread.a
-+lib_LTLIBRARIES = libstaden-read.la
- 
--libread_a_SOURCES = \
-+libstaden_read_la_SOURCES = \
- 	Read.c \
- 	Read.h \
- 	scf_extras.c \
-@@ -67,8 +67,8 @@ libread_a_SOURCES = \
- 	os.h \
- 	stdio_hack.h
- 
--libread_a_CPPFLAGS = @LIBCURL_CPPFLAGS@
-+libstaden_read_la_CPPFLAGS = @LIBCURL_CPPFLAGS@
- 
--#libread_a_LDFLAGS = -avoid-version
-+#libstaden-read_la_LDFLAGS = -avoid-version
- 
- INCLUDES = -I${top_srcdir}
-diff --git a/progs/Makefile.am b/progs/Makefile.am
-index 4744daa..2b1660a 100644
---- a/progs/Makefile.am
-+++ b/progs/Makefile.am
-@@ -1,86 +1,86 @@
- bin_PROGRAMS = convert_trace makeSCF extract_seq extract_qual extract_fastq index_tar scf_dump scf_info scf_update get_comment hash_tar hash_extract hash_list trace_dump hash_sff append_sff ztr_dump illumina2srf srf2illumina srf_dump_all srf_index_hash srf_extract_linear srf_extract_hash srf2fastq srf2fasta srf_filter srf_info srf_list
- 
- convert_trace_SOURCES = convert_trace.c
--convert_trace_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+convert_trace_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- get_comment_SOURCES = get_comment.c
--get_comment_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+get_comment_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- makeSCF_SOURCES = makeSCF.c
--makeSCF_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+makeSCF_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- extract_seq_SOURCES = extract_seq.c
--extract_seq_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+extract_seq_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- extract_qual_SOURCES = extract_qual.c
--extract_qual_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+extract_qual_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- extract_fastq_SOURCES = extract_fastq.c
--extract_fastq_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+extract_fastq_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- index_tar_SOURCES = index_tar.c
- 
- scf_dump_SOURCES = scf_dump.c
--scf_dump_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+scf_dump_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- scf_info_SOURCES = scf_info.c
--scf_info_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+scf_info_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- scf_update_SOURCES = scf_update.c
--scf_update_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+scf_update_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- hash_tar_SOURCES = hash_tar.c
--hash_tar_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+hash_tar_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- hash_list_SOURCES = hash_list.c
--hash_list_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+hash_list_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- hash_sff_SOURCES = hash_sff.c
--hash_sff_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+hash_sff_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- append_sff_SOURCES = append_sff.c
--append_sff_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+append_sff_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- hash_extract_SOURCES = hash_extract.c
--hash_extract_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+hash_extract_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- trace_dump_SOURCES = trace_dump.c
--trace_dump_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+trace_dump_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- ztr_dump_SOURCES = ztr_dump.c
--ztr_dump_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+ztr_dump_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- illumina2srf_SOURCES = solexa2srf.c
--illumina2srf_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+illumina2srf_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- srf2illumina_SOURCES = srf2solexa.c
--srf2illumina_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+srf2illumina_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- srf2fastq_SOURCES = srf2fastq.c
--srf2fastq_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+srf2fastq_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- srf2fasta_SOURCES = srf2fasta.c
--srf2fasta_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+srf2fasta_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- srf_dump_all_SOURCES = srf_dump_all.c
--srf_dump_all_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+srf_dump_all_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- srf_extract_linear_SOURCES = srf_extract_linear.c
--srf_extract_linear_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+srf_extract_linear_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- srf_extract_hash_SOURCES = srf_extract_hash.c
--srf_extract_hash_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+srf_extract_hash_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- srf_index_hash_SOURCES = srf_index_hash.c
--srf_index_hash_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+srf_index_hash_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- srf_filter_SOURCES = srf_filter.c
--srf_filter_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+srf_filter_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- srf_info_SOURCES = srf_info.c
--srf_info_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+srf_info_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- srf_list_SOURCES = srf_list.c
--srf_list_LDADD = $(top_builddir)/io_lib/libread.a @LIBZ@ @LIBCURL@
-+srf_list_LDADD = -L$(top_builddir)/io_lib/.libs -lstaden-read @LIBZ@ @LIBCURL@
- 
- INCLUDES= -I${top_srcdir}

Modified: trunk/packages/staden-io-lib/trunk/debian/patches/series
===================================================================
--- trunk/packages/staden-io-lib/trunk/debian/patches/series	2009-05-26 13:25:19 UTC (rev 3435)
+++ trunk/packages/staden-io-lib/trunk/debian/patches/series	2009-05-27 01:48:58 UTC (rev 3436)
@@ -1 +1 @@
-libtoolization.patch
+libtoolization-and-renaming.patch

More information about the debian-med-commit mailing list