[med-svn] r3773 - in trunk/packages/srf/trunk/debian: . patches

[Charles Plessy]

Author: plessy
Date: 2009-08-16 02:17:13 +0000 (Sun, 16 Aug 2009)
New Revision: 3773

Added:
   trunk/packages/srf/trunk/debian/patches/io_lib_renamed.patch
Modified:
   trunk/packages/srf/trunk/debian/copyright
   trunk/packages/srf/trunk/debian/patches/build_with_GCC-4.3.patch
   trunk/packages/srf/trunk/debian/patches/series
Log:
New patch to build with new io-lib, improved patch headers and copyright file.


Modified: trunk/packages/srf/trunk/debian/copyright
===================================================================
--- trunk/packages/srf/trunk/debian/copyright	2009-08-15 23:27:06 UTC (rev 3772)
+++ trunk/packages/srf/trunk/debian/copyright	2009-08-16 02:17:13 UTC (rev 3773)
@@ -1,24 +1,23 @@
-This package was debianized by Charles Plessy <plessy at debian.org> on
-Mon, 07 Jul 2008 19:06:55 +0900.
+Machine-readable license summary, see ’http://dep.debian.net/deps/dep5’.
 
-It was downloaded from <url://example.com>
+Name      :  SRF
+Contact   :  http://www.bcgsc.ca/mailman/listinfo/ssrformat
+Source    :  http://downloads.sourceforge.net/project/srf/srf/v0.1/srf-v0.1.tar.gz
 
-Upstream Author(s):
+Copyright :  2007, Asim Siddiqui
+License   :  Apache-2.0
+   
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-    <put author's name and email here>
-    <likewise for another author>
+       http://www.apache.org/licenses/LICENSE-2.0
 
-Copyright:
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
-    <Copyright (C) YYYY Name OfAuthor>
-    <likewise for another author>
-
-License:
-
-    <Put the license of the package here indented by 4 spaces>
-
-The Debian packaging is (C) 2008, Charles Plessy <plessy at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
+On Debian systems, the complete text of the Apache license version 2 is
+distributed in the file ’/usr/share/common-licenses/Apache-2.0’.

Modified: trunk/packages/srf/trunk/debian/patches/build_with_GCC-4.3.patch
===================================================================
--- trunk/packages/srf/trunk/debian/patches/build_with_GCC-4.3.patch	2009-08-15 23:27:06 UTC (rev 3772)
+++ trunk/packages/srf/trunk/debian/patches/build_with_GCC-4.3.patch	2009-08-16 02:17:13 UTC (rev 3773)
@@ -1,4 +1,6 @@
-Forwarded: http://sourceforge.net/tracker/index.php?func=detail&aid=2013397&group_id=194176&atid=948380
+Description: Adds missing headers to build with the GCC 4.3.
+Origin: vendor : Debian
+Forwarded: https://sourceforge.net/support/tracker.php?aid=2013397
 --- srf-0.1.orig/src/SRF_util.hh
 +++ srf-0.1/src/SRF_util.hh
 @@ -32,6 +32,7 @@

Added: trunk/packages/srf/trunk/debian/patches/io_lib_renamed.patch
===================================================================
--- trunk/packages/srf/trunk/debian/patches/io_lib_renamed.patch	                        (rev 0)
+++ trunk/packages/srf/trunk/debian/patches/io_lib_renamed.patch	2009-08-16 02:17:13 UTC (rev 3773)
@@ -0,0 +1,27 @@
+Description: Corrections after the io-lib has been renamed.
+ This patch replaces ’-lread’ by ’-lstaden-read’ in the makefile of the test
+ directory. Other parts of SRF do not need correction as they use io_lib-config.
+Author: Charles Plessy <plessy at debian.org>
+Forwarded: https://sourceforge.net/support/tracker.php?aid=2838340
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -15,5 +15,5 @@ testWriteSFF_LDADD = $(top_builddir)/src/libsrf.a @LDFLAGS@ $(LDLIB)
+ INCLUDES= -I${top_srcdir} $(SHELL io_lib-config --cflags) -I../src
+ 
+ AM_LDFLAGS=$(SHELL io_lib-config --libs)
+-LDLIB=-lstdc++ -lz -lcurl -lread
++LDLIB=-lstdc++ -lz -lcurl -lstaden-read
+ 
+diff --git a/test/Makefile.in b/test/Makefile.in
+index 9d17fd3..ff188b3 100644
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -181,7 +181,7 @@ testWriteSFF_SOURCES = testWriteSFF.cc
+ testWriteSFF_LDADD = $(top_builddir)/src/libsrf.a @LDFLAGS@ $(LDLIB)
+ INCLUDES = -I${top_srcdir} $(SHELL io_lib-config --cflags) -I../src
+ AM_LDFLAGS = $(SHELL io_lib-config --libs)
+-LDLIB = -lstdc++ -lz -lcurl -lread
++LDLIB = -lstdc++ -lz -lcurl -lstaden-read
+ all: all-am
+ 
+ .SUFFIXES:

Modified: trunk/packages/srf/trunk/debian/patches/series
===================================================================
--- trunk/packages/srf/trunk/debian/patches/series	2009-08-15 23:27:06 UTC (rev 3772)
+++ trunk/packages/srf/trunk/debian/patches/series	2009-08-16 02:17:13 UTC (rev 3773)
@@ -1 +1,2 @@
 build_with_GCC-4.3.patch
+io_lib_renamed.patch