diff -Nru harminv-1.3.1/debian/changelog harminv-1.3.1/debian/changelog --- harminv-1.3.1/debian/changelog 2011-12-20 07:14:05.000000000 +0000 +++ harminv-1.3.1/debian/changelog 2011-12-09 14:11:38.000000000 +0000 @@ -1,8 +1,14 @@ -harminv (1.3.1-7build1) oneiric; urgency=low +harminv (1.3.1-8) unstable; urgency=low - * gfortran-4.6 rebuild. + * debian/control: moved to dh 8 + * debian/control: standards version 3.9.2, no changes + * debian/control: dpatch dependency removed + * debian/source/format: changed to 3.0 (quilt) + * debian/patches: patches reworked for quilt + * debian/rules: changed to dh + * debian/copyright: changed to DEP5 - -- Matthias Klose Sun, 11 Sep 2011 11:20:44 +0000 + -- Thorsten Alteholz Fri, 09 Dec 2011 18:33:38 +0100 harminv (1.3.1-7) unstable; urgency=low diff -Nru harminv-1.3.1/debian/compat harminv-1.3.1/debian/compat --- harminv-1.3.1/debian/compat 2011-12-20 07:14:05.000000000 +0000 +++ harminv-1.3.1/debian/compat 2011-12-08 14:32:00.000000000 +0000 @@ -1 +1 @@ -5 +8 diff -Nru harminv-1.3.1/debian/control harminv-1.3.1/debian/control --- harminv-1.3.1/debian/control 2011-12-20 07:14:05.000000000 +0000 +++ harminv-1.3.1/debian/control 2011-12-08 14:33:08.000000000 +0000 @@ -2,8 +2,11 @@ Section: science Priority: optional Maintainer: Thorsten Alteholz -Build-Depends: debhelper (>= 5), autotools-dev, liblapack-dev, dpatch, gfortran -Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 8), + autotools-dev, + liblapack-dev, + gfortran +Standards-Version: 3.9.2 Homepage: http://ab-initio.mit.edu/wiki/index.php/Harminv DM-Upload-Allowed: yes diff -Nru harminv-1.3.1/debian/copyright harminv-1.3.1/debian/copyright --- harminv-1.3.1/debian/copyright 2011-12-20 07:14:05.000000000 +0000 +++ harminv-1.3.1/debian/copyright 2011-12-09 14:14:14.000000000 +0000 @@ -1,31 +1,30 @@ -This package was debianized by Loic Le Guyader on -Sat, 11 Nov 2006 12:46:32 +0100. - -It was downloaded from http://ab-initio.mit.edu/wiki/index.php/Harminv - -Upstream Author: Steven G. Johnson - -Copyright: 2006 Massachusetts Institute of Technology. - -License: - - 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; either version 2 of the License, or - (at your option) any later version. - - 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 package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-2'. - -The Debian packaging is copyright (C) 2006: - Loic Le Guyader -and is licensed under the GPL, see above. +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: harminv +Source: http://ab-initio.mit.edu/wiki/index.php/Harminv + +Files: * +Copyright: (C) 2006 Massachusetts Institute of Technology. +Comment: Upstream Author: Steven G. Johnson +License: GPL2+ + 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; either version 2 of the License, or + (at your option) any later version. + . + 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + 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: (C) 2006 Loic Le Guyader + (C) 2008-2011 Thorsten Alteholz +License: GPL2+ + see above diff -Nru harminv-1.3.1/debian/harminv.install harminv-1.3.1/debian/harminv.install --- harminv-1.3.1/debian/harminv.install 2011-12-20 07:14:05.000000000 +0000 +++ harminv-1.3.1/debian/harminv.install 2011-12-09 11:54:16.000000000 +0000 @@ -1,2 +1,2 @@ -usr/bin -usr/share/man/man1 +usr/bin/harminv +usr/share/man* diff -Nru harminv-1.3.1/debian/patches/00list harminv-1.3.1/debian/patches/00list --- harminv-1.3.1/debian/patches/00list 2011-12-20 07:14:05.000000000 +0000 +++ harminv-1.3.1/debian/patches/00list 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -01_minussign-manpage.dpatch -02_manpage_error.dpatch -03_sh4-support.dpatch -04_harminv.pc.in.dpatch diff -Nru harminv-1.3.1/debian/patches/01_minussign-manpage.dpatch harminv-1.3.1/debian/patches/01_minussign-manpage.dpatch --- harminv-1.3.1/debian/patches/01_minussign-manpage.dpatch 2011-12-20 07:14:05.000000000 +0000 +++ harminv-1.3.1/debian/patches/01_minussign-manpage.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,120 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 01_minussign-manpage.dpatch by Loic Le Guyader -## -## DP: Correct hyphen to minus - -@DPATCH@ - ---- harminv-1.3.1/harminv.1 2006-11-13 20:31:54.000000000 +0100 -+++ harminv-1.3.1/harminv.1.new 2006-11-13 20:32:06.000000000 +0100 -@@ -19,7 +19,7 @@ - harminv \- extract mode frequencies from time-series data - .SH SYNOPSIS - .B harminv --[\fIOPTION\fR]... [\fIfreq-min\fR-\fIfreq-max\fR]... -+[\fIOPTION\fR]... [\fIfreq-min\fR\-\fIfreq-max\fR]... - .SH DESCRIPTION - .PP - ." Add any additional description here -@@ -54,7 +54,7 @@ - - A typical invocation is something like - .IP "" 4 --harminv -t 0.02 1-5 < input.dat -+harminv \-t 0.02 1\-5 < input.dat - .PP - which reads a sequence of samples, spaced at 0.02 time intervals (in - ms, say, corresponding to 50 kHz), and searches for modes in the -@@ -64,9 +64,9 @@ - line for each mode: frequency, decay constant, Q, amplitude, phase, - and error. Each mode corresponds to a function of the form: - --\fIamplitude\fR * exp[-i (2 pi \fIfrequency\fR t - \fIphase\fR) - \fIdecay\fR t] -+\fIamplitude\fR * exp[\-i (2 pi \fIfrequency\fR t \- \fIphase\fR) \- \fIdecay\fR t] - --Here, i is sqrt(-1), t is the time (see below for units), and the -+Here, i is sqrt(\-1), t is the time (see below for units), and the - other parameters in the output columns are: - - .TP -@@ -86,7 +86,7 @@ - A conventional, dimensionless expression of the decay lifetime: Q = pi - |\fIfrequency\fI| / \fIdecay\fR. Q, which stands for "quality - factor", is the number of periods for the "energy" in the mode (the --squared amplitude) to decay by exp(-2 pi). Equivalently, if you look -+squared amplitude) to decay by exp(\-2 pi). Equivalently, if you look - at the power spectrum (|Fourier transform|^2), 1/Q is the fractional - width of the peak at half maximum. - .TP -@@ -118,7 +118,7 @@ - in units of 1/time, where the units of time are determined by the - sampling interval \fIdt\fR (the time between consecutive inputs). - \fIdt\fR is by default 1, unless you specify it with the --.B -t -+.B \-t - .I dt - option. - -@@ -130,28 +130,28 @@ - the angular frequency. - .SH OPTIONS - .TP --.B -h -+.B \-h - Display help on the command-line options and usage. - .TP --.B -V -+.B \-V - Print the version number and copyright info for \fBharminv\fR. - .TP --.B -v -+.B \-v - Enable verbose output, printed to standard output as comment lines - (starting with a "#" character). Also, any "#" comments in the input - are echoed to the output. - .TP --.B -T -+.B \-T - Specify period-ranges instead of frequency-ranges on the command line --(in units of time corresponding to those specified by \fB-t\fR). The -+(in units of time corresponding to those specified by \fB\-t\fR). The - output is still frequency and not period, however. - .TP --.B -w -+.B \-w - Specify angular frequencies instead of frequencies, and output angular - frequency instead of frequency. (Angular frequency is frequency - multiplied by 2 pi). - .TP --.B -n -+.B \-n - Flip the sign of the frequency (and phase) convention used in harminv. - (The sign of the frequency is only important if you have - complex-valued input data, in which case the positive and negative -@@ -165,7 +165,7 @@ - Specify the spectral "density" \fId\fR to search for modes, where a - density of 1 indicates the usual Fourier resolution. That is, the - number of basis functions (which sets an upper bound on the number of --modes) is given by \fId\fR times (\fIfreq-max\fR - \fIfreq-min\fR) -+modes) is given by \fId\fR times (\fIfreq-max\fR \- \fIfreq-min\fR) - times \fIdt\fR times the number of samples in your dataset. - A maximum of 300 is used, however, to prevent the matrices from - getting too big (you can force a larger number with \fB\-f\fR, below). -@@ -177,7 +177,7 @@ - bandwidth is initially "searched" for modes. - - The default density is 0.0, which means that the number of basis --functions is determined by -f (which defaults to 100). This often -+functions is determined by \-f (which defaults to 100). This often - corresponds to a much larger density than the usual Fourier - resolution, but the resulting singularities in the system matrices are automatically removed by harminv. - .TP -@@ -207,7 +207,7 @@ - Omit any modes with error (see above) greater than \fIerr\fR. Defaults - to 0.1. - .TP --.B -F -+.B \-F - Omit any modes with frequencies outside the specified range. (Such - modes are not necessarily spurious, however.) - .TP diff -Nru harminv-1.3.1/debian/patches/02_manpage_error.dpatch harminv-1.3.1/debian/patches/02_manpage_error.dpatch --- harminv-1.3.1/debian/patches/02_manpage_error.dpatch 2011-12-20 07:14:05.000000000 +0000 +++ harminv-1.3.1/debian/patches/02_manpage_error.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 02_manpage_error.dpatch by Thorsten Alteholz -## -## DP: removed obsolete line that produces warning from man - -@DPATCH@ - ---- harminv-1.3.1/harminv.1 2009-02-02 04:17:53.000000000 +0100 -+++ harminv-1.3.1/harminv.1.new 2009-02-02 04:33:50.000000000 +0100 -@@ -22,7 +22,6 @@ - [\fIOPTION\fR]... [\fIfreq-min\fR\-\fIfreq-max\fR]... - .SH DESCRIPTION - .PP --." Add any additional description here - \fBharminv\fR is a program designed to solve the problem of "harmonic - inversion": given a time series consisting of a sum of sinusoids - ("modes"), extract their frequencies and amplitudes. It can also diff -Nru harminv-1.3.1/debian/patches/03_sh4-support.dpatch harminv-1.3.1/debian/patches/03_sh4-support.dpatch --- harminv-1.3.1/debian/patches/03_sh4-support.dpatch 2011-12-20 07:14:05.000000000 +0000 +++ harminv-1.3.1/debian/patches/03_sh4-support.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_sh4_support.dpatch by Nobuhiro Iwamatsu -## -## DP: This partch support Renesas SuperH. -## Old autoconf adds -little option to compile option. Some CPU architecture can -'t -## interpret this option. Therefore, this has build error. -## http://lists.gnu.org/archive/html/bug-autoconf/2008-10/msg00039.html - -@DPATCH@ -diff -urNad harminv-1.3.1~/configure harminv-1.3.1/configure ---- harminv-1.3.1~/configure 2006-07-05 01:39:25.000000000 +0000 -+++ harminv-1.3.1/configure 2009-11-04 00:41:33.000000000 +0000 -@@ -3684,7 +3684,7 @@ - - ;; - # Ignore these flags. -- -lang* | -lcrt*.o | -lc | -lgcc | -libmil | -LANG:=*) -+ -lang* | -lcrt*.o | -lc | -lgcc | -libmil | -little | -LANG:=*) - ;; - -lkernel32) - test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" diff -Nru harminv-1.3.1/debian/patches/04_harminv.pc.in.dpatch harminv-1.3.1/debian/patches/04_harminv.pc.in.dpatch --- harminv-1.3.1/debian/patches/04_harminv.pc.in.dpatch 2011-12-20 07:14:05.000000000 +0000 +++ harminv-1.3.1/debian/patches/04_harminv.pc.in.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_harminv.pc.in.dpatch -## -## DP: @LIBS@ introduces gcc libs containing version numbers -## as this should be avoided, all needed libs are manually added - -@DPATCH@ ---- harminv-1.3.1/harminv.pc.in.org 2010-06-09 18:27:51.000000000 +0200 -+++ harminv-1.3.1/harminv.pc.in 2010-06-09 18:30:30.000000000 +0200 -@@ -6,5 +6,5 @@ - Name: Harminv - Description: harmonic inversion of time series by filter diagonalization - Version: @VERSION@ --Libs: -L${libdir} -lharminv @LIBS@ -+Libs: -L${libdir} -lharminv - Cflags: -I${includedir} diff -Nru harminv-1.3.1/debian/patches/harminv.pc.in.patch harminv-1.3.1/debian/patches/harminv.pc.in.patch --- harminv-1.3.1/debian/patches/harminv.pc.in.patch 1970-01-01 00:00:00.000000000 +0000 +++ harminv-1.3.1/debian/patches/harminv.pc.in.patch 2011-12-09 13:23:18.000000000 +0000 @@ -0,0 +1,15 @@ +Description: number of Libs: reduced +Author: Thorsten Alteholz +Last-Update: 2011-12-09 + +Index: harminv/harminv.pc.in +=================================================================== +--- harminv.orig/harminv.pc.in 2011-12-09 13:53:54.000000000 +0100 ++++ harminv/harminv.pc.in 2011-12-09 13:54:33.000000000 +0100 +@@ -6,5 +6,5 @@ + Name: Harminv + Description: harmonic inversion of time series by filter diagonalization + Version: @VERSION@ +-Libs: -L${libdir} -lharminv @LIBS@ ++Libs: -L${libdir} -lharminv + Cflags: -I${includedir} diff -Nru harminv-1.3.1/debian/patches/manpage.patch harminv-1.3.1/debian/patches/manpage.patch --- harminv-1.3.1/debian/patches/manpage.patch 1970-01-01 00:00:00.000000000 +0000 +++ harminv-1.3.1/debian/patches/manpage.patch 2011-12-09 13:23:55.000000000 +0000 @@ -0,0 +1,122 @@ +Description: lintian warnings in man page removed +Author: Thorsten Alteholz +Last-Update: 2011-12-09 + +Index: harminv/harminv.1 +=================================================================== +--- harminv.orig/harminv.1 2011-12-09 13:08:00.000000000 +0100 ++++ harminv/harminv.1 2011-12-09 13:18:27.000000000 +0100 +@@ -19,10 +19,9 @@ + harminv \- extract mode frequencies from time-series data + .SH SYNOPSIS + .B harminv +-[\fIOPTION\fR]... [\fIfreq-min\fR-\fIfreq-max\fR]... ++[\fIOPTION\fR]... [\fIfreq-min\fR\-\fIfreq-max\fR]... + .SH DESCRIPTION + .PP +-." Add any additional description here + \fBharminv\fR is a program designed to solve the problem of "harmonic + inversion": given a time series consisting of a sum of sinusoids + ("modes"), extract their frequencies and amplitudes. It can also +@@ -54,7 +53,7 @@ + + A typical invocation is something like + .IP "" 4 +-harminv -t 0.02 1-5 < input.dat ++harminv \-t 0.02 1\-5 < input.dat + .PP + which reads a sequence of samples, spaced at 0.02 time intervals (in + ms, say, corresponding to 50 kHz), and searches for modes in the +@@ -64,9 +63,9 @@ + line for each mode: frequency, decay constant, Q, amplitude, phase, + and error. Each mode corresponds to a function of the form: + +-\fIamplitude\fR * exp[-i (2 pi \fIfrequency\fR t - \fIphase\fR) - \fIdecay\fR t] ++\fIamplitude\fR * exp[\-i (2 pi \fIfrequency\fR t \- \fIphase\fR) \- \fIdecay\fR t] + +-Here, i is sqrt(-1), t is the time (see below for units), and the ++Here, i is sqrt(\-1), t is the time (see below for units), and the + other parameters in the output columns are: + + .TP +@@ -86,7 +85,7 @@ + A conventional, dimensionless expression of the decay lifetime: Q = pi + |\fIfrequency\fI| / \fIdecay\fR. Q, which stands for "quality + factor", is the number of periods for the "energy" in the mode (the +-squared amplitude) to decay by exp(-2 pi). Equivalently, if you look ++squared amplitude) to decay by exp(\-2 pi). Equivalently, if you look + at the power spectrum (|Fourier transform|^2), 1/Q is the fractional + width of the peak at half maximum. + .TP +@@ -118,7 +117,7 @@ + in units of 1/time, where the units of time are determined by the + sampling interval \fIdt\fR (the time between consecutive inputs). + \fIdt\fR is by default 1, unless you specify it with the +-.B -t ++.B \-t + .I dt + option. + +@@ -130,28 +129,28 @@ + the angular frequency. + .SH OPTIONS + .TP +-.B -h ++.B \-h + Display help on the command-line options and usage. + .TP +-.B -V ++.B \-V + Print the version number and copyright info for \fBharminv\fR. + .TP +-.B -v ++.B \-v + Enable verbose output, printed to standard output as comment lines + (starting with a "#" character). Also, any "#" comments in the input + are echoed to the output. + .TP +-.B -T ++.B \-T + Specify period-ranges instead of frequency-ranges on the command line +-(in units of time corresponding to those specified by \fB-t\fR). The ++(in units of time corresponding to those specified by \fB\-t\fR). The + output is still frequency and not period, however. + .TP +-.B -w ++.B \-w + Specify angular frequencies instead of frequencies, and output angular + frequency instead of frequency. (Angular frequency is frequency + multiplied by 2 pi). + .TP +-.B -n ++.B \-n + Flip the sign of the frequency (and phase) convention used in harminv. + (The sign of the frequency is only important if you have + complex-valued input data, in which case the positive and negative +@@ -165,7 +164,7 @@ + Specify the spectral "density" \fId\fR to search for modes, where a + density of 1 indicates the usual Fourier resolution. That is, the + number of basis functions (which sets an upper bound on the number of +-modes) is given by \fId\fR times (\fIfreq-max\fR - \fIfreq-min\fR) ++modes) is given by \fId\fR times (\fIfreq-max\fR \- \fIfreq-min\fR) + times \fIdt\fR times the number of samples in your dataset. + A maximum of 300 is used, however, to prevent the matrices from + getting too big (you can force a larger number with \fB\-f\fR, below). +@@ -177,7 +176,7 @@ + bandwidth is initially "searched" for modes. + + The default density is 0.0, which means that the number of basis +-functions is determined by -f (which defaults to 100). This often ++functions is determined by \-f (which defaults to 100). This often + corresponds to a much larger density than the usual Fourier + resolution, but the resulting singularities in the system matrices are automatically removed by harminv. + .TP +@@ -207,7 +206,7 @@ + Omit any modes with error (see above) greater than \fIerr\fR. Defaults + to 0.1. + .TP +-.B -F ++.B \-F + Omit any modes with frequencies outside the specified range. (Such + modes are not necessarily spurious, however.) + .TP diff -Nru harminv-1.3.1/debian/patches/series harminv-1.3.1/debian/patches/series --- harminv-1.3.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ harminv-1.3.1/debian/patches/series 2011-12-09 13:06:42.000000000 +0000 @@ -0,0 +1,3 @@ +sh4-ssupport.patch +harminv.pc.in.patch +manpage.patch diff -Nru harminv-1.3.1/debian/patches/sh4-ssupport.patch harminv-1.3.1/debian/patches/sh4-ssupport.patch --- harminv-1.3.1/debian/patches/sh4-ssupport.patch 1970-01-01 00:00:00.000000000 +0000 +++ harminv-1.3.1/debian/patches/sh4-ssupport.patch 2011-12-09 13:24:20.000000000 +0000 @@ -0,0 +1,17 @@ +Description: sh4 support added +Author: Thorsten Alteholz +Last-Update: 2011-12-09 + +Index: harminv/configure +=================================================================== +--- harminv.orig/configure 2011-12-09 14:07:23.000000000 +0100 ++++ harminv/configure 2011-12-09 14:08:37.000000000 +0100 +@@ -3684,7 +3684,7 @@ + + ;; + # Ignore these flags. +- -lang* | -lcrt*.o | -lc | -lgcc | -libmil | -LANG:=*) ++ -lang* | -lcrt*.o | -lc | -lgcc | -libmil | -little | -LANG:=*) + ;; + -lkernel32) + test x"$CYGWIN" != xyes && ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" diff -Nru harminv-1.3.1/debian/README.source harminv-1.3.1/debian/README.source --- harminv-1.3.1/debian/README.source 2011-12-20 07:14:05.000000000 +0000 +++ harminv-1.3.1/debian/README.source 2011-12-09 13:28:48.000000000 +0000 @@ -1,4 +1,58 @@ -This package uses dpatch for upstream source code patch management. Please read -/usr/share/doc/dpatch/README.source for more information how to apply, unapply, -add, modify or remove patches. +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + break + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command. diff -Nru harminv-1.3.1/debian/rules harminv-1.3.1/debian/rules --- harminv-1.3.1/debian/rules 2011-12-20 07:14:05.000000000 +0000 +++ harminv-1.3.1/debian/rules 2011-12-09 13:16:23.000000000 +0000 @@ -1,19 +1,14 @@ #!/usr/bin/make -f +# -*- makefile -*- + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make - -# This has to be exported to make some magic below work. -export DH_OPTIONS - # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -.NOTPARALLEL: - CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -22,54 +17,20 @@ CFLAGS += -O2 endif -config.status: patch-stamp configure - dh_testdir - cp -f /usr/share/misc/config.sub /usr/share/misc/config.guess . +%: + dh $@ + +override_dh_auto_configure: F77=gfortran ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --with-cxx --enable-shared -build: build-stamp -build-stamp: config.status - dh_testdir - $(MAKE) - touch $@ - -clean: unpatch - dh_testdir - dh_testroot +override_dh_auto_clean: [ ! -f Makefile ] || $(MAKE) distclean - -rm -rf debian/tmp - rm -f build-stamp - rm -f config.sub config.guess - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k -s - dh_installdirs -s + dh_clean +override_dh_auto_install: $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - -binary-indep: build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs NEWS README dh_install -s -plibharminv-dev --sourcedir=$(CURDIR)/debian/tmp - dh_install -s -pharminv -plibharminv --sourcedir=$(CURDIR)/debian/tmp - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-arch binary-indep -.PHONY: build clean binary-indep binary-arch binary install + dh_install -s -plibharminv --sourcedir=$(CURDIR)/debian/tmp + dh_install -s -pharminv --sourcedir=$(CURDIR)/debian/tmp + dh_installdocs NEWS README + diff -Nru harminv-1.3.1/debian/source/format harminv-1.3.1/debian/source/format --- harminv-1.3.1/debian/source/format 2011-12-20 07:14:05.000000000 +0000 +++ harminv-1.3.1/debian/source/format 2011-12-20 07:14:05.000000000 +0000 @@ -1 +1 @@ -1.0 +3.0 (quilt)