[med-svn] r15225 - in trunk/packages/coils/trunk/debian: . patches

Andreas Tille tille at moszumanska.debian.org
Wed Nov 20 22:12:05 UTC 2013


Author: tille
Date: 2013-11-20 22:12:05 +0000 (Wed, 20 Nov 2013)
New Revision: 15225

Added:
   trunk/packages/coils/trunk/debian/install
Removed:
   trunk/packages/coils/trunk/debian/README.source
   trunk/packages/coils/trunk/debian/dirs
   trunk/packages/coils/trunk/debian/ncoils.1
Modified:
   trunk/packages/coils/trunk/debian/changelog
   trunk/packages/coils/trunk/debian/compat
   trunk/packages/coils/trunk/debian/control
   trunk/packages/coils/trunk/debian/copyright
   trunk/packages/coils/trunk/debian/docs
   trunk/packages/coils/trunk/debian/patches/coils-wrap
   trunk/packages/coils/trunk/debian/patches/strcpy.patch
   trunk/packages/coils/trunk/debian/rules
Log:
Mass commit for 2002-4


Deleted: trunk/packages/coils/trunk/debian/README.source
===================================================================
--- trunk/packages/coils/trunk/debian/README.source	2013-11-20 22:11:16 UTC (rev 15224)
+++ trunk/packages/coils/trunk/debian/README.source	2013-11-20 22:12:05 UTC (rev 15225)
@@ -1,21 +0,0 @@
-coils for Debian
-================
-
-coils-wrap.patch
-----------------
-* coils-wrap now uses Getopt::Long
-* coils-wrap now also writes out raw prediction
-* coils-wrap input file format recognition improved
-* ncoils.c does not require the env var COILSDIR defined any more
-* -max_seq_len is not a cmd line argument any more
-* added coils-wrap.pod and ncoils.pod
-
-strcpy.patch
-------------
-The source is left untouched, except for
- * the removal of the ncoils-linux binary.
- * some compiler warnings
- * some security fixes
-
---
-  Steffen Moeller <moeller at debian.org>  Sat, 12 Jun 2010 16:12:33 +0200

Modified: trunk/packages/coils/trunk/debian/changelog
===================================================================
--- trunk/packages/coils/trunk/debian/changelog	2013-11-20 22:11:16 UTC (rev 15224)
+++ trunk/packages/coils/trunk/debian/changelog	2013-11-20 22:12:05 UTC (rev 15225)
@@ -1,10 +1,17 @@
-coils (2002-4) UNRELEASED; urgency=low
+coils (2002-4) unstable; urgency=low
 
   * debian/upstream:
      - Added DOI + URL
      - Make author field BibTeX compliant
+  * debian/control
+     - cme fix dpkg-control
+     - debhelper 9
+     - canonical Vcs fields
+  * debian/copyright: DEP5
+  * debian/rules: dh
+  * removed README.source in favour of adding DEP3 descriptions to patches
 
- -- Andreas Tille <tille at debian.org>  Sat, 18 Feb 2012 16:28:50 +0100
+ -- Andreas Tille <tille at debian.org>  Mon, 18 Nov 2013 16:47:01 +0100
 
 coils (2002-3) unstable; urgency=low
 

Modified: trunk/packages/coils/trunk/debian/compat
===================================================================
--- trunk/packages/coils/trunk/debian/compat	2013-11-20 22:11:16 UTC (rev 15224)
+++ trunk/packages/coils/trunk/debian/compat	2013-11-20 22:12:05 UTC (rev 15225)
@@ -1 +1 @@
-7
+9

Modified: trunk/packages/coils/trunk/debian/control
===================================================================
--- trunk/packages/coils/trunk/debian/control	2013-11-20 22:11:16 UTC (rev 15224)
+++ trunk/packages/coils/trunk/debian/control	2013-11-20 22:12:05 UTC (rev 15225)
@@ -1,19 +1,20 @@
 Source: coils
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Uploaders: Andreas Tille <tille at debian.org>,
+           Laszlo Kajan <lkajan at rostlab.org>
 Section: science
 Priority: optional
-Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-DM-Upload-Allowed: yes
-Uploaders: Andreas Tille <tille at debian.org>,
- Laszlo Kajan <lkajan at rostlab.org>
-Build-Depends: debhelper (>= 7), perl
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9),
+               perl
+Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/coils/trunk/
-Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/coils/trunk/
+Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/coils/trunk/
 Homepage: http://www.russelllab.org/coils/
 
 Package: ncoils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Suggests: gnuplot
 Description: coiled coil secondary structure prediction
  The program predicts the coiled coil secondary structure predictions

Modified: trunk/packages/coils/trunk/debian/copyright
===================================================================
--- trunk/packages/coils/trunk/debian/copyright	2013-11-20 22:11:16 UTC (rev 15224)
+++ trunk/packages/coils/trunk/debian/copyright	2013-11-20 22:12:05 UTC (rev 15225)
@@ -1,30 +1,33 @@
-This package was first debianized by Steffen Moeller <moeller at debian.org>
-on Wed Mar 16 23:57:06 CET 2005, saved by Andreas Tille and is now
-being completed again by Steffen.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: Rob Russel <russell at embl.de>
+Source: http://www.russelllab.org/coils/coils.tar.gz
 
-It was downloaded from <http://www.russelllab.org/coils/coils.tar.gz>
-
+Files: *
 Copyright: (C) 2002 Robert B. Russel and its employing institute, the
 	   EMBL - European Molecular Biology Lab
 	   Meyerhofstrasse 1, 69917 Heidelberg, Germany
 	   <russell at embl.de>
+License: GPLv2
 
-Upstream Author: Rob Russel <russell at embl.de>
-
-License:
-
+License: GPLv2
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 dated June, 1991.
-
+ .
    This package is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+ .
    You should have received a copy of the GNU General Public License
    along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+Files: debian/*
+Copyright: © 2005-2010 Steffen Moeller <moeller at debian.org>
+           © 2011 Laszlo Kajan <lkajan at rostlab.org>
+           © 2011-2013 Andreas Tille <tille at debian.org>
+License: GPLv2
 

Deleted: trunk/packages/coils/trunk/debian/dirs
===================================================================
--- trunk/packages/coils/trunk/debian/dirs	2013-11-20 22:11:16 UTC (rev 15224)
+++ trunk/packages/coils/trunk/debian/dirs	2013-11-20 22:12:05 UTC (rev 15225)
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/ncoils

Modified: trunk/packages/coils/trunk/debian/docs
===================================================================
--- trunk/packages/coils/trunk/debian/docs	2013-11-20 22:11:16 UTC (rev 15224)
+++ trunk/packages/coils/trunk/debian/docs	2013-11-20 22:12:05 UTC (rev 15225)
@@ -1 +1,2 @@
 README
+1srya.fa

Added: trunk/packages/coils/trunk/debian/install
===================================================================
--- trunk/packages/coils/trunk/debian/install	                        (rev 0)
+++ trunk/packages/coils/trunk/debian/install	2013-11-20 22:12:05 UTC (rev 15225)
@@ -0,0 +1,2 @@
+ncoils	usr/bin
+*.mat	usr/share/ncoils

Deleted: trunk/packages/coils/trunk/debian/ncoils.1
===================================================================
--- trunk/packages/coils/trunk/debian/ncoils.1	2013-11-20 22:11:16 UTC (rev 15224)
+++ trunk/packages/coils/trunk/debian/ncoils.1	2013-11-20 22:12:05 UTC (rev 15225)
@@ -1,28 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.TH COILS 1 "March 16, 2005"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ncoils \- prediction of coiled-coil secondary structure elements
-.SH SYNOPSIS
-.B ncoils
--f < sequence.fasta
-.SH ENVIRONMENT
-COILSDIR - specifies the directory containing the file new.mat, for Debian this should be /usr/share/ncoils
-.SH SEE ALSO
-.BR /usr/share/doc/coils/README
-.br
-.BR http://www.russell.embl.de/cgi-bin/coils-svr.pl
-.br
-.SH AUTHOR
-coils was written by Rob Russel.

Modified: trunk/packages/coils/trunk/debian/patches/coils-wrap
===================================================================
--- trunk/packages/coils/trunk/debian/patches/coils-wrap	2013-11-20 22:11:16 UTC (rev 15224)
+++ trunk/packages/coils/trunk/debian/patches/coils-wrap	2013-11-20 22:12:05 UTC (rev 15225)
@@ -1,7 +1,16 @@
-Index: coils-2002/coils-wrap.pl
-===================================================================
---- coils-2002.orig/coils-wrap.pl	2011-10-27 18:35:51.000000000 +0200
-+++ coils-2002/coils-wrap.pl	2011-10-27 18:41:40.855278169 +0200
+Author: Steffen Moeller <moeller at debian.org>
+LastChanged: Sat, 12 Jun 2010 16:03:22 +0200
+Description:
+ * coils-wrap now uses Getopt::Long
+ * coils-wrap now also writes out raw prediction
+ * coils-wrap input file format recognition improved
+ * ncoils.c does not require the env var COILSDIR defined any more
+ * -max_seq_len is not a cmd line argument any more
+ * added coils-wrap.pod and ncoils.pod
+
+
+--- a/coils-wrap.pl
++++ b/coils-wrap.pl
 @@ -1,6 +1,8 @@
 -#!/usr/local/bin/perl 
 -
@@ -13,7 +22,7 @@
  
  
  # Runs coils multiply to give you a three-window output
-@@ -9,42 +11,75 @@
+@@ -9,42 +11,75 @@ $|=1;
  # You may need to change these, in addition 
  # to the "/usr/local/bin/perl" above if necessary
  #
@@ -108,7 +117,7 @@
  if($type ne "f") {
     die "Error file must be in FASTA format\n";
  }
-@@ -61,14 +96,14 @@
+@@ -61,14 +96,14 @@ $seqfile = $tmpdir . "coils." . $$ . ".f
  
  $seqs = get_afasta(@data);
  
@@ -130,7 +139,7 @@
  for($n=0; $n<$seqs->{nseq}; ++$n) {
     $id = $seqs->{list}[$n];
     $in_seq = $seqs->{ids}{$id}{seq};
-@@ -76,7 +111,8 @@
+@@ -76,7 +111,8 @@ for($n=0; $n<$seqs->{nseq}; ++$n) {
  #   print "ID $id seq $seq\n";
  
     &write_fasta($seqfile,$id,$in_seq);
@@ -140,7 +149,7 @@
     if($mode eq "threewin") {
             # Runs threewin style mode
             # Three windows 14,21,28
-@@ -94,7 +130,10 @@
+@@ -94,7 +130,10 @@ for($n=0; $n<$seqs->{nseq}; ++$n) {
             for($i=14; $i<=28; $i+=7) {
                 $j=($i-14)/7;
                 $command = $coils_exec . $extra . " -win " . $i . " < " . $seqfile;
@@ -152,7 +161,7 @@
                 open(IN,"$command|");
  
                 $fid = "frame-" . $i;
-@@ -107,7 +146,18 @@
+@@ -107,7 +146,18 @@ for($n=0; $n<$seqs->{nseq}; ++$n) {
  
                 $p=0;
                 while(<IN>) {
@@ -172,7 +181,7 @@
                         $_ =~ s/^ *//;
                         @t=split(/ +/);
                         $align->{ids}{$fid}{seq} .= $t[2];
-@@ -118,18 +168,22 @@
+@@ -118,18 +168,22 @@ for($n=0; $n<$seqs->{nseq}; ++$n) {
                         else { $sP = substr($P,0,1); }
                         if($sP eq "0") { $sP = "-"; }
                         $align->{ids}{$pid}{seq} .= $sP;
@@ -202,7 +211,7 @@
  
  sub write_fasta {
     my($fn,$id,$seq) = @_;
-@@ -139,7 +193,7 @@
+@@ -139,7 +193,7 @@ sub write_fasta {
     while($i<length($seq)) {
        $aa = substr($seq,$i,1);
        print SEQ $aa;
@@ -211,7 +220,7 @@
        $i++;
     }
     print SEQ "\n";
-@@ -150,12 +204,14 @@
+@@ -150,12 +204,14 @@ sub write_clustal {
          my($align) = $_[0];
          my($i,$j,$k,$id);
  
@@ -229,7 +238,7 @@
  
          foreach $id (keys %{$align->{ids}}) {
                  if(defined($align->{ids}{$id}{start})) {
-@@ -164,24 +220,44 @@
+@@ -164,24 +220,44 @@ sub write_clustal {
                                  $align->{ids}{$id}{newid} .= $align->{ids}{$id}{ranges};
                          }
                  } else {
@@ -291,7 +300,7 @@
  }
  
  sub get_afasta {
-@@ -222,7 +298,7 @@
+@@ -222,7 +298,7 @@ sub get_afasta {
  		if(defined($align->{ids}{$label})) {
  			$_ =~ s/-/ /g;
  			$align->{ids}{$label}{seq} .= $_;
@@ -300,7 +309,7 @@
  		}
  	}
     }
-@@ -233,6 +309,7 @@
+@@ -233,6 +309,7 @@ sub get_afasta {
  }
  
  sub read_align { # Just read in text and modify format if necessary
@@ -308,7 +317,7 @@
  
  #
  # Likely format is determined by looking for signs of one format over another
-@@ -255,7 +332,7 @@
+@@ -255,7 +332,7 @@ sub read_align { # Just read in text and
     my($file) = $_[0];
     my(@data);
     my($i,$type);
@@ -317,7 +326,7 @@
  
     @data=();
  
-@@ -268,18 +345,19 @@
+@@ -268,18 +345,19 @@ sub read_align { # Just read in text and
  
     for($i=0; $i<=$#data; ++$i) {
  	$_ = $data[$i];
@@ -340,7 +349,7 @@
     }
  
     # Block and FASTA are quite hard to tell apart in a quick parse,
-@@ -289,14 +367,12 @@
+@@ -289,14 +367,12 @@ sub read_align { # Just read in text and
      	if($block_end==0) { $votes{"f"}++; }
     }
  
@@ -357,16 +366,14 @@
     return @data;
  }
  sub get_print_string {
-@@ -311,3 +387,5 @@
+@@ -311,3 +387,5 @@ sub get_print_string {
          }
          return $max_len;
  }
 +
 +# vim:et:ai:
-Index: coils-2002/ncoils.c
-===================================================================
---- coils-2002.orig/ncoils.c	2011-10-27 18:41:40.839278175 +0200
-+++ coils-2002/ncoils.c	2011-10-27 18:41:40.855278169 +0200
+--- a/ncoils.c
++++ b/ncoils.c
 @@ -1,4 +1,5 @@
  #include <ncoils.h>
 +#include <string.h>
@@ -396,7 +403,7 @@
  	int mode;
  	int min_seg;
  
-@@ -39,7 +43,8 @@
+@@ -39,7 +43,8 @@ main(int argc, char *argv[]) {
  	char heptfile[HEPTFILELENGTH];
  	char *buff;
  	static char *env;
@@ -406,7 +413,7 @@
  
  	float min_P;
  
-@@ -55,10 +60,10 @@
+@@ -55,10 +60,10 @@ main(int argc, char *argv[]) {
  	mode = 0; /* 0 = column mode, 1 = fasta, 2 = concise */
  	min_P = 0.5;
  
@@ -420,7 +427,7 @@
  		exit(-1);
  	}
  
-@@ -67,19 +72,19 @@
+@@ -67,19 +72,19 @@ main(int argc, char *argv[]) {
  
  
  	for(i=1; i<argc; ++i) {
@@ -444,7 +451,7 @@
               sscanf(argv[i+1],"%d",&min_seg);
               i++;
  	   } else if(strcmp(&argv[i][1],"c")==0) {
-@@ -87,18 +92,18 @@
+@@ -87,18 +92,18 @@ main(int argc, char *argv[]) {
  	   } else if((strcmp(&argv[i][1],"f")==0) || (strcmp(&argv[i][1],"fasta")==0)) {
  	     mode=1;
  	   } else if((strcmp(&argv[i][1],"min_P")==0)) {
@@ -466,7 +473,7 @@
             }
          }
  
-@@ -175,14 +180,14 @@
+@@ -175,14 +180,14 @@ main(int argc, char *argv[]) {
  		pred_coils(seq,ident,title,h,window,which,weighted,mode,min_P,&t,&tc,min_seg); 
  		free(seq);
  	}
@@ -483,7 +490,7 @@
  	fprintf(stderr,"format: ncoils [options] < [sequence file]\n");
  	fprintf(stderr,"       -f or -fasta        [fasta output - coils as 'x', like '-x' in seg]\n");
  	fprintf(stderr,"       -c                  [concise mode - which sequences have any coils (and how many)]\n");
-@@ -191,7 +196,7 @@
+@@ -191,7 +196,7 @@ void exit_error() {
  	fprintf(stderr,"       -win <int>          [window size; DEFAULT = 21]\n");
  	fprintf(stderr,"       -w                  [weight heptad positions a&d the same as b,c,e,f,g]\n");
  	fprintf(stderr,"       -v                  [verbose/debug mode - print extra junk]\n");
@@ -492,7 +499,7 @@
  	fprintf(stderr,"\n");
  	fprintf(stderr,"NCOILS, Rob Russell and Andrei Lupas, 1999\n");
  	fprintf(stderr," based on Lupas, Van Dyck & Stock (1991) Science 252,1162-1164\n");
-@@ -206,7 +211,6 @@
+@@ -206,7 +211,6 @@ void pred_coils(char *seq,char *ident,ch
  
  	int i,j;
  	int len,pos,aa_pt;
@@ -500,10 +507,8 @@
  	int total_coil_segments;
  	int are_there_coils;
  
-Index: coils-2002/coils-wrap.pod
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ coils-2002/coils-wrap.pod	2011-10-27 18:41:40.855278169 +0200
+--- /dev/null
++++ b/coils-wrap.pod
 @@ -0,0 +1,77 @@
 +=head1 NAME
 +
@@ -582,10 +587,8 @@
 +=item A. Lupas, M. Van Dyke, and J. Stock: Predicting coiled coils from protein sequences. Science, 252, 1162-1164, 1991
 +
 +=back
-Index: coils-2002/ncoils.pod
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ coils-2002/ncoils.pod	2011-10-27 18:41:40.855278169 +0200
+--- /dev/null
++++ b/ncoils.pod
 @@ -0,0 +1,89 @@
 +=head1 NAME
 +
@@ -676,10 +679,8 @@
 +=item A. Lupas, M. Van Dyke, and J. Stock: Predicting coiled coils from protein sequences. Science, 252, 1162-1164, 1991
 +
 +=back
-Index: coils-2002/ncoils.h
-===================================================================
---- coils-2002.orig/ncoils.h	2011-10-27 18:41:40.839278175 +0200
-+++ coils-2002/ncoils.h	2011-10-27 18:42:51.463283288 +0200
+--- a/ncoils.h
++++ b/ncoils.h
 @@ -1,7 +1,6 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -688,10 +689,8 @@
  
  #define AAs "A_CDEFGHI_KLMN_PQRST_VW_Y_"
  #define PI  3.1415
-Index: coils-2002/read_matrix.c
-===================================================================
---- coils-2002.orig/read_matrix.c	2002-08-22 18:47:34.000000000 +0200
-+++ coils-2002/read_matrix.c	2011-10-27 18:42:59.403284487 +0200
+--- a/read_matrix.c
++++ b/read_matrix.c
 @@ -1,4 +1,5 @@
  #include <ncoils.h>
 +#include <string.h>

Modified: trunk/packages/coils/trunk/debian/patches/strcpy.patch
===================================================================
--- trunk/packages/coils/trunk/debian/patches/strcpy.patch	2013-11-20 22:11:16 UTC (rev 15224)
+++ trunk/packages/coils/trunk/debian/patches/strcpy.patch	2013-11-20 22:12:05 UTC (rev 15225)
@@ -1,8 +1,10 @@
-Index: coils-2002/ncoils.c
-===================================================================
---- coils-2002.orig/ncoils.c	2010-06-12 17:29:29.000000000 +0200
-+++ coils-2002/ncoils.c	2010-06-12 17:41:00.000000000 +0200
-@@ -35,7 +35,8 @@
+Author: Steffen Moeller <moeller at debian.org>
+LastChanged: Sat, 12 Jun 2010 16:03:22 +0200
+Description: strcpy -> strncpy fixes
+
+--- a/ncoils.c
++++ b/ncoils.c
+@@ -35,7 +35,8 @@ main(int argc, char *argv[]) {
  	int mode;
  	int min_seg;
  
@@ -12,7 +14,7 @@
  	char *buff;
  	static char *env;
  	char *seq,*title,*ident;
-@@ -56,10 +57,12 @@
+@@ -56,10 +57,12 @@ main(int argc, char *argv[]) {
  
  	if((env=getenv("COILSDIR"))==NULL) {
  		fprintf(stderr,"error: environment variable COILSDIR must be set\n");
@@ -26,7 +28,7 @@
  	strcpy(&heptfile[strlen(heptfile)],"/new.mat");
  
  
-@@ -67,7 +70,7 @@
+@@ -67,7 +70,7 @@ main(int argc, char *argv[]) {
             if(argv[i][0]!='-') exit_error();
  	   if(strcmp(&argv[i][1],"m")==0) {
               if((i+1)>=argc) exit_error();
@@ -35,7 +37,7 @@
               i++;
  	   } else if(strcmp(&argv[i][1],"win")==0) {
               if((i+1)>=argc) exit_error();
-@@ -159,6 +162,10 @@
+@@ -159,6 +162,10 @@ main(int argc, char *argv[]) {
  		} else {
  /*			printf("Adding |%s| to |%s| = \n",buff,seq);  */
  			seq=(char*)realloc(seq,(seqlen+strlen(buff)+1)*sizeof(char));
@@ -46,10 +48,8 @@
  		        strcpy(&seq[seqlen],buff); 
                          seqlen=strlen(seq);
  /*			printf("       |%s|\n",seq);  */
-Index: coils-2002/ncoils.h
-===================================================================
---- coils-2002.orig/ncoils.h	2010-06-12 17:40:01.000000000 +0200
-+++ coils-2002/ncoils.h	2010-06-12 17:40:09.000000000 +0200
+--- a/ncoils.h
++++ b/ncoils.h
 @@ -1,6 +1,7 @@
  #include <stdio.h>
  #include <stdlib.h>

Modified: trunk/packages/coils/trunk/debian/rules
===================================================================
--- trunk/packages/coils/trunk/debian/rules	2013-11-20 22:11:16 UTC (rev 15224)
+++ trunk/packages/coils/trunk/debian/rules	2013-11-20 22:12:05 UTC (rev 15225)
@@ -1,85 +1,30 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+%:
+	dh $@
 
-CC = gcc
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-VERSION=2002
-
-build: build-arch build-indep
-
-build-indep:
-
-build-arch: build-stamp
-
 %.1 : %.pod 
 	pod2man -c 'User Commands' -r "$(VERSION)" $< $@
 
-build-stamp: ncoils.1 coils-wrap.1
-	dh_testdir
+override_dh_auto_build:
+	$(CC) $(CFLAGS) -I. -o ncoils ncoils.c read_matrix.c -lm -D__PKGDATADIR__=\"/usr/share/ncoils\" $(LDFLAGS)
 
-	# Add here commands to compile the package.
-	$(CC) $(CFLAGS) -I. -o ncoils ncoils.c read_matrix.c -lm -D__PKGDATADIR__=\"/usr/share/ncoils\"
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
+overrice_dh_clean:
 	dh_clean ncoils ncoils.1 coils-wrap.1
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean 
-	dh_installdirs
+override_dh_install:
+	dh_install
+	sed -e 's|__pkgdatadir__|/usr/share/ncoils|g' coils-wrap.pl > $(CURDIR)/debian/ncoils/usr/bin/coils-wrap
 
-	# Add here commands to install the package into debian/ncoils.
-	cp ncoils $(CURDIR)/debian/ncoils/usr/bin/
-	cp coils-wrap.pl $(CURDIR)/debian/ncoils/usr/bin/coils-wrap && sed -i -e 's|__pkgdatadir__|/usr/share/ncoils|g' $(CURDIR)/debian/ncoils/usr/bin/coils-wrap
-	cp *.mat $(CURDIR)/debian/ncoils/usr/share/ncoils/
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs 1srya.fa
+override_dh_installman: ncoils.1 coils-wrap.1
 	dh_installman ncoils.1 coils-wrap.1
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
 d="../coils.upstream.tar.gz" 
+VERSION=2002
 
 get-orig-source:
 	echo "Downloading to $(d)." ; \
@@ -87,6 +32,3 @@
 	cd `dirname $(d)` ; tar --exclude ncoils-linux -xzf `basename $(d)`
 	cd `dirname $(d)` ; mv coils coils-$(VERSION)
 	cd `dirname $(d)` ; tar --exclude ncoils-linux -czvf coils_$(VERSION).orig.tar.gz coils-$(VERSION)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure




More information about the debian-med-commit mailing list