Hi,

I intend to NMU dtmfdial to fix #336912, #277379, and other minor
glitches. An updated package will be uploaded to Delayed/7, diff is
below.

debdiff dtmfdial_0.2-2.dsc ./dtmfdial_0.2-2.1.dsc
 debian/README.debian           |   17 -----------------
 dtmfdial-0.2/debian/control    |    3 +--
 dtmfdial-0.2/debian/rules      |    2 +-
 dtmfdial-0.2/debian/changelog  |   12 ++++++++++++
 dtmfdial-0.2/debian/dtmfdial.1 |    2 +-
 debian/prerm                   |    7 -------
 debian/postinst                |    9 ---------
 README                         |   10 +++++-----
 dial.c                         |    5 +++++
 9 files changed, 25 insertions(+), 42 deletions(-)

reverted:
--- dtmfdial-0.2/debian/README.debian
+++ dtmfdial-0.2.orig/debian/README.debian
@@ -1,17 +0,0 @@
-DTMF-Dial v 0.2
-----------------
-
-This is a simple command line program. All you do is give it a 
-string of numbers and it plays the tones corresponding to 
-modern telephone system tones, as used in "TouchTone" phones.
-If your phone system supports it you could dial the phone with this
-programs and a cheap soundcard.
-
-This program generates all standard DTMF tones for 0-9,*,#,A-D (NB: A-D are
-not on most peoples phones). This program is primarily designed to
-be used with a phone number database, and actually making this program
-into a database of its own is on the authors "TODO" list.
-
-This program has no man page yet (also on the TODO list).
- 
-Stephen J. Carpenter <[EMAIL PROTECTED]>, Thu, 23 Jul 1998 00:53:23 -0400
diff -u dtmfdial-0.2/debian/control dtmfdial-0.2/debian/control
--- dtmfdial-0.2/debian/control
+++ dtmfdial-0.2/debian/control
@@ -17,2 +17 @@
- phone dialer from address book programs. 
- 
+ phone dialer from address book programs.
diff -u dtmfdial-0.2/debian/rules dtmfdial-0.2/debian/rules
--- dtmfdial-0.2/debian/rules
+++ dtmfdial-0.2/debian/rules
@@ -38,7 +38,7 @@
        install -d debian/tmp/usr/bin
        install -s dtmfdial debian/tmp/usr/bin
 # Must have debhelper installed.
-       dh_installdocs TODO README dtmf-dial-0.2.lsm  
+       dh_installdocs README dtmf-dial-0.2.lsm  
        dh_installman debian/dtmfdial.1
        dh_installchangelogs
        dh_strip
diff -u dtmfdial-0.2/debian/changelog dtmfdial-0.2/debian/changelog
--- dtmfdial-0.2/debian/changelog
+++ dtmfdial-0.2/debian/changelog
@@ -1,3 +1,15 @@
+dtmfdial (0.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Apply patch by Aurelien Jarno to fix FTBFS on GNU/kFreeBSD
+    (Closes: #336912).
+  * Fix typos in README, remove redundant README.Debian and TODO files
+    (Closes: #277379).
+  * Remove /usr/doc stuff.
+  * Fix .TH in manpage.
+
+ -- Christoph Berg <[EMAIL PROTECTED]>  Thu,  9 Mar 2006 19:28:06 +0100
+
 dtmfdial (0.2-2) unstable; urgency=low
 
   * New maintainer (Closes: #135948)
diff -u dtmfdial-0.2/debian/dtmfdial.1 dtmfdial-0.2/debian/dtmfdial.1
--- dtmfdial-0.2/debian/dtmfdial.1
+++ dtmfdial-0.2/debian/dtmfdial.1
@@ -3,7 +3,7 @@
 .\"
 .\" This template provided by Tom Christiansen <[EMAIL PROTECTED]>.
 .\" 
-.TH User Command SECTION 
+.TH DTMFDIAL 1
 .SH NAME
 dtmfdial \- DTMF tone generator
 .SH SYNOPSIS
reverted:
--- dtmfdial-0.2/debian/prerm
+++ dtmfdial-0.2.orig/debian/prerm
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Automatically added by dh_installdocs
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/dtmfdial ]; then
-       rm -f /usr/doc/dtmfdial
-fi
-# End automatically added section
reverted:
--- dtmfdial-0.2/debian/postinst
+++ dtmfdial-0.2.orig/debian/postinst
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# Automatically added by dh_installdocs
-if [ "$1" = "configure" ]; then
-       if [ -d /usr/doc -a ! -e /usr/doc/dtmfdial -a -d 
/usr/share/doc/dtmfdial ]; then
-               ln -sf ../share/doc/dtmfdial /usr/doc/dtmfdial
-       fi
-fi
-# End automatically added section
only in patch2:
unchanged:
--- dtmfdial-0.2.orig/README
+++ dtmfdial-0.2/README
@@ -8,14 +8,14 @@
 dialing and by default sends the signals to the sound card.
 
 It can be used for easy dialing, simply put the telephone
-microphone near the compiter speaker and let the software
+microphone near the computer speaker and let the software
 dial for you.
 
 It is intended for dialing from within data base programs that
 also store telephone numbers.
 
 Usage:
-Usually you just run need to give the phone number
+Usually you just need to give the phone number
 that you wish to dial as an argument.
     dial 555-3456
 
@@ -36,7 +36,7 @@
   --output-dev device          (default /dev/dsp)
 This option can be used also to store raw audio samples to
 a file, or to stdout. Use the file name with the --output-dev
-option, ir a simpe "-" to sent to stdout.
+option, or a simple "-" to send to stdout.
 If the output device is not the sound special file then another
 option should be used to eliminate attempts to set the sound
 driver parameters:
@@ -46,7 +46,7 @@
 It is possible to generate the samples in AFMT_S16_LE format,
 To do that use the option:
   --bits  bits-per-sample  (default 8)
-8 will geneate AFMT_U8 format, 16 will generate AFMT_S16_LE format.
+8 will generate AFMT_U8 format, 16 will generate AFMT_S16_LE format.
 
 It is possible to generate samples in a different sampling rate.
 To do that use the option:
@@ -67,4 +67,4 @@
 To generate a stereo sound use the options --right or
 --left. By default they are 0 and a mono sample is generated.
 If any of these option are 1, a stereo sample will be generated
-and the corrensponding channel will be turned on.
+and the corresponding channel will be turned on.
only in patch2:
unchanged:
--- dtmfdial-0.2.orig/dial.c
+++ dtmfdial-0.2/dial.c
@@ -10,7 +10,12 @@
 #include <malloc.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#if defined(__linux__)
 #include <linux/soundcard.h>
+#endif
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#include <sys/soundcard.h>
+#endif
 
 #define DEBUG(x)
 

Christoph
-- 
[EMAIL PROTECTED] | http://www.df7cb.de/

Attachment: signature.asc
Description: Digital signature

Reply via email to