[SCM] brutefir/master: Remove direct changes to the upstream sources. Create new patch to apply with quilt.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8de5586ec7355b285c17eb3c38aa05a0494048dd
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Sep 20 13:33:30 2010 +0200

    Remove direct changes to the upstream sources. Create new patch to apply with quilt.

diff --git a/bfrun.c b/bfrun.c
index 3e8b694..e507b87 100644
--- a/bfrun.c
+++ b/bfrun.c
@@ -96,19 +96,19 @@ struct debug_filter_process {
 
 
 struct intercomm_area {
-    volatile bool_t doreset_overflow;
+    bool_t doreset_overflow;
     int sync[BF_MAXPROCESSES];
-    volatile uint32_t period_us[BF_MAXPROCESSES];
-    volatile double realtime_index;
+    uint32_t period_us[BF_MAXPROCESSES];
+    double realtime_index;
     struct bffilter_control fctrl[BF_MAXFILTERS];
     struct bfoverflow overflow[BF_MAXCHANNELS];
     uint32_t ismuted[2][BF_MAXCHANNELS/32];
-    volatile int delay[2][BF_MAXCHANNELS];
-    volatile int n_pids;
-    volatile pid_t pids[BF_MAXPROCESSES];
-    volatile int exit_status;
-    volatile bool_t full_proc[BF_MAXPROCESSES];
-    volatile bool_t ignore_rtprio;
+    int delay[2][BF_MAXCHANNELS];
+    int n_pids;
+    pid_t pids[BF_MAXPROCESSES];
+    int exit_status;
+    bool_t full_proc[BF_MAXPROCESSES];
+    bool_t ignore_rtprio;
 
     struct {
         uint64_t ts_start;
diff --git a/brutefir.1 b/brutefir.1
deleted file mode 100644
index 7966014..0000000
--- a/brutefir.1
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH "DeMuDi undocumented package" "1" 
-.SH "NAME" 
-brutefir \(em program included in the DeMuDi distribution 
-.SH "DESCRIPTION" 
-.PP 
-This program was packaged by the AGNULA team for the 
-DeMuDi project (http://www.agnula.org). 
-.PP 
-A manual page for this application has not been provided 
-yet, but you can access the documentation under /usr/share/doc/brutefir/brutefir.html 
- 
-.SH "SEE ALSO" 
-.PP 
-info (1), whatis (1), apropos (1), dpkg (8), locate (1), 
-find (1), updatedb (1), undocumented (2), man (7), missing (7) 
-.\" created by instant / docbook-to-man, Mon 03 Oct 2005, 08:56 
diff --git a/dai.c b/dai.c
index 9df7c3b..ab2a8c4 100644
--- a/dai.c
+++ b/dai.c
@@ -61,7 +61,7 @@ struct subdev {
     struct {
         int iodelay_fill;
         int curbuf;
-        volatile int frames_left;
+        int frames_left;
     } cb;
 };
 
diff --git a/debian/patches/20-debian_patches.patch b/debian/patches/20-debian_patches.patch
new file mode 100644
index 0000000..80cb48c
--- /dev/null
+++ b/debian/patches/20-debian_patches.patch
@@ -0,0 +1,61 @@
+--- brutefir-1.0f.orig/dai.c
++++ brutefir-1.0f/dai.c
+@@ -61,7 +61,7 @@
+     struct {
+         int iodelay_fill;
+         int curbuf;
+-        int frames_left;
++        volatile int frames_left;
+     } cb;
+ };
+ 
+--- brutefir-1.0f.orig/brutefir.1
++++ brutefir-1.0f/brutefir.1
+@@ -0,0 +1,16 @@
++.TH "DeMuDi undocumented package" "1" 
++.SH "NAME" 
++brutefir \(em program included in the DeMuDi distribution 
++.SH "DESCRIPTION" 
++.PP 
++This program was packaged by the AGNULA team for the 
++DeMuDi project (http://www.agnula.org). 
++.PP 
++A manual page for this application has not been provided 
++yet, but you can access the documentation under /usr/share/doc/brutefir/brutefir.html 
++ 
++.SH "SEE ALSO" 
++.PP 
++info (1), whatis (1), apropos (1), dpkg (8), locate (1), 
++find (1), updatedb (1), undocumented (2), man (7), missing (7) 
++.\" created by instant / docbook-to-man, Mon 03 Oct 2005, 08:56 
+--- brutefir-1.0f.orig/bfrun.c
++++ brutefir-1.0f/bfrun.c
+@@ -96,19 +96,19 @@
+ 
+ 
+ struct intercomm_area {
+-    bool_t doreset_overflow;
++    volatile bool_t doreset_overflow;
+     int sync[BF_MAXPROCESSES];
+-    uint32_t period_us[BF_MAXPROCESSES];
+-    double realtime_index;
++    volatile uint32_t period_us[BF_MAXPROCESSES];
++    volatile double realtime_index;
+     struct bffilter_control fctrl[BF_MAXFILTERS];
+     struct bfoverflow overflow[BF_MAXCHANNELS];
+     uint32_t ismuted[2][BF_MAXCHANNELS/32];
+-    int delay[2][BF_MAXCHANNELS];
+-    int n_pids;
+-    pid_t pids[BF_MAXPROCESSES];
+-    int exit_status;
+-    bool_t full_proc[BF_MAXPROCESSES];
+-    bool_t ignore_rtprio;
++    volatile int delay[2][BF_MAXCHANNELS];
++    volatile int n_pids;
++    volatile pid_t pids[BF_MAXPROCESSES];
++    volatile int exit_status;
++    volatile bool_t full_proc[BF_MAXPROCESSES];
++    volatile bool_t ignore_rtprio;
+ 
+     struct {
+         uint64_t ts_start;

-- 
brutefir packaging