[med-svn] r1439 - in trunk/packages/fastlink/trunk/debian: . patches

tille at alioth.debian.org tille at alioth.debian.org
Mon Feb 18 17:15:42 UTC 2008 

Author: tille
Date: 2008-02-18 17:15:42 +0000 (Mon, 18 Feb 2008)
New Revision: 1439

Added:
   trunk/packages/fastlink/trunk/debian/patches/
   trunk/packages/fastlink/trunk/debian/patches/gcc33.patch
   trunk/packages/fastlink/trunk/debian/patches/series
Removed:
   trunk/packages/fastlink/trunk/debian/control.in
Modified:
   trunk/packages/fastlink/trunk/debian/changelog
   trunk/packages/fastlink/trunk/debian/control
   trunk/packages/fastlink/trunk/debian/get-orig-source
   trunk/packages/fastlink/trunk/debian/rules
Log:
New upstream patch


Modified: trunk/packages/fastlink/trunk/debian/changelog
===================================================================
--- trunk/packages/fastlink/trunk/debian/changelog	2008-02-18 17:12:56 UTC (rev 1438)
+++ trunk/packages/fastlink/trunk/debian/changelog	2008-02-18 17:15:42 UTC (rev 1439)
@@ -1,3 +1,12 @@
+fastlink (4.1P-fix94b-1) unstable; urgency=low
+
+  * New upstream patch
+  * Don't autogenerate debian/control, remove debian/control.in
+  * Build-Depends: quilt
+  * Standards-Version: 3.7.3 (No changes needed)
+
+ -- Andreas Tille <tille at debian.org>  Mon, 18 Feb 2008 17:54:17 +0100
+
 fastlink (4.1P-fix92-1) unstable; urgency=low
 
   * New upstream fix package

Modified: trunk/packages/fastlink/trunk/debian/control
===================================================================
--- trunk/packages/fastlink/trunk/debian/control	2008-02-18 17:12:56 UTC (rev 1438)
+++ trunk/packages/fastlink/trunk/debian/control	2008-02-18 17:15:42 UTC (rev 1439)
@@ -2,8 +2,8 @@
 Section: science
 Priority: optional
 Maintainer: Andreas Tille <tille at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5)
-Standards-Version: 3.7.2
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), quilt
+Standards-Version: 3.7.3
 XBCS-URL: http://www.ncbi.nlm.nih.gov/CBBResearch/Schaffer/fastlink.html
 
 Package: fastlink

Deleted: trunk/packages/fastlink/trunk/debian/control.in
===================================================================
--- trunk/packages/fastlink/trunk/debian/control.in	2008-02-18 17:12:56 UTC (rev 1438)
+++ trunk/packages/fastlink/trunk/debian/control.in	2008-02-18 17:15:42 UTC (rev 1439)
@@ -1,28 +0,0 @@
-Source: fastlink
-Section: science
-Priority: optional
-Maintainer: Andreas Tille <tille at debian.org>
-Build-Depends: @cdbs@
-Standards-Version: 3.7.2
-XBCS-URL: http://www.ncbi.nlm.nih.gov/CBBResearch/Schaffer/fastlink.html
-
-Package: fastlink
-Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: fastlink-doc
-Description: [Biology] A faster version of pedigree programs of Linkage
- Fastlink is much faster than the original Linkage but does not
- implement all the programs.
- .
- Homepage: http://www.ncbi.nlm.nih.gov/CBBResearch/Schaffer/fastlink.html
-XB-Tag: suite::debian-med:bio, legacy::science, made-of::lang:c
-
-Package: fastlink-doc
-Architecture: all
-Suggests: fastlink
-Description: [Biology] Some papers about fastlink
- You do not really need these papers about fastlink but it is highly
- recommended to study this documentation before starting with the
- tools of the fastlink package.
- .
- Homepage: http://www.ncbi.nlm.nih.gov/CBBResearch/Schaffer/fastlink.html

Modified: trunk/packages/fastlink/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/fastlink/trunk/debian/get-orig-source	2008-02-18 17:12:56 UTC (rev 1438)
+++ trunk/packages/fastlink/trunk/debian/get-orig-source	2008-02-18 17:15:42 UTC (rev 1439)
@@ -14,7 +14,7 @@
 
 PATCHVERSION=`grep -v "^ " fastlink/README.updates | tail -n 1 | sed 's/^\([0-9a-z]\+\)\..*/\1/'`
 UPSTREAMVERSION="${MAINVERSION}-fix${PATCHVERSION}"
-UPSTREAMDIR="{$NAME}-${UPSTREAMVERSION}"
+UPSTREAMDIR="${NAME}-${UPSTREAMVERSION}"
 
 mv "$NAME" "$UPSTREAMDIR"
 # Remove useless files

Added: trunk/packages/fastlink/trunk/debian/patches/gcc33.patch
===================================================================
--- trunk/packages/fastlink/trunk/debian/patches/gcc33.patch	                        (rev 0)
+++ trunk/packages/fastlink/trunk/debian/patches/gcc33.patch	2008-02-18 17:15:42 UTC (rev 1439)
@@ -0,0 +1,49 @@
+--- fastlink-4.1P-fix94b.orig/4.1P/src/parmodified.c
++++ fastlink-4.1P-fix94b/4.1P/src/parmodified.c
+@@ -12,7 +12,7 @@
+ and S. K. Gupta */
+ 
+ 
+-#include <sys/time.h>
++#include <time.h>
+ #include "commondefs.h"
+ #include "moddefs.h"
+ 
+--- fastlink-4.1P-fix94b.orig/4.1P/src/unknown.h
++++ fastlink-4.1P-fix94b/4.1P/src/unknown.h
+@@ -11,7 +11,7 @@
+    possibly remove "sys/" from the next 3 lines */
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <sys/time.h>
++#include <time.h>
+ /* Shriram: end */
+ 
+ #include <string.h>
+@@ -20,6 +20,7 @@
+ #if !defined(vms)
+ #include <malloc.h>
+ #endif
++#include <stdarg.h>
+ 
+ /* VMS: MAY NEED TO CHANGE --
+    comment out any of the next 3 lines for files your system can't find */
+--- fastlink-4.1P-fix94b.orig/4.1P/src/commondefs.h
++++ fastlink-4.1P-fix94b/4.1P/src/commondefs.h
+@@ -37,6 +37,7 @@
+ #if !defined(vms)
+ #include <malloc.h>
+ #endif
++#include <stdarg.h>
+ 
+ /* VMS: MAY NEED TO CHANGE --
+    comment out any of the next 3 lines for files your system can't find */
+@@ -1169,7 +1170,7 @@
+ extern int P_eof();
+ extern int P_eoln();
+ extern void check_constants();
+-extern void printErrMesg();
++extern void printErrMesg(char *format, ...);
+ extern void init_ped_loc_all();
+ #if ALLELE_SPEED
+ extern void adjust_alleles();

Added: trunk/packages/fastlink/trunk/debian/patches/series
===================================================================
--- trunk/packages/fastlink/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/fastlink/trunk/debian/patches/series	2008-02-18 17:15:42 UTC (rev 1439)
@@ -0,0 +1 @@
+gcc33.patch

Modified: trunk/packages/fastlink/trunk/debian/rules
===================================================================
--- trunk/packages/fastlink/trunk/debian/rules	2008-02-18 17:12:56 UTC (rev 1438)
+++ trunk/packages/fastlink/trunk/debian/rules	2008-02-18 17:15:42 UTC (rev 1439)
@@ -2,9 +2,7 @@
 # debian/rules for fastlink using cdbs
 # Andreas Tille <tille at debian.org>, GPL
 
-DEB_AUTO_UPDATE_DEBIAN_CONTROL := yes
-
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk

More information about the debian-med-commit mailing list