Debian Bug report logs - #636885
gramofile: yada modifies build-dependencies when rebuilding

Toggle useless messages

Message #5 received at maintonly@bugs.debian.org (full text, mbox, reply):

From: diocles@debian.org

To: maintonly@bugs.debian.org

Subject: gramofile: yada modifies build-dependencies when rebuilding

Date: Sat, 06 Aug 2011 19:18:44 +0100

Source: gramofile
Version: 1.6-8
Severity: serious
User: diocles@debian.org
Usertags: remove-yada

yada modifies build-dependencies in the clean target of debian/rules,
which is against the release team's RC policy for wheezy:
http://bugs.debian.org/334164
http://release.debian.org/wheezy/rc_policy.txt

This therefore affects gramofile too.

yada has been orphaned, and looks likely to be removed from Debian in
the near future: http://bugs.debian.org/636735

The easiest solution to this would be to move to an alternative
packaging helper tool, like debhelper.

Kind regards,

-- Tim Retout <diocles@debian.org> 

Message #10 received at 636885-maintonly@bugs.debian.org (full text, mbox, reply):

From: Daniel Kobras <kobras@linux.de>

To: diocles@debian.org, 636885-maintonly@bugs.debian.org

Subject: Re: Bug#636885: gramofile: yada modifies build-dependencies when rebuilding

Date: Sun, 7 Aug 2011 16:31:22 +0200

Hi!

Am 06.08.2011 um 20:18 schrieb diocles@debian.org:
> The easiest solution to this would be to move to an alternative
> packaging helper tool, like debhelper.

Gramofile is also unmaintained upstream, and can only use OSS output. With only 32 popcorn votes, and OSS slated for removal in the next release, just removing the gramofile package would be even easier, and the more likely solution.

Regards,

Daniel.

Message #15 received at 636885@bugs.debian.org (full text, mbox, reply):

From: Tim Retout <diocles@debian.org>

To: submit@bugs.debian.org

Cc: 636885@bugs.debian.org, Daniel Kobras <kobras@linux.de>

Subject: RM: gramofile -- RoM; unmaintained upstream, low popcon

Date: Mon, 8 Aug 2011 10:45:41 +0100

Package: ftp.debian.org
Severity: normal

On 7 August 2011 15:31, Daniel Kobras <kobras@linux.de> wrote:
> Gramofile is also unmaintained upstream, and can only use OSS output. With only 32 popcorn votes, and OSS slated for removal in the next release, just removing the gramofile package would be even easier, and the more likely solution.

As requested by maintainer in bug #636885.

Kind regards,

-- 
Tim Retout <diocles@debian.org>

Message #20 received at 636885@bugs.debian.org (full text, mbox, reply):

From: Dale Amon <amon@vnl.com>

To: WNPP Monitor <lucas@debian.org>

Cc: gramofile@packages.qa.debian.org, Tim Retout <diocles@debian.org>, 636885@bugs.debian.org, Daniel Kobras <kobras@linux.de>

Subject: Re: [wnpp] removal of gramofile has been requested!

Date: Mon, 8 Aug 2011 21:57:36 -0400

On Tue, Aug 09, 2011 at 12:02:58AM +0000, WNPP Monitor wrote:
> The removal of the gramofile package in Debian has been requested.
> 
> For more information, please read
> <http://bugs.debian.org/637066>
> 
> (You are receiving this mail because you are subscribed to
> gramofile on the Debian Package Tracking System.)

I strongly object. What else is available for splitting
tracks off of cassette tapes and records? It's the best
tool out there.

This is a travesty, its like throwing out the crown jewels.


(Also note I seem to not be able to get email to some of the
 people at debian.org for some reason, and the web front end
 to bug tracker tries to force me to set up a GUI mailer. I
 only use mutt and have no desire for gooeymail.)

Message #25 received at 636885@bugs.debian.org (full text, mbox, reply):

From: Gergely Nagy <algernon@madhouse-project.org>

To: 636885@bugs.debian.org

Cc: Debian BTS control <control@bugs.debian.org>

Subject: gramofile: debhelperification

Date: Sun, 14 Aug 2011 13:50:51 +0200

[Message part 1 (text/plain, inline)]

tags 636885 + patch
thanks

The attached patch converts the gramofile packaging from yada to
debhelper (short form v8).

The package contents are almost the same: debhelper does not compress
the TODO file, and that's about it.

As a side effect, the package was converted to 3.0 (quilt) format, and
all the patches to -p1, and they were all quilt refreshed to apply
cleanly.

-- 
|8]

[gramofile-8.1-dh8.diff (text/x-diff, inline)]

diff --git a/debian/20-no-busy-wait-after-rec.dpatch b/debian/20-no-busy-wait-after-rec.dpatch
deleted file mode 100644
index 944f8da..0000000
--- a/debian/20-no-busy-wait-after-rec.dpatch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Do not busy wait for confirmation after recording. [dk]
-#PATCHOPTIONS: -p0
---- bplaysrc/shmbuf.c.orig	2005-03-01 16:48:14.000000000 +0100
-+++ bplaysrc/shmbuf.c	2005-03-01 16:48:31.000000000 +0100
-@@ -443,7 +443,7 @@
- 	cleanupsems();
- 
- #ifdef VUMETER
--	nodelay(stdscr, TRUE);
-+	nodelay(stdscr, FALSE);
- 
- 	/* child has displayed informative data */
- 	do
diff --git a/debian/changelog b/debian/changelog
index c41e194..1181fe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gramofile (1.6-8.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Converted the build system from yada to debhelper (Closes: #636885).
+      + This resulted in converting to Format: 3.0 (quilt).
+      + Standards-Version bumped to 3.9.2.
+      + All patches quilt refreshed to apply cleanly.
+
+ -- Gergely Nagy <algernon@madhouse-project.org>  Sun, 14 Aug 2011 13:18:37 +0200
+
 gramofile (1.6-8) unstable; urgency=medium
 
   * 91_rename_cdrecord_wodim.dpatch: Follow renaming of cdrecord to
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
index e9544bb..6eb25e2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: gramofile
 Maintainer: Daniel Kobras <kobras@debian.org>
 Section: sound
 Priority: extra
-Standards-Version: 3.7.2
-Build-Depends: libncurses5-dev, fftw-dev (>= 2.1.3-10), yada (>= 0.52)
+Standards-Version: 3.9.2
+Build-Depends: libncurses5-dev, fftw-dev (>= 2.1.3-10), debhelper (>= 8)
 
 Package: gramofile
 Architecture: any
-Depends: ${gramofile:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: mctools-lite
 Suggests: wodim
 Description: Transfer sound from gramophone records to CD
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..3bf9749
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,59 @@
+This is the Debian GNU/Linux prepackaged version of GramoFile.  It was
+originally Debianised by Charles Briscoe-Smith <cpbs@debian.org>, and is
+currently maintained by Daniel Kobras <kobras@debian.org>, using files
+obtained from <URL:http://panic.et.tudelft.nl/~costar/gramofile/>.
+
+More information about GramoFile is available from
+<URL:http://panic.et.tudelft.nl/~costar/gramofile/>
+
+Changes were made as follows:
+  Included several semi-major patches as published on the
+  GramoFile home page. See the Debian changelog for details.
+
+Copyright and licence notice:
+
+  GramoFile - Gramophone records to CDs, Tick Reduction, Track Splitting
+  Copyright (C) 1998 J.A. Bezemer
+  
+  This program 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 program 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, write to the Free Software Foundation, Inc.,
+  51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+  
+  AUTHORS
+  
+  GramoFile was developed by Anne Bezemer and Ton Le, students of the
+  department of Information Technology and Systems (ITS), sub-department of
+  Electrical Engineering (ET) of the Delft University of Technology (TU
+  Delft). The first major part was written during the `Integraal Project
+  Practicum' (IPP) in the spring of 1998. However, development has continued
+  unofficially thereafter (so now we have track splitting operational :).
+  Total development time is about 7 weeks full-time.
+  
+  The following persons have been very helpful and/or supportive during the
+  `official' part of the project: A.P. Thijssen, E.A. Hendriks, A. Redert,
+  J.A.H. Snelders, L.  Meijs and R.J. de Gruijl. Other persons are mentioned
+  in the ChangeLog file.
+  
+  Any questions, comments, suggestions and bugfixes may be mailed to
+  J.A.Bezemer@ITS.TUDelft.NL (or try costar@panic.et.tudelft.nl or
+  mcbzmr@dds.nl). But please understand that I'm a student with very limited
+  time to do the more pleasant things in life.
+  
+  Have fun!
+  
+  --
+  All mentioned trademarks and registered trademarks are the property of their
+  respective owners.
+
+On any Debian system, you can find the complete text of the GNU GPL
+(GNU General Public License) in the file /usr/share/common-licenses/GPL-2
diff --git a/debian/gramofile.docs b/debian/gramofile.docs
new file mode 100644
index 0000000..7688b9f
--- /dev/null
+++ b/debian/gramofile.docs
@@ -0,0 +1,3 @@
+README
+TODO
+*.txt
diff --git a/debian/gramofile.install b/debian/gramofile.install
new file mode 100644
index 0000000..838831a
--- /dev/null
+++ b/debian/gramofile.install
@@ -0,0 +1,3 @@
+gramofile		usr/bin
+bplay_gramo		usr/lib/gramofile
+brec_gramo		usr/lib/gramofile
diff --git a/debian/gramofile.manpages b/debian/gramofile.manpages
new file mode 100644
index 0000000..78424ed
--- /dev/null
+++ b/debian/gramofile.manpages
@@ -0,0 +1 @@
+debian/gramofile.1
diff --git a/debian/packages b/debian/packages
deleted file mode 100644
index 885c80f..0000000
--- a/debian/packages
+++ /dev/null
@@ -1,111 +0,0 @@
-# Packages file for gramofile
-# Copyright 1999 by Charles Briscoe-Smith.  Licenced according to the GNU GPL.
-
-Source: gramofile
-Section: sound
-Priority: extra
-Packager: Charles Briscoe-Smith <cpbs@debian.org>
-Maintainer: Daniel Kobras <kobras@debian.org>
-Standards-Version: 3.7.2
-Description: GramoFile
-Upstream-Source: <URL:http://panic.et.tudelft.nl/~costar/gramofile/>
-Home-Page: <URL:http://panic.et.tudelft.nl/~costar/gramofile/>
-Packaged-For: Debian GNU/Linux
-Build-Sequence: conserve-space
-Build-Depends: libncurses5-dev, fftw-dev (>= 2.1.3-10)
-Build: sh
- make
-Clean: sh
- make clean || :
-Patches: *.dpatch
-Major-Changes: Included several semi-major patches as published on the
- GramoFile home page. See the Debian changelog for details.
-Copyright: GPL
- GramoFile - Gramophone records to CDs, Tick Reduction, Track Splitting
- Copyright (C) 1998 J.A. Bezemer
- .
- This program 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 program 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, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- AUTHORS
- .
- GramoFile was developed by Anne Bezemer and Ton Le, students of the
- department of Information Technology and Systems (ITS), sub-department of
- Electrical Engineering (ET) of the Delft University of Technology (TU
- Delft). The first major part was written during the `Integraal Project
- Practicum' (IPP) in the spring of 1998. However, development has continued
- unofficially thereafter (so now we have track splitting operational :).
- Total development time is about 7 weeks full-time. 
- .
- The following persons have been very helpful and/or supportive during the
- `official' part of the project: A.P. Thijssen, E.A. Hendriks, A. Redert,
- J.A.H. Snelders, L.  Meijs and R.J. de Gruijl. Other persons are mentioned
- in the ChangeLog file. 
- .
- Any questions, comments, suggestions and bugfixes may be mailed to
- J.A.Bezemer@ITS.TUDelft.NL (or try costar@panic.et.tudelft.nl or
- mcbzmr@dds.nl). But please understand that I'm a student with very limited
- time to do the more pleasant things in life.
- .
- Have fun!
- .
- --
- All mentioned trademarks and registered trademarks are the property of their
- respective owners. 
-
-Package: gramofile
-Architecture: any
-Depends: [/usr/bin/*]
-Recommends: mctools-lite
-Suggests: wodim
-Description: Transfer sound from gramophone records to CD
- GramoFile enables you to record audio from (for example) gramophone
- records, process the signal and listen to the results. Because sound
- files in .WAV-format are used, it is possible to exchange the files
- with many other programs. Wodim(1) can burn CD-Recordables of these,
- so you can make CDs with the music of your favorite records.  The user
- interface of GramoFile has a windows-like look-and-feel, making it
- fairly easy to use.
- .
- One of the most important parts of GramoFile is the ability to process
- digital audio signals. Through the application of several filters it
- is possible to accomplish a significant reduction of disturbances like
- ticks and scratches. These filters have been programmed in such a fashion
- that they can be applied in any order (and multiple times) in a single
- run, thus avoiding the use of temporary files. It is possible to adjust
- the properties of each filter independently, so in every situation an
- optimal result can be achieved.
- .
- Another interesting feature is the track splitting. Just make one .wav
- file of an entire side of an record and GramoFile will detect where
- the individual tracks are located. This happens fully automatically,
- without need to set any options. More experienced users may fine-tune
- the algorithm, or change the detected track starts and ends, but
- generally that will not be necessary. Track-times are saved in an
- editable (plaintext) .tracks file, that will be used during the signal
- processing to produce one processed .wav file for each individual track.
- .
- To record and play .wav files, modified versions of brec(1) and bplay(1)
- by David Monro are included. These programs provide buffered recording
- and playback, so all will go well even on a highly loaded system. Both
- programs have been modified to support the standard GramoFile user
- interface.  Brec also got a `graphical' peak level meter, and bplay a
- running time display.
-Install: sh
- yada install -bin gramofile
- yada install -lib -exec -subdir gramofile bplay_gramo
- ln -s bplay_gramo $ROOT/usr/lib/gramofile/brec_gramo
- yada install -man debian/gramofile.1
- yada install -doc ChangeLog -as changelog
- yada install -doc README TODO *.txt
diff --git a/debian/20-Makefile.dpatch b/debian/patches/20-Makefile.patch
similarity index 63%
rename from debian/20-Makefile.dpatch
rename to debian/patches/20-Makefile.patch
index a979b1d..ecffcc5 100644
--- a/debian/20-Makefile.dpatch
+++ b/debian/patches/20-Makefile.patch
@@ -1,8 +1,9 @@
 # Unknown decent. Probably from previous maintainer? Not sure why it's
 # needed anyway. [dk]
-#PATCHOPTIONS: -p1
---- gramofile-1.6.orig/Makefile.orig	Sat May  5 16:32:40 2001
-+++ gramofile-1.6/Makefile	Sat May  5 16:32:53 2001
+Index: gramofile/Makefile
+===================================================================
+--- gramofile.orig/Makefile	2011-08-14 13:22:34.293217619 +0200
++++ gramofile/Makefile	2011-08-14 13:27:14.449217214 +0200
 @@ -50,7 +50,7 @@
  makebplay: yesnowindow.o boxes.o buttons.o textwindow.o errorwindow.o \
             clrscr.o secshms.o
diff --git a/debian/patches/20-no-busy-wait-after-rec.patch b/debian/patches/20-no-busy-wait-after-rec.patch
new file mode 100644
index 0000000..d62615c
--- /dev/null
+++ b/debian/patches/20-no-busy-wait-after-rec.patch
@@ -0,0 +1,14 @@
+# Do not busy wait for confirmation after recording. [dk]
+Index: gramofile/bplaysrc/shmbuf.c
+===================================================================
+--- gramofile.orig/bplaysrc/shmbuf.c	2011-08-14 13:21:45.933217744 +0200
++++ gramofile/bplaysrc/shmbuf.c	2011-08-14 13:27:14.625717934 +0200
+@@ -443,7 +443,7 @@
+ 	cleanupsems();
+ 
+ #ifdef VUMETER
+-	nodelay(stdscr, TRUE);
++	nodelay(stdscr, FALSE);
+ 
+ 	/* child has displayed informative data */
+ 	do
diff --git a/debian/20-overflow-fixes.dpatch b/debian/patches/20-overflow-fixes.patch
similarity index 82%
rename from debian/20-overflow-fixes.dpatch
rename to debian/patches/20-overflow-fixes.patch
index 2845e9a..f5e4812 100644
--- a/debian/20-overflow-fixes.dpatch
+++ b/debian/patches/20-overflow-fixes.patch
@@ -1,9 +1,9 @@
 # Patch by James Tappin <james@xena.uklinux.net>
 # Rediffed into unified format. [dk]
-#PATCHOPTIONS: -p1
-diff -ur gramofile-1.6.orig/signpr_cmf2.c gramofile-1.6/signpr_cmf2.c
---- gramofile-1.6.orig/signpr_cmf2.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/signpr_cmf2.c	Fri Jun  8 10:35:39 2001
+Index: gramofile/signpr_cmf2.c
+===================================================================
+--- gramofile.orig/signpr_cmf2.c	2011-08-14 13:21:45.869218469 +0200
++++ gramofile/signpr_cmf2.c	2011-08-14 13:27:14.797217296 +0200
 @@ -646,19 +646,25 @@
  
    /* Should be /64, but the signal is extremely soft, so divide by less to
diff --git a/debian/20-shell-quoting.dpatch b/debian/patches/20-shell-quoting.patch
similarity index 76%
rename from debian/20-shell-quoting.dpatch
rename to debian/patches/20-shell-quoting.patch
index 363a246..62d4d30 100644
--- a/debian/20-shell-quoting.dpatch
+++ b/debian/patches/20-shell-quoting.patch
@@ -1,8 +1,8 @@
 #Patch by Jon Schewe <jpschewe@eggplant.mtu.net>
-#PATCHOPTIONS: -p1
-diff -ur gramofile-1.6P.orig/playwav.c gramofile-1.6P/playwav.c
---- gramofile-1.6P.orig/playwav.c	Tue Mar 28 15:07:25 2000
-+++ gramofile-1.6P/playwav.c	Wed Dec 27 11:17:25 2000
+Index: gramofile/playwav.c
+===================================================================
+--- gramofile.orig/playwav.c	2011-08-14 13:21:45.809217714 +0200
++++ gramofile/playwav.c	2011-08-14 13:27:14.941717336 +0200
 @@ -44,11 +44,11 @@
      case FILE_EXISTS:
  
@@ -31,9 +31,10 @@ diff -ur gramofile-1.6P.orig/playwav.c gramofile-1.6P/playwav.c
        /* defaults for raw files (but no -r, so .wav's supply their own
           parameters */
  
-diff -ur gramofile-1.6P.orig/reclp_main.c gramofile-1.6P/reclp_main.c
---- gramofile-1.6P.orig/reclp_main.c	Tue Mar 28 15:07:25 2000
-+++ gramofile-1.6P/reclp_main.c	Wed Dec 27 01:17:45 2000
+Index: gramofile/reclp_main.c
+===================================================================
+--- gramofile.orig/reclp_main.c	2011-08-14 13:21:45.817217244 +0200
++++ gramofile/reclp_main.c	2011-08-14 13:27:14.941717336 +0200
 @@ -30,7 +30,7 @@
  
    def_prog_mode ();		/* save terminal state */
diff --git a/debian/20-via-kludge.dpatch b/debian/patches/20-via-kludge.patch
similarity index 74%
rename from debian/20-via-kludge.dpatch
rename to debian/patches/20-via-kludge.patch
index a79cad7..bcbbde5 100644
--- a/debian/20-via-kludge.dpatch
+++ b/debian/patches/20-via-kludge.patch
@@ -1,8 +1,9 @@
 # Patch by Joerg Specht <joerg.specht@ins.uni-stuttgart.de>
 # Cleaned up some cruft in @@ lines--weird. [dk]
-#PATCHOPTIONS: -p1
---- gramofile-1.6/bplaysrc/sndfunc.c.ori	Wed Mar 21 22:29:27 2001
-+++ gramofile-1.6/bplaysrc/sndfunc.c	Wed Mar 21 22:40:04 2001
+Index: gramofile/bplaysrc/sndfunc.c
+===================================================================
+--- gramofile.orig/bplaysrc/sndfunc.c	2011-08-14 13:21:45.753217822 +0200
++++ gramofile/bplaysrc/sndfunc.c	2011-08-14 13:27:15.113717191 +0200
 @@ -22,6 +22,7 @@
  
  /* Globals */
diff --git a/debian/20-warning-fixes.dpatch b/debian/patches/20-warning-fixes.patch
similarity index 55%
rename from debian/20-warning-fixes.dpatch
rename to debian/patches/20-warning-fixes.patch
index 218be21..d00e27f 100644
--- a/debian/20-warning-fixes.dpatch
+++ b/debian/patches/20-warning-fixes.patch
@@ -1,10 +1,10 @@
 # Patch by Tom Harvey <TomHarvey@IndustryFigure.com>
 # Rediffed. [dk]
 # Also changed return type of bplay.c. [dk]
-#PATCHOPTIONS: -p1
-diff -ur gramofile-1.6.orig/bplaysrc/bplay.c gramofile-1.6/bplaysrc/bplay.c
---- gramofile-1.6.orig/bplaysrc/bplay.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/bplaysrc/bplay.c	Fri Jun  8 10:06:42 2001
+Index: gramofile/bplaysrc/bplay.c
+===================================================================
+--- gramofile.orig/bplaysrc/bplay.c	2011-08-14 13:21:45.689217780 +0200
++++ gramofile/bplaysrc/bplay.c	2011-08-14 13:27:15.277217351 +0200
 @@ -91,7 +91,7 @@
  extern void cleanupsems(void);
  
@@ -22,9 +22,10 @@ diff -ur gramofile-1.6.orig/bplaysrc/bplay.c gramofile-1.6/bplaysrc/bplay.c
  }
  
  void Usage(void)
-diff -ur gramofile-1.6.orig/clrscr.c gramofile-1.6/clrscr.c
---- gramofile-1.6.orig/clrscr.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/clrscr.c	Fri Jun  8 10:02:42 2001
+Index: gramofile/clrscr.c
+===================================================================
+--- gramofile.orig/clrscr.c	2011-08-14 13:21:45.617217700 +0200
++++ gramofile/clrscr.c	2011-08-14 13:27:15.277217351 +0200
 @@ -8,6 +8,7 @@
   */
  
@@ -33,9 +34,10 @@ diff -ur gramofile-1.6.orig/clrscr.c gramofile-1.6/clrscr.c
  #ifndef OLD_CURSES
  #include <ncurses.h>
  #else
-diff -ur gramofile-1.6.orig/errorwindow.c gramofile-1.6/errorwindow.c
---- gramofile-1.6.orig/errorwindow.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/errorwindow.c	Fri Jun  8 10:02:42 2001
+Index: gramofile/errorwindow.c
+===================================================================
+--- gramofile.orig/errorwindow.c	2011-08-14 13:21:45.593217717 +0200
++++ gramofile/errorwindow.c	2011-08-14 13:27:15.277217351 +0200
 @@ -11,6 +11,8 @@
  #include "buttons.h"
  #include "boxes.h"
@@ -45,9 +47,10 @@ diff -ur gramofile-1.6.orig/errorwindow.c gramofile-1.6/errorwindow.c
  #ifndef OLD_CURSES
  #include <ncurses.h>
  #else
-diff -ur gramofile-1.6.orig/gramofile.c gramofile-1.6/gramofile.c
---- gramofile-1.6.orig/gramofile.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/gramofile.c	Fri Jun  8 10:02:42 2001
+Index: gramofile/gramofile.c
+===================================================================
+--- gramofile.orig/gramofile.c	2011-08-14 13:21:45.701217735 +0200
++++ gramofile/gramofile.c	2011-08-14 13:27:15.277217351 +0200
 @@ -42,7 +42,7 @@
    exit (0);
  }
@@ -63,9 +66,10 @@ diff -ur gramofile-1.6.orig/gramofile.c gramofile-1.6/gramofile.c
    finishmenu (0);
 +  return 0;
  }
-diff -ur gramofile-1.6.orig/mainmenu.c gramofile-1.6/mainmenu.c
---- gramofile-1.6.orig/mainmenu.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/mainmenu.c	Fri Jun  8 10:02:42 2001
+Index: gramofile/mainmenu.c
+===================================================================
+--- gramofile.orig/mainmenu.c	2011-08-14 13:21:45.657217528 +0200
++++ gramofile/mainmenu.c	2011-08-14 13:27:15.277217351 +0200
 @@ -21,6 +21,7 @@
  #include "tracksplit.h"
  #include <stdlib.h>
@@ -74,9 +78,10 @@ diff -ur gramofile-1.6.orig/mainmenu.c gramofile-1.6/mainmenu.c
  #ifndef OLD_CURSES
  #include <ncurses.h>
  #else
-diff -ur gramofile-1.6.orig/signpr_cmf.c gramofile-1.6/signpr_cmf.c
---- gramofile-1.6.orig/signpr_cmf.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/signpr_cmf.c	Fri Jun  8 10:02:42 2001
+Index: gramofile/signpr_cmf.c
+===================================================================
+--- gramofile.orig/signpr_cmf.c	2011-08-14 13:21:45.665217476 +0200
++++ gramofile/signpr_cmf.c	2011-08-14 13:27:15.277217351 +0200
 @@ -30,6 +30,7 @@
  #include "yesnowindow.h"
  #include <stdlib.h>
@@ -96,9 +101,10 @@ diff -ur gramofile-1.6.orig/signpr_cmf.c gramofile-1.6/signpr_cmf.c
      " ^: only strong ticks detected.         v: music-ticks also filtered out.      ",
      " Discard changes.                                                              ",
      " Reset default values.                                                         ",
-diff -ur gramofile-1.6.orig/signpr_cmf2.c gramofile-1.6/signpr_cmf2.c
---- gramofile-1.6.orig/signpr_cmf2.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/signpr_cmf2.c	Fri Jun  8 10:02:42 2001
+Index: gramofile/signpr_cmf2.c
+===================================================================
+--- gramofile.orig/signpr_cmf2.c	2011-08-14 13:27:14.797217296 +0200
++++ gramofile/signpr_cmf2.c	2011-08-14 13:27:15.277217351 +0200
 @@ -32,6 +32,7 @@
  #include "yesnowindow.h"
  #include <stdlib.h>
@@ -120,9 +126,10 @@ diff -ur gramofile-1.6.orig/signpr_cmf2.c gramofile-1.6/signpr_cmf2.c
      " ^: detected tick length too short      v: detected tick length longer.        ",
      " ^: only strong ticks detected.         v: music-ticks also filtered out.      ",
      " Discard changes.                                                              ",
-diff -ur gramofile-1.6.orig/signpr_doubmed.c gramofile-1.6/signpr_doubmed.c
---- gramofile-1.6.orig/signpr_doubmed.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/signpr_doubmed.c	Fri Jun  8 10:02:42 2001
+Index: gramofile/signpr_doubmed.c
+===================================================================
+--- gramofile.orig/signpr_doubmed.c	2011-08-14 13:21:45.601217590 +0200
++++ gramofile/signpr_doubmed.c	2011-08-14 13:27:15.277217351 +0200
 @@ -17,6 +17,7 @@
  #include "helpline.h"
  #include <stdlib.h>
@@ -131,9 +138,10 @@ diff -ur gramofile-1.6.orig/signpr_doubmed.c gramofile-1.6/signpr_doubmed.c
  #ifndef OLD_CURSES
  #include <ncurses.h>
  #else
-diff -ur gramofile-1.6.orig/signpr_mean.c gramofile-1.6/signpr_mean.c
---- gramofile-1.6.orig/signpr_mean.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/signpr_mean.c	Fri Jun  8 10:02:42 2001
+Index: gramofile/signpr_mean.c
+===================================================================
+--- gramofile.orig/signpr_mean.c	2011-08-14 13:21:45.625217703 +0200
++++ gramofile/signpr_mean.c	2011-08-14 13:27:15.277217351 +0200
 @@ -17,6 +17,7 @@
  #include "helpline.h"
  #include <stdlib.h>
@@ -142,9 +150,10 @@ diff -ur gramofile-1.6.orig/signpr_mean.c gramofile-1.6/signpr_mean.c
  #ifndef OLD_CURSES
  #include <ncurses.h>
  #else
-diff -ur gramofile-1.6.orig/signpr_median.c gramofile-1.6/signpr_median.c
---- gramofile-1.6.orig/signpr_median.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/signpr_median.c	Fri Jun  8 10:02:42 2001
+Index: gramofile/signpr_median.c
+===================================================================
+--- gramofile.orig/signpr_median.c	2011-08-14 13:21:45.641217543 +0200
++++ gramofile/signpr_median.c	2011-08-14 13:27:15.277217351 +0200
 @@ -17,6 +17,7 @@
  #include "helpline.h"
  #include <stdlib.h>
@@ -153,9 +162,10 @@ diff -ur gramofile-1.6.orig/signpr_median.c gramofile-1.6/signpr_median.c
  #ifndef OLD_CURSES
  #include <ncurses.h>
  #else
-diff -ur gramofile-1.6.orig/signpr_rms.c gramofile-1.6/signpr_rms.c
---- gramofile-1.6.orig/signpr_rms.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/signpr_rms.c	Fri Jun  8 10:02:42 2001
+Index: gramofile/signpr_rms.c
+===================================================================
+--- gramofile.orig/signpr_rms.c	2011-08-14 13:21:45.633217367 +0200
++++ gramofile/signpr_rms.c	2011-08-14 13:27:15.277217351 +0200
 @@ -17,6 +17,7 @@
  #include "helpline.h"
  #include <stdlib.h>
@@ -164,9 +174,10 @@ diff -ur gramofile-1.6.orig/signpr_rms.c gramofile-1.6/signpr_rms.c
  #include <math.h>
  #ifndef OLD_CURSES
  #include <ncurses.h>
-diff -ur gramofile-1.6.orig/stringinput.c gramofile-1.6/stringinput.c
---- gramofile-1.6.orig/stringinput.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/stringinput.c	Fri Jun  8 10:02:42 2001
+Index: gramofile/stringinput.c
+===================================================================
+--- gramofile.orig/stringinput.c	2011-08-14 13:21:45.681217673 +0200
++++ gramofile/stringinput.c	2011-08-14 13:27:15.277217351 +0200
 @@ -8,6 +8,7 @@
   */
  
@@ -175,9 +186,10 @@ diff -ur gramofile-1.6.orig/stringinput.c gramofile-1.6/stringinput.c
  #ifndef OLD_CURSES
  #include <ncurses.h>
  #else
-diff -ur gramofile-1.6.orig/tracksplit_parammenu.c gramofile-1.6/tracksplit_parammenu.c
---- gramofile-1.6.orig/tracksplit_parammenu.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/tracksplit_parammenu.c	Fri Jun  8 10:02:42 2001
+Index: gramofile/tracksplit_parammenu.c
+===================================================================
+--- gramofile.orig/tracksplit_parammenu.c	2011-08-14 13:21:45.673228036 +0200
++++ gramofile/tracksplit_parammenu.c	2011-08-14 13:27:15.277217351 +0200
 @@ -16,6 +16,7 @@
  #include "helpline.h"
  #include <stdlib.h>
@@ -186,9 +198,10 @@ diff -ur gramofile-1.6.orig/tracksplit_parammenu.c gramofile-1.6/tracksplit_para
  #ifndef OLD_CURSES
  #include <ncurses.h>
  #else
-diff -ur gramofile-1.6.orig/yesnowindow.c gramofile-1.6/yesnowindow.c
---- gramofile-1.6.orig/yesnowindow.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/yesnowindow.c	Fri Jun  8 10:02:42 2001
+Index: gramofile/yesnowindow.c
+===================================================================
+--- gramofile.orig/yesnowindow.c	2011-08-14 13:21:45.609217554 +0200
++++ gramofile/yesnowindow.c	2011-08-14 13:27:15.277217351 +0200
 @@ -11,6 +11,7 @@
  #include "buttons.h"
  #include "boxes.h"
diff --git a/debian/30-basename-fix.dpatch b/debian/patches/30-basename-fix.patch
similarity index 79%
rename from debian/30-basename-fix.dpatch
rename to debian/patches/30-basename-fix.patch
index 9097998..de3ed9b 100644
--- a/debian/30-basename-fix.dpatch
+++ b/debian/patches/30-basename-fix.patch
@@ -7,10 +7,10 @@
 # it was a GNU extension. Alternatively, one could define _GNU_SOURCE, but
 # I opted for the--hopefully--more portable POSIX version. (Unlike the GNU
 # version, the POSIX version may potentially modify its argument.)
-#
-#PATCHOPTIONS: -p1
---- gramofile-1.6.orig/bplaysrc/bplay.c	2001-05-05 16:13:55.000000000 +0200
-+++ gramofile-1.6/bplaysrc/bplay.c	2004-01-07 18:34:49.000000000 +0100
+Index: gramofile/bplaysrc/bplay.c
+===================================================================
+--- gramofile.orig/bplaysrc/bplay.c	2011-08-14 13:27:15.277217351 +0200
++++ gramofile/bplaysrc/bplay.c	2011-08-14 13:27:15.593217482 +0200
 @@ -20,6 +20,10 @@
  #include <sys/time.h>
  #include <sys/resource.h>
@@ -55,8 +55,10 @@
  #else
  	progname = strrchr(argv[0], '/');  /* Replacement for e.g. FreeBSD */
  	if (!progname || !*++progname)
---- gramofile-1.6.orig/bplaysrc/Makefile	2001-05-05 16:13:55.000000000 +0200
-+++ gramofile-1.6/bplaysrc/Makefile	2004-01-07 19:08:31.000000000 +0100
+Index: gramofile/bplaysrc/Makefile
+===================================================================
+--- gramofile.orig/bplaysrc/Makefile	2011-08-14 13:21:45.449217435 +0200
++++ gramofile/bplaysrc/Makefile	2011-08-14 13:27:15.593217482 +0200
 @@ -12,7 +12,7 @@
  ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see ../Makefile!)
  
diff --git a/debian/40-fast-swap-and-buffer.dpatch b/debian/patches/40-fast-swap-and-buffer.patch
similarity index 81%
rename from debian/40-fast-swap-and-buffer.dpatch
rename to debian/patches/40-fast-swap-and-buffer.patch
index a9f57fd..34dbfe2 100644
--- a/debian/40-fast-swap-and-buffer.dpatch
+++ b/debian/patches/40-fast-swap-and-buffer.patch
@@ -1,8 +1,8 @@
 # Patch by J. Dru Lemley.
-#PATCHOPTIONS: -p1
-diff -Nuar gramofile-1.6/Makefile mygramofile-1.6/Makefile
---- gramofile-1.6/Makefile	Tue Mar 28 14:23:58 2000
-+++ mygramofile-1.6/Makefile	Fri Mar  2 11:51:15 2001
+Index: gramofile/Makefile
+===================================================================
+--- gramofile.orig/Makefile	2011-08-14 13:27:14.449217214 +0200
++++ gramofile/Makefile	2011-08-14 13:27:15.777717640 +0200
 @@ -19,7 +19,7 @@
  ########## CHOOSE YOUR ARCHITECTURE:    (NOTE: also see bplaysrc/Makefile!)
  
@@ -12,11 +12,12 @@ diff -Nuar gramofile-1.6/Makefile mygramofile-1.6/Makefile
  DEPS = $(OBJS) makebplay
  LIBS = -lncurses -lm
  COPY_A = -a
-diff -Nuar gramofile-1.6/endian.h mygramofile-1.6/endian.h
---- gramofile-1.6/endian.h	Thu Mar 29 22:17:08 2001
-+++ mygramofile-1.6/endian.h	Thu Mar 29 21:37:41 2001
-@@ -10,4 +10,10 @@
- extern uint32_t SwapFourBytes (uint32_t);
+Index: gramofile/endian.h
+===================================================================
+--- gramofile.orig/endian.h	2011-08-14 13:21:45.369217735 +0200
++++ gramofile/endian.h	2011-08-14 13:27:15.777717640 +0200
+@@ -8,4 +8,10 @@
+ extern u_long SwapFourBytes (u_long);
  extern sample_t SwapSample (sample_t);
  
 +/* macro to swap endianness of values in a sample_t with */
@@ -26,9 +27,10 @@ diff -Nuar gramofile-1.6/endian.h mygramofile-1.6/endian.h
 +	((*((uint32_t *)(s)) & 0x00ff00ff) << 8)
 +
  #endif
-diff -Nuar gramofile-1.6/signpr_wav.c mygramofile-1.6/signpr_wav.c
---- gramofile-1.6/signpr_wav.c	Tue Mar 28 15:07:26 2000
-+++ mygramofile-1.6/signpr_wav.c	Thu Mar 29 21:38:28 2001
+Index: gramofile/signpr_wav.c
+===================================================================
+--- gramofile.orig/signpr_wav.c	2011-08-14 13:21:45.385217549 +0200
++++ gramofile/signpr_wav.c	2011-08-14 13:27:15.777717640 +0200
 @@ -22,6 +22,8 @@
  /* ----- SOURCE & READING -------------------------------------------------- */
  
diff --git a/debian/50-cmf3.dpatch b/debian/patches/50-cmf3.patch
similarity index 96%
rename from debian/50-cmf3.dpatch
rename to debian/patches/50-cmf3.patch
index 8133755..6634203 100644
--- a/debian/50-cmf3.dpatch
+++ b/debian/patches/50-cmf3.patch
@@ -1,10 +1,10 @@
 # Patch by James Tappin <james@xena.uklinux.net>
 # Rediffed to unified format. [dk]
 # Case changes to name of doc file to comply with rest of docs. [dk]
-#PATCHOPTIONS: -p1
-diff -urN gramofile-1.6.orig/Makefile gramofile-1.6/Makefile
---- gramofile-1.6.orig/Makefile	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/Makefile	Fri Jun  8 10:40:18 2001
+Index: gramofile/Makefile
+===================================================================
+--- gramofile.orig/Makefile	2011-08-14 13:27:15.777717640 +0200
++++ gramofile/Makefile	2011-08-14 13:27:15.969717630 +0200
 @@ -7,7 +7,8 @@
          signpr_general.c signpr_median.c signpr_filtmenu.c signpr_wav.c	\
  	secshms.c playwav.c signpr_cmf.c signpr_mean.c signpr_doubmed.c	\
@@ -17,7 +17,7 @@ diff -urN gramofile-1.6.orig/Makefile gramofile-1.6/Makefile
  OBJS = $(SRCS:.c=.o)
 @@ -21,19 +22,19 @@
  # For Linux (and maybe others), use these:
- CFLAGS = -Wall -O2 -DTURBO_MEDIAN -DTURBO_BUFFER
+ CFLAGS = -Wall -O2 -funroll-loops -DTURBO_MEDIAN -DTURBO_BUFFER
  DEPS = $(OBJS) makebplay
 -LIBS = -lncurses -lm
 +LIBS = -lncurses -lrfftw -lfftw -lm
@@ -38,9 +38,10 @@ diff -urN gramofile-1.6.orig/Makefile gramofile-1.6/Makefile
  #COPY_A = -a
  
  ##########
-diff -urN gramofile-1.6.orig/Signpr_cmf3.txt gramofile-1.6/Signpr_cmf3.txt
---- gramofile-1.6.orig/Signpr_cmf3.txt	Thu Jan  1 01:00:00 1970
-+++ gramofile-1.6/Signpr_cmf3.txt	Fri Jun  8 10:40:18 2001
+Index: gramofile/Signpr_cmf3.txt
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gramofile/Signpr_cmf3.txt	2011-08-14 13:27:15.969717630 +0200
 @@ -0,0 +1,42 @@
 +SIGNPR_CMF3
 +===========
@@ -84,9 +85,10 @@ diff -urN gramofile-1.6.orig/Signpr_cmf3.txt gramofile-1.6/Signpr_cmf3.txt
 +in a poor smoothing as the side lobes of the tick are have a larger
 +effect on the values. The default is 2^9 (512).
 +
-diff -urN gramofile-1.6.orig/signpr_cmf3.c gramofile-1.6/signpr_cmf3.c
---- gramofile-1.6.orig/signpr_cmf3.c	Thu Jan  1 01:00:00 1970
-+++ gramofile-1.6/signpr_cmf3.c	Fri Jun  8 10:40:18 2001
+Index: gramofile/signpr_cmf3.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gramofile/signpr_cmf3.c	2011-08-14 13:27:15.969717630 +0200
 @@ -0,0 +1,1085 @@
 +/* Conditional Median Filter - Better Version
 + *                             Using fft and eliminating high frequencies 
@@ -1173,9 +1175,10 @@ diff -urN gramofile-1.6.orig/signpr_cmf3.c gramofile-1.6/signpr_cmf3.c
 +
 +  return returnval;
 +}
-diff -urN gramofile-1.6.orig/signpr_cmf3.h gramofile-1.6/signpr_cmf3.h
---- gramofile-1.6.orig/signpr_cmf3.h	Thu Jan  1 01:00:00 1970
-+++ gramofile-1.6/signpr_cmf3.h	Fri Jun  8 10:40:18 2001
+Index: gramofile/signpr_cmf3.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gramofile/signpr_cmf3.h	2011-08-14 13:27:15.969717630 +0200
 @@ -0,0 +1,29 @@
 +/* Simple Median Filter - Better Version - Header
 +
@@ -1206,9 +1209,10 @@ diff -urN gramofile-1.6.orig/signpr_cmf3.h gramofile-1.6/signpr_cmf3.h
 +
 +
 +#endif /* HAVE_SIGNPR_CMF3_H */
-diff -urN gramofile-1.6.orig/signpr_general.c gramofile-1.6/signpr_general.c
---- gramofile-1.6.orig/signpr_general.c	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/signpr_general.c	Fri Jun  8 10:40:18 2001
+Index: gramofile/signpr_general.c
+===================================================================
+--- gramofile.orig/signpr_general.c	2011-08-14 13:21:45.289218120 +0200
++++ gramofile/signpr_general.c	2011-08-14 13:27:15.969717630 +0200
 @@ -14,6 +14,7 @@
  #include "signpr_wav.h"
  #include "signpr_cmf.h"
@@ -1275,20 +1279,21 @@ diff -urN gramofile-1.6.orig/signpr_general.c gramofile-1.6/signpr_general.c
      case EXPERIMENT_FILTER:
        experiment_param_defaults (parampointer);
        break;
-@@ -775,6 +799,10 @@
- 
-     case MONOIZE_FILTER:
+@@ -777,6 +801,10 @@
        monoize_param_screen (parampointer);
-+      break;
-+
-+    case COND_MEDIAN3_FILTER:
-+      cond_median3_param_screen (parampointer);
        break;
  
++    case COND_MEDIAN3_FILTER:
++      cond_median3_param_screen (parampointer);
++      break;
++
      case EXPERIMENT_FILTER:
-diff -urN gramofile-1.6.orig/signpr_general.h gramofile-1.6/signpr_general.h
---- gramofile-1.6.orig/signpr_general.h	Sat May  5 16:07:15 2001
-+++ gramofile-1.6/signpr_general.h	Fri Jun  8 10:40:18 2001
+       experiment_param_screen (parampointer);
+       break;
+Index: gramofile/signpr_general.h
+===================================================================
+--- gramofile.orig/signpr_general.h	2011-08-14 13:21:45.273217375 +0200
++++ gramofile/signpr_general.h	2011-08-14 13:27:15.969717630 +0200
 @@ -13,6 +13,9 @@
  
  #include "scrollmenu.h"
diff --git a/debian/60-bplay_in_gramo.dpatch b/debian/patches/60-bplay_in_gramo.patch
similarity index 83%
rename from debian/60-bplay_in_gramo.dpatch
rename to debian/patches/60-bplay_in_gramo.patch
index d6cb8fa..da4f7cd 100644
--- a/debian/60-bplay_in_gramo.dpatch
+++ b/debian/patches/60-bplay_in_gramo.patch
@@ -1,9 +1,10 @@
 # Call bplay and brec from dedicated locations rather than from the standard
 # path. Good for the Debian package, maybe not that desirable for the
 # upstream package. [dk]
-#PATCHOPTIONS: -p0
---- playwav.c.orig	Sat May  5 16:07:15 2001
-+++ playwav.c	Mon Sep 17 18:06:03 2001
+Index: gramofile/playwav.c
+===================================================================
+--- gramofile.orig/playwav.c	2011-08-14 13:27:14.941717336 +0200
++++ gramofile/playwav.c	2011-08-14 13:27:16.193217596 +0200
 @@ -32,23 +32,47 @@
  #include <curses.h>
  #endif
@@ -57,8 +58,10 @@
        /* defaults for raw files (but no -r, so .wav's supply their own
           parameters) - you can even listen to executables in CD quality (: */
  
---- reclp_main.c.orig	Sat May  5 16:07:15 2001
-+++ reclp_main.c	Mon Sep 17 18:05:44 2001
+Index: gramofile/reclp_main.c
+===================================================================
+--- gramofile.orig/reclp_main.c	2011-08-14 13:27:14.941717336 +0200
++++ gramofile/reclp_main.c	2011-08-14 13:27:16.193217596 +0200
 @@ -18,20 +18,39 @@
  #include <curses.h>
  #endif
diff --git a/debian/70-endian-fixes.dpatch b/debian/patches/70-endian-fixes.patch
similarity index 89%
rename from debian/70-endian-fixes.dpatch
rename to debian/patches/70-endian-fixes.patch
index 1b14bf7..88de2a2 100644
--- a/debian/70-endian-fixes.dpatch
+++ b/debian/patches/70-endian-fixes.patch
@@ -3,15 +3,11 @@
 # Disable padding in structs that read/write raw on-disk data.
 # Merged with endianness patch by Tom Harvey <TomHarvey@IndustryFigure.com>
 # [dk]
-#PATCHOPTIONS: -p0
-Index: bplaysrc/bplay.c
+Index: gramofile/bplaysrc/bplay.c
 ===================================================================
-RCS file: /home/kobras/cvsroot/debian/gramofile/bplaysrc/bplay.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 bplay.c
---- bplaysrc/bplay.c	2001/05/05 14:07:15	1.1.1.2
-+++ bplaysrc/bplay.c	2005/01/31 15:54:06
-@@ -26,6 +26,30 @@
+--- gramofile.orig/bplaysrc/bplay.c	2011-08-14 13:27:15.593217482 +0200
++++ gramofile/bplaysrc/bplay.c	2011-08-14 13:27:16.377717882 +0200
+@@ -30,6 +30,30 @@
  #include <machine/soundcard.h>
  #endif
  
@@ -42,7 +38,7 @@ diff -u -r1.1.1.2 bplay.c
  #include "fmtheaders.h"
  
  #include "../yesnowindow.h"
-@@ -290,23 +314,26 @@
+@@ -287,23 +311,26 @@
  				char *data = "data";
  
  				memcpy(&(header.main_chunk), riff, 4);
@@ -78,7 +74,7 @@ diff -u -r1.1.1.2 bplay.c
  				write(thefd, &header, sizeof(header));
  			}
  		case F_RAW:
-@@ -336,9 +363,9 @@
+@@ -333,9 +360,9 @@
  
  				for (i=0;i<20;i++)
  					header.Magic[i] = VOC_MAGIC[i];
@@ -91,7 +87,7 @@ diff -u -r1.1.1.2 bplay.c
  				write(thefd, &header, sizeof(vochead));
  
  				snd_parm(speed, bits, stereo);
-@@ -349,10 +376,10 @@
+@@ -346,10 +373,10 @@
  				ablk.BlockLen[0] = (i + 12) & 0xFF;
  				ablk.BlockLen[1] = ((i + 12) >> 8) & 0xFF;
  				ablk.BlockLen[2] = ((i + 12) >> 16) & 0xFF;
@@ -104,7 +100,7 @@ diff -u -r1.1.1.2 bplay.c
  				write(thefd, &ablk, sizeof(ablk));
  				write(thefd, &bblk, sizeof(bblk));
  				shmrec(thefd, i, 1);
-@@ -476,6 +503,17 @@
+@@ -474,6 +501,17 @@
  
      memcpy((void*)&wavhd, (void*)hd_buf, 20);
      count = read(thefd, ((char*)&wavhd)+20, sizeof(wavhd) - 20);
@@ -122,7 +118,7 @@ diff -u -r1.1.1.2 bplay.c
      if(wavhd.format != 1) Die("Input is not a PCM WAV file");
  #ifndef LP2CD
      if (! (mods&MSPEED))
-@@ -518,6 +556,11 @@
+@@ -516,6 +554,11 @@
      fprintf(stderr, "Playing Creative Labs Voice file ...\n");
      memcpy((void*)&vochd, (void*)hd_buf, 20);
      count = read(thefd, ((char*)&vochd)+20, sizeof(vochd) - 20);
@@ -134,7 +130,7 @@ diff -u -r1.1.1.2 bplay.c
      fprintf(stderr, "Format version %d.%d\n", vochd.Version>>8,
  	vochd.Version&0xFF);
      if (vochd.IDCode != (~vochd.Version+0x1234))
-@@ -566,6 +609,9 @@
+@@ -564,6 +607,9 @@
  	{
  	blockT8 tblock;
  	read(thefd, (char*)&tblock, sizeof(tblock));
@@ -144,7 +140,7 @@ diff -u -r1.1.1.2 bplay.c
  	if(tblock.PackMethod != 0) Die("Non PCM VOC block");
  	speed = 256000000/(65536 - tblock.TimeConstant);
  	bits = 8;
-@@ -578,6 +624,10 @@
+@@ -576,6 +622,10 @@
  	{
  	blockT9 tblock;
  	read(thefd, (char*)&tblock, sizeof(tblock));
@@ -155,13 +151,10 @@ diff -u -r1.1.1.2 bplay.c
  	if(tblock.Format != 0 && tblock.Format != 4)
  	    Die("Non PCM VOC block");
  	speed = tblock.SamplesPerSec;
-Index: bplaysrc/fmtheaders.h
+Index: gramofile/bplaysrc/fmtheaders.h
 ===================================================================
-RCS file: /home/kobras/cvsroot/debian/gramofile/bplaysrc/fmtheaders.h,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 fmtheaders.h
---- bplaysrc/fmtheaders.h	2001/05/05 13:52:25	1.1.1.1
-+++ bplaysrc/fmtheaders.h	2005/01/31 15:54:06
+--- gramofile.orig/bplaysrc/fmtheaders.h	2011-08-14 13:21:45.189217975 +0200
++++ gramofile/bplaysrc/fmtheaders.h	2011-08-14 13:27:16.377717882 +0200
 @@ -3,44 +3,50 @@
  
  #include <sys/types.h>
@@ -275,14 +268,11 @@ diff -u -r1.1.1.1 fmtheaders.h
 +} PACKED(wavhead);
  
  #endif
-Index: bplaysrc/sndfunc.c
+Index: gramofile/bplaysrc/sndfunc.c
 ===================================================================
-RCS file: /home/kobras/cvsroot/debian/gramofile/bplaysrc/sndfunc.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 sndfunc.c
---- bplaysrc/sndfunc.c	2001/05/05 14:07:15	1.1.1.2
-+++ bplaysrc/sndfunc.c	2005/01/31 15:54:06
-@@ -64,6 +64,9 @@
+--- gramofile.orig/bplaysrc/sndfunc.c	2011-08-14 13:27:15.113717191 +0200
++++ gramofile/bplaysrc/sndfunc.c	2011-08-14 13:27:16.377717882 +0200
+@@ -66,6 +66,9 @@
  	sync_audio();
  
  	/* Set the sample speed, size and stereoness */
@@ -292,9 +282,10 @@ diff -u -r1.1.1.2 sndfunc.c
  	if (ioctl(audio, SNDCTL_DSP_SAMPLESIZE, &bits) < 0)
  	    ErrDie(AUDIO);
  	if (ioctl(audio, SNDCTL_DSP_STEREO, &stereo) < 0)
-diff -ur endian.c endian.c
---- endian.c	Sat May  5 15:52:25 2001
-+++ endian.c	Fri Jun  8 09:51:44 2001
+Index: gramofile/endian.c
+===================================================================
+--- gramofile.orig/endian.c	2011-08-14 13:21:45.181217123 +0200
++++ gramofile/endian.c	2011-08-14 13:27:16.377717882 +0200
 @@ -24,10 +24,10 @@
    return (tmp);
  }
@@ -309,9 +300,10 @@ diff -ur endian.c endian.c
    tmp = (dw & 0x000000FF);
    tmp = ((dw & 0x0000FF00) >> 0x08) | (tmp << 0x08);
    tmp = ((dw & 0x00FF0000) >> 0x10) | (tmp << 0x08);
-diff -ur endian.h endian.h
---- endian.h	Sat May  5 15:52:25 2001
-+++ endian.h	Fri Jun  8 09:57:11 2001
+Index: gramofile/endian.h
+===================================================================
+--- gramofile.orig/endian.h	2011-08-14 13:27:15.777717640 +0200
++++ gramofile/endian.h	2011-08-14 13:27:16.377717882 +0200
 @@ -4,8 +4,10 @@
  #ifndef _GETBIG
  #define _GETBIG 1
@@ -323,10 +315,11 @@ diff -ur endian.h endian.h
 +extern u_int32_t SwapFourBytes (u_int32_t);
  extern sample_t SwapSample (sample_t);
  
- #endif
-diff -ur fmtheaders.h fmtheaders.h
---- fmtheaders.h	2001-05-05 15:52:25.000000000 +0200
-+++ fmtheaders.h	2005-03-01 14:48:54.000000000 +0100
+ /* macro to swap endianness of values in a sample_t with */
+Index: gramofile/fmtheaders.h
+===================================================================
+--- gramofile.orig/fmtheaders.h	2011-08-14 13:21:45.173217473 +0200
++++ gramofile/fmtheaders.h	2011-08-14 13:27:16.377717882 +0200
 @@ -3,55 +3,51 @@
  
  #include <sys/types.h>
diff --git a/debian/80_fix_wav_length.dpatch b/debian/patches/80_fix_wav_length.patch
similarity index 83%
rename from debian/80_fix_wav_length.dpatch
rename to debian/patches/80_fix_wav_length.patch
index 79937fb..9a7cbc5 100644
--- a/debian/80_fix_wav_length.dpatch
+++ b/debian/patches/80_fix_wav_length.patch
@@ -1,8 +1,9 @@
 # Add post-recording fixup of length fields in wav header to reflect
 # correct file size when recording was stopped prematurely by the user.
-#PATCHOPTIONS: -p0
---- bplaysrc/bplay.c.orig	2005-03-01 19:17:34.000000000 +0100
-+++ bplaysrc/bplay.c	2005-03-01 19:18:17.000000000 +0100
+Index: gramofile/bplaysrc/bplay.c
+===================================================================
+--- gramofile.orig/bplaysrc/bplay.c	2011-08-14 13:27:16.377717882 +0200
++++ gramofile/bplaysrc/bplay.c	2011-08-14 13:27:16.605717839 +0200
 @@ -297,14 +297,14 @@
  			filetype = F_RAW;	/* Change to change default */
  		switch(filetype)
diff --git a/debian/90_report_recording_errors.dpatch b/debian/patches/90_report_recording_errors.patch
similarity index 94%
rename from debian/90_report_recording_errors.dpatch
rename to debian/patches/90_report_recording_errors.patch
index 3d0567f..afdc932 100644
--- a/debian/90_report_recording_errors.dpatch
+++ b/debian/patches/90_report_recording_errors.patch
@@ -1,7 +1,8 @@
 # Report errors during recording to the user. [dk]
-#PATCHOPTIONS: -p0
---- bplaysrc/shmbuf.c.orig	2005-03-02 12:24:48.000000000 +0100
-+++ bplaysrc/shmbuf.c	2005-03-02 12:34:36.000000000 +0100
+Index: gramofile/bplaysrc/shmbuf.c
+===================================================================
+--- gramofile.orig/bplaysrc/shmbuf.c	2011-08-14 13:27:14.625717934 +0200
++++ gramofile/bplaysrc/shmbuf.c	2011-08-14 13:27:16.773717474 +0200
 @@ -80,10 +80,12 @@
  static char **buffarr;
  static int numbuffs, numsemblks;
diff --git a/debian/91_rename_cdrecord_wodim.dpatch b/debian/patches/91_rename_cdrecord_wodim.patch
similarity index 66%
rename from debian/91_rename_cdrecord_wodim.dpatch
rename to debian/patches/91_rename_cdrecord_wodim.patch
index ac85859..a9301c0 100644
--- a/debian/91_rename_cdrecord_wodim.dpatch
+++ b/debian/patches/91_rename_cdrecord_wodim.patch
@@ -6,18 +6,26 @@
 #  by Tobias Frost, tobi@coldtobi.de, 12-31-2006
 #PATCHOPTIONS -p1
 
-diff -pur -p1 gramofile-1.6.orig/mainmenu.c gramofile-1.6-patched/mainmenu.c
---- gramofile-1.6.orig/mainmenu.c	2006-12-31 11:42:45.000000000 +0100
-+++ gramofile-1.6-patched/mainmenu.c	2006-12-31 11:34:58.000000000 +0100
-@@ -221,3 +221,3 @@ will be generated, each containing one t
+Index: gramofile/mainmenu.c
+===================================================================
+--- gramofile.orig/mainmenu.c	2011-08-14 13:27:15.277217351 +0200
++++ gramofile/mainmenu.c	2011-08-14 13:27:16.945717435 +0200
+@@ -219,7 +219,7 @@
+ separation points are computed (previous option), separate audio files \
+ will be generated, each containing one track.",
  
 -    "This option is not implemented yet. You can use the `cdrecord' \
 +    "This option is not implemented yet. You can use the `wodim' \
  or `xcdroast' program to create CDs from sound files on the harddisk.",
-diff -pur -p1 gramofile-1.6.orig/README gramofile-1.6-patched/README
---- gramofile-1.6.orig/README	2000-03-28 23:06:32.000000000 +0200
-+++ gramofile-1.6-patched/README	2006-12-31 11:38:49.000000000 +0100
-@@ -219,15 +219,12 @@ Write an audio CD: 
+ 
+     "(Parts of) sound files can be played with this option."
+Index: gramofile/README
+===================================================================
+--- gramofile.orig/README	2011-08-14 13:21:45.009217561 +0200
++++ gramofile/README	2011-08-14 13:27:16.945717435 +0200
+@@ -217,19 +217,16 @@
+ 
+ Write an audio CD: 
   - This option is not yet implemented. There are some plans to program a
 -    uniform user interface to the cdrecord(1) program here. You have to
 +    uniform user interface to the wodim(1) program here. You have to
@@ -40,4 +48,5 @@ diff -pur -p1 gramofile-1.6.orig/README gramofile-1.6-patched/README
 +    You always can use a graphical front-end to write CD's, like the 
 +    xcdroast program. See the xcdroast package for details.
  
-
+ Play an audio file: 
+  - Make sure the PCM and Master volumes are set high enough, and your
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6ddf9c3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,14 @@
+20-Makefile.patch
+20-no-busy-wait-after-rec.patch
+20-overflow-fixes.patch
+20-shell-quoting.patch
+20-via-kludge.patch
+20-warning-fixes.patch
+30-basename-fix.patch
+40-fast-swap-and-buffer.patch
+50-cmf3.patch
+60-bplay_in_gramo.patch
+70-endian-fixes.patch
+80_fix_wav_length.patch
+90_report_recording_errors.patch
+91_rename_cdrecord_wodim.patch
diff --git a/debian/rules b/debian/rules
index 7ec935a..a5e0d78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,248 +1,4 @@
-#!/usr/bin/make -f
-# Generated automatically from debian/packages
-# by yada v0.52, of Fri,  8 Dec 2006
+#! /usr/bin/make -f
 
-DEB_HOST_ARCH        := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
-DEB_HOST_ARCH_OS     := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
-DEB_HOST_ARCH_CPU    := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
-DEB_HOST_GNU_CPU     := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU 2>/dev/null)
-DEB_HOST_GNU_TYPE    := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE 2>/dev/null)
-DEB_HOST_GNU_SYSTEM  := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM 2>/dev/null)
-
-DEB_BUILD_ARCH       := $(shell dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null)
-DEB_BUILD_ARCH_OS    := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS 2>/dev/null)
-DEB_BUILD_ARCH_CPU   := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null)
-DEB_BUILD_GNU_CPU    := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU 2>/dev/null)
-DEB_BUILD_GNU_TYPE   := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE 2>/dev/null)
-DEB_BUILD_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM 2>/dev/null)
-
-# Take account of old dpkg-architecture output.
-ifeq ($(DEB_HOST_ARCH_CPU),)
-  DEB_HOST_ARCH_CPU := $(DEB_HOST_GNU_CPU))
-  ifeq ($(DEB_HOST_ARCH_CPU),i486)
-    DEB_HOST_ARCH_OS := i386
-  else
-  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
-    DEB_HOST_ARCH_OS := amd64
-  endif
-  endif
-endif
-ifeq ($(DEB_HOST_ARCH_OS),)
-  DEB_HOST_ARCH_OS := $(subst -gnu,,$(DEB_HOST_GNU_SYSTEM))
-  ifeq ($(DEB_HOST_ARCH_OS),gnu)
-    DEB_HOST_ARCH_OS := hurd
-  endif
-endif
-ifeq ($(DEB_BUILD_ARCH_CPU),)
-  DEB_BUILD_ARCH_CPU := $(DEB_BUILD_GNU_CPU))
-  ifeq ($(DEB_BUILD_ARCH_CPU),i486)
-    DEB_BUILD_ARCH_OS := i386
-  else
-  ifeq ($(DEB_BUILD_ARCH_CPU),x86_64)
-    DEB_BUILD_ARCH_OS := amd64
-  endif
-  endif
-endif
-ifeq ($(DEB_BUILD_ARCH_OS),)
-  DEB_BUILD_ARCH_OS := $(subst -gnu,,$(DEB_BUILD_GNU_SYSTEM))
-  ifeq ($(DEB_BUILD_ARCH_OS),gnu)
-    DEB_BUILD_ARCH_OS := hurd
-  endif
-endif
-
-LEFT_PARENTHESIS:=(
-VERSION:=$(shell head -n1 debian/changelog | sed -e "s/^[0-9a-zA-Z.-]* $(LEFT_PARENTHESIS)//" -e "s/[^0-9a-zA-Z.:+~-].*//")
-
-SHELL=/bin/bash
-
-.PHONY: default
-default:
-	@echo "Specify a target:"; \
-	echo " build              compile the package"; \
-	echo " build-arch         compile the architecture-dependent package"; \
-	echo " build-indep        compile the architecture-independent package"; \
-	echo " binary             make all binary packages"; \
-	echo " binary-arch        make all architecture-dependent binary packages"; \
-	echo " binary-indep       make all architecture-independent binary packages"; \
-	echo " clean              clean up the source package"; \
-	echo; \
-	echo " clean-install-tree clean up only under debian/"; \
-	echo
-
-# Build the package and prepare the install tree
-
-.PHONY: build-only build
-build-only: debian/build-stamp
-build: build-only
-
-.PHONY: build-arch-only build-arch
-build-arch-only: debian/build-arch-stamp
-build-arch: build-arch-only
-
-.PHONY: build-indep-only build-indep
-build-indep-only: debian/build-indep-stamp
-build-indep: build-indep-only
-
-# Make sure these rules and the control file are up-to-date
-
-.PHONY: rules control templates
-rules: debian/rules
-debian/rules: $(shell which yada) debian/packages-tmp
-	yada rebuild rules
-
-control: debian/control
-debian/control: $(shell which yada) debian/packages-tmp
-	yada rebuild control
-
-templates: debian/templates debian/po/POTFILES.in
-debian/templates: $(shell which yada) debian/packages-tmp
-	yada rebuild templates
-debian/po/POTFILES.in: $(shell which yada) debian/packages-tmp
-	yada rebuild templates
-
-debian/build-stamp: debian/build-arch-stamp debian/build-indep-stamp
-	@[ -f $(shell which yada) -a -f debian/rules ]
-	yada patch "debian/*.dpatch"
-	@umask 022 \
-	  && export pwd="$$(pwd)" \
-	  && export TMPROOT="$$(pwd)/debian/tmp" \
-	  && export SOURCE="gramofile" \
-	  && export VERSION="$(VERSION)" \
-	  && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
-	  && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
-	  && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
-	  && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
-	  && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
-	  && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
-	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
-	echo -E 'make') | /bin/sh
-	touch debian/build-stamp
-
-debian/build-arch-stamp:
-	@[ -f $(shell which yada) -a -f debian/rules ]
-	yada patch "debian/*.dpatch"
-	touch debian/build-arch-stamp
-
-debian/build-indep-stamp: debian/build-arch-stamp
-	@[ -f $(shell which yada) -a -f debian/rules ]
-	yada patch "debian/*.dpatch"
-	touch debian/build-indep-stamp
-
-.PHONY: install-tree
-install-tree: install-tree-any
-install-tree-any: \
-	debian/tmp-gramofile/DEBIAN/control
-
-debian/tmp-gramofile/DEBIAN/control: debian/build-stamp debian/control
-	rm -rf debian/tmp-gramofile
-	umask 022 && install -d debian/tmp-gramofile/DEBIAN
-	install -d debian/tmp-gramofile/usr/share/doc/gramofile
-	umask 022; yada generate copyright \
-	  > debian/tmp-gramofile/usr/share/doc/gramofile/copyright
-	install -m 644 -p debian/changelog \
-	  debian/tmp-gramofile/usr/share/doc/gramofile/changelog.Debian
-	@umask 022 \
-	  && export pwd="$$(pwd)" \
-	  && export ROOT="$$(pwd)/debian/tmp-gramofile" \
-	  && export TMPROOT="$$(pwd)/debian/tmp" \
-	  && export CONTROL="$$(pwd)/debian/tmp-gramofile/DEBIAN" \
-	  && export PACKAGE="gramofile" \
-	  && export SOURCE="gramofile" \
-	  && export VERSION="$(VERSION)" \
-	  && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
-	  && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
-	  && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
-	  && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
-	  && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
-	  && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
-	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
-	echo -E 'yada install -bin gramofile';\
-	echo -E 'yada install -lib -exec -subdir gramofile bplay_gramo';\
-	echo -E 'ln -s bplay_gramo $$ROOT/usr/lib/gramofile/brec_gramo';\
-	echo -E 'yada install -man debian/gramofile.1';\
-	echo -E 'yada install -doc ChangeLog -as changelog';\
-	echo -E 'yada install -doc README TODO *.txt') | /bin/sh
-	@umask 022 \
-	  && export pwd="$$(pwd)" \
-	  && export ROOT="$$(pwd)/debian/tmp-gramofile" \
-	  && export TMPROOT="$$(pwd)/debian/tmp" \
-	  && export CONTROL="$$(pwd)/debian/tmp-gramofile/DEBIAN" \
-	  && export PACKAGE="gramofile" \
-	  && export SOURCE="gramofile" \
-	  && export VERSION="$(VERSION)" && (\
-	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
-	echo -E 'yada perl';\
-	echo -E 'yada python';\
-	echo -E 'yada strip';\
-	echo -E 'yada shlibdeps') | /bin/sh
-	rm -f debian/shlibs.local || true
-	test -f debian/tmp-gramofile/DEBIAN/shlibs && cat debian/tmp-gramofile/DEBIAN/shlibs | while read lib ver pkg; do echo $$lib $$ver; done >> debian/shlibs.local || true
-	LD_LIBRARY_PATH="$$LD_LIBRARY_PATH:debian/tmp-gramofile/lib:debian/tmp-gramofile/usr/lib" dpkg-shlibdeps -pshlibs:gramofile -dDepends debian/tmp-gramofile/usr/bin/*
-	yada compress gramofile
-	yada generate maintscripts gramofile
-	find debian/tmp-gramofile -type f -print \
-	  | sed -n 's/^debian\/tmp-gramofile\(\/etc\/.*\)$$/\1/p' \
-	  > debian/tmp-gramofile/DEBIAN/conffiles
-	test -s debian/tmp-gramofile/DEBIAN/conffiles || rm -f debian/tmp-gramofile/DEBIAN/conffiles
-	yada rebuild control
-	yada generate substvars gramofile
-	umask 022 && dpkg-gencontrol -isp -pgramofile -Pdebian/tmp-gramofile
-
-# Build package files
-
-.PHONY: binary binary-arch binary-indep
-binary: binary-arch binary-indep
-binary-arch: binary-arch-any
-
-.PHONY: binary-arch-any
-binary-arch-any: \
-	binary-package-gramofile
-binary-indep:
-
-.PHONY: binary-package-gramofile
-binary-package-gramofile: check-root debian/tmp-gramofile/DEBIAN/control
-	@[ -f $(shell which yada) -a -f debian/rules ]
-	chown -R 0.0 debian/tmp-gramofile
-	chmod -R u=rwX,go=rX debian/tmp-gramofile
-	@if [ -d debian/tmp-gramofile/usr/doc/gramofile ]; then \
-	  echo "*** Yada warning: /usr/doc/gramofile should be /usr/share/doc/gramofile";\
-	fi
-	dpkg-deb --build debian/tmp-gramofile ..
-
-.PHONY: check-root
-check-root:
-	@[ `id -u` = 0 ] || (echo "You must be root to do this!"; false)
-
-debian/packages-tmp: debian/packages 
-	yada rebuild packages
-
-## Clean up afterwards
-
-.PHONY: clean clean-install-tree clean-build
-
-clean: clean-install-tree clean-build debian/control debian/rules
-	rm -f debian/packages-tmp debian/packages-tmp-new debian/packages-tmp-include
-
-clean-build:
-	@[ -f $(shell which yada) -a -f debian/rules ]
-	rm -f debian/build-stamp debian/build-arch-stamp debian/build-indep-stamp
-	@umask 022 \
-	  && export pwd="$$(pwd)" \
-	  && export TMPROOT="$$(pwd)/debian/tmp" \
-	  && export SOURCE="gramofile" \
-	  && export VERSION="$(VERSION)" \
-	  && export DEB_HOST_GNU_CPU="$(DEB_HOST_GNU_CPU)" \
-	  && export DEB_HOST_GNU_TYPE="$(DEB_HOST_GNU_TYPE)" \
-	  && export DEB_HOST_GNU_SYSTEM="$(DEB_HOST_GNU_SYSTEM)" \
-	  && export DEB_BUILD_GNU_CPU="$(DEB_BUILD_GNU_CPU)" \
-	  && export DEB_BUILD_GNU_TYPE="$(DEB_BUILD_GNU_TYPE)" \
-	  && export DEB_BUILD_GNU_SYSTEM="$(DEB_BUILD_GNU_SYSTEM)" && (\
-	echo -E 'eval "yada () { perl $$(which yada) \"\$$@\"; }"; set -e; set -v';\
-	echo -E 'make clean || :') | /bin/sh
-	yada unpatch
-	rm -rf debian/tmp
-
-clean-install-tree: debian/rules
-	@[ -f $(shell which yada) -a -f debian/rules ]
-	rm -f debian/install-tree-stamp
-	rm -rf debian/tmp-* debian/files* debian/substvars debian/shlibs.local debian/ucf
+%:
+	dh $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

Message #32 received at 636885@bugs.debian.org (full text, mbox, reply):

From: Cyril Brulebois <kibi@debian.org>

To: Gergely Nagy <algernon@madhouse-project.org>, 636885@bugs.debian.org

Cc: control@bugs.debian.org

Subject: Re: Bug#636885: gramofile: debhelperification

Date: Fri, 17 Feb 2012 11:39:20 +0100

[Message part 1 (text/plain, inline)]

tag 636885 patch pending
thanks

Gergely Nagy <algernon@madhouse-project.org> (14/08/2011):
> The attached patch converts the gramofile packaging from yada to
> debhelper (short form v8).
> 
> The package contents are almost the same: debhelper does not compress
> the TODO file, and that's about it.
> 
> As a side effect, the package was converted to 3.0 (quilt) format, and
> all the patches to -p1, and they were all quilt refreshed to apply
> cleanly.

patch -p1 wasn't happy with it (missing patches), so I did some extra massaging.

Please find attached the (huge, sorry) diff for my NMU/QA upload.

Mraw,
KiBi.

[gramofile-636885.diff.xz (application/octet-stream, attachment)]

[signature.asc (application/pgp-signature, inline)]

Message #39 received at 636885-close@bugs.debian.org (full text, mbox, reply):

From: Cyril Brulebois <kibi@debian.org>

To: 636885-close@bugs.debian.org

Subject: Bug#636885: fixed in gramofile 1.6-9

Date: Fri, 17 Feb 2012 10:47:12 +0000

Source: gramofile
Source-Version: 1.6-9

We believe that the bug you reported is fixed in the latest version of
gramofile, which is due to be installed in the Debian FTP archive:

gramofile_1.6-9.diff.gz
  to main/g/gramofile/gramofile_1.6-9.diff.gz
gramofile_1.6-9.dsc
  to main/g/gramofile/gramofile_1.6-9.dsc
gramofile_1.6-9_amd64.deb
  to main/g/gramofile/gramofile_1.6-9_amd64.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 636885@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Cyril Brulebois <kibi@debian.org> (supplier of updated gramofile package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Fri, 17 Feb 2012 10:13:50 +0000
Source: gramofile
Binary: gramofile
Architecture: source amd64
Version: 1.6-9
Distribution: unstable
Urgency: low
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Cyril Brulebois <kibi@debian.org>
Description: 
 gramofile  - Transfer sound from gramophone records to CD
Closes: 636885
Changes: 
 gramofile (1.6-9) unstable; urgency=low
 .
   [ Cyril Brulebois ]
   * QA upload.
   * Apply Gergely's patch from the BTS (changelog entry kept below for
     reference), with the following tweaks:
     - Stay with 1.0 format, 3.0 (quilt) makes my head hurt.
     - Use the quilt sequence, and add quilt to Build-Depends.
     - Move patches from debian/*.dpatch to debian/patches/*.patch.
   * Orphan the package, since it has been RC buggy for a while, and has
     seen no sign of maintainer action in a very long while.
   * Thanks to IRILL for sponsoring this BSP in Paris.
 .
   [ Gergely Nagy ]
   * Converted the build system from yada to debhelper (Closes: #636885).
       + This resulted in converting to Format: 3.0 (quilt).
       + Standards-Version bumped to 3.9.2.
       + All patches quilt refreshed to apply cleanly.
Checksums-Sha1: 
 cd524d1fe8e4a4afed8b7789331b834881adb280 1044 gramofile_1.6-9.dsc
 ed86e5a410523e02873235be02babddd8a7ef111 25244 gramofile_1.6-9.diff.gz
 e8ea6d505fc097b34b1c88842103c0878f0783f6 114534 gramofile_1.6-9_amd64.deb
Checksums-Sha256: 
 1bdb8ba1aed826e1c5395d4498052cb3dadbed206d267f6dc912e1275d87415b 1044 gramofile_1.6-9.dsc
 f18fba5fba9889cf8090c22643fa39e6e93011d66a75e6274311f70244d8826e 25244 gramofile_1.6-9.diff.gz
 1d40a54961c2aff34d5245ae36ea2870d7c4d0de6c731dec5b56603fcea46bfc 114534 gramofile_1.6-9_amd64.deb
Files: 
 aa172e92cf04a612d60eb65c12a0c60a 1044 sound extra gramofile_1.6-9.dsc
 3b76ec01a36ee77b1bdef42751536710 25244 sound extra gramofile_1.6-9.diff.gz
 e5cd41d664b5fc81dfbd9857b7c1abfa 114534 sound extra gramofile_1.6-9_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAk8+LOoACgkQeGfVPHR5Nd2RKACgyfJhjxeN2tBfW5eA2NyhVWYK
zEIAn3gn1+QHEt8eLTw7WOvDOraQJJX1
=gOcu
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.