[Pommed-commits] r427 - in trunk: . pommed pommed/data

[jblache at alioth.debian.org]

Author: jblache
Date: 2007-12-12 11:39:26 +0000 (Wed, 12 Dec 2007)
New Revision: 427

Added:
   trunk/pommed/data/click.wav
Removed:
   trunk/pommed/data/KDE_Beep_Beep.wav
Modified:
   trunk/AUTHORS
   trunk/ChangeLog
   trunk/INSTALL
   trunk/pommed.conf.mactel
   trunk/pommed.conf.pmac
   trunk/pommed/beep.h
Log:
Make goutte.wav the default beep sound, add click.wav and remove the KDE beep sound.


Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	2007-12-12 11:25:58 UTC (rev 426)
+++ trunk/AUTHORS	2007-12-12 11:39:26 UTC (rev 427)
@@ -19,14 +19,14 @@
 On PowerBook machines, pommed uses the OFlib written by
 Alastair Poole <netstar at gatheringofgray.com>
 
-The beep sound KDE_Beep_Beep.wav included with pommed was taken from the kdebase
-package, version 3.5.7, under the GPL.
-
 The water drop sound goutte.wav included with pommed was contributed by
 Romain BEAUXIS <toots at rastageeks.org> under the WTFPL,
 Copyright (C) 2007 Yann Beauxis.
 
+The click.wav sound file shipped with pommed comes from the Classic theme
+from PBButtons and is released under the GPLv2+.
 
+
 gpomme
 ------
 

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-12-12 11:25:58 UTC (rev 426)
+++ trunk/ChangeLog	2007-12-12 11:39:26 UTC (rev 427)
@@ -5,6 +5,8 @@
 	- pommed: fix error handling in the audio sample loading code to
 	properly report failure, preventing nasty segfaults later on in
 	case the sound file is not available.
+	- pommed: make goutte.wav the default beep sound, add click.wav
+	and remove the KDE beep sound.
 
 version 1.13:
 	- pommed: add an option to disable the beep on volume change.

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2007-12-12 11:25:58 UTC (rev 426)
+++ trunk/INSTALL	2007-12-12 11:39:26 UTC (rev 427)
@@ -45,8 +45,7 @@
 
 To install pommed:
  - copy pommed somewhere in your PATH (/usr/bin)
- - install pommed/data/KDE_Beep_Beep.wav as /usr/share/pommed/beep.wav
- - install pommed/data/goutte.wav as /usr/share/pommed/goutte.wav
+ - copy pommed/data/* to /usr/share/pommed
  - copy pommed.conf.(mactel|pmac) as /etc/pommed.conf
  - install the pommed.init initscript as /etc/init.d/pommed, make it executable
    and perform any additional configuration needed on your system (links to

Modified: trunk/pommed/beep.h
===================================================================
--- trunk/pommed/beep.h	2007-12-12 11:25:58 UTC (rev 426)
+++ trunk/pommed/beep.h	2007-12-12 11:39:26 UTC (rev 427)
@@ -13,7 +13,7 @@
 extern struct _beep_info beep_info;
 
 
-#define BEEP_DEFAULT_FILE    "/usr/share/pommed/beep.wav"
+#define BEEP_DEFAULT_FILE    "/usr/share/pommed/goutte.wav"
 #define BEEP_DEVICE_NAME     "Pommed beeper device"
 
 void

Deleted: trunk/pommed/data/KDE_Beep_Beep.wav
===================================================================
(Binary files differ)

Added: trunk/pommed/data/click.wav
===================================================================
(Binary files differ)


Property changes on: trunk/pommed/data/click.wav
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/pommed.conf.mactel
===================================================================
--- trunk/pommed.conf.mactel	2007-12-12 11:25:58 UTC (rev 426)
+++ trunk/pommed.conf.mactel	2007-12-12 11:39:26 UTC (rev 427)
@@ -87,8 +87,8 @@
 beep {
 	# enable/disable beeper
 	enabled = no
-	# WAV file to use (from pommed: beep.wav or goutte.wav)
-	beepfile = "/usr/share/pommed/beep.wav"
+	# WAV file to use (from pommed: goutte.wav or click.wav in /usr/share/pommed)
+	beepfile = "/usr/share/pommed/goutte.wav"
 }
 
 # Apple Remote - deprecated

Modified: trunk/pommed.conf.pmac
===================================================================
--- trunk/pommed.conf.pmac	2007-12-12 11:25:58 UTC (rev 426)
+++ trunk/pommed.conf.pmac	2007-12-12 11:39:26 UTC (rev 427)
@@ -77,6 +77,6 @@
 beep {
 	# enable/disable beeper
 	enabled = no
-	# WAV file to use (from pommed: beep.wav or goutte.wav)
-	beepfile = "/usr/share/pommed/beep.wav"
+	# WAV file to use (from pommed: goutte.wav or click.wav in /usr/share/pommed)
+	beepfile = "/usr/share/pommed/goutte.wav"
 }