[Pkg-octave-commit] r2440 - in octave-forge-pkgs/octave-audio: . branches branches/lenny branches/lenny/debian branches/lenny/debian/patches

[Thomas Weber]

tags 496964 pending
thanks

Author: thomas-guest
Date: 2008-10-13 12:58:05 +0000 (Mon, 13 Oct 2008)
New Revision: 2440

Added:
   octave-forge-pkgs/octave-audio/branches/
   octave-forge-pkgs/octave-audio/branches/lenny/
   octave-forge-pkgs/octave-audio/branches/lenny/debian/
   octave-forge-pkgs/octave-audio/branches/lenny/debian/patches/
   octave-forge-pkgs/octave-audio/branches/lenny/debian/patches/dont_set_play_utility
   octave-forge-pkgs/octave-audio/branches/lenny/debian/patches/series
Modified:
   octave-forge-pkgs/octave-audio/branches/lenny/debian/changelog
   octave-forge-pkgs/octave-audio/branches/lenny/debian/control
   octave-forge-pkgs/octave-audio/branches/lenny/debian/rules
Log:
Branch for Lenny, with bugfix for 496964

Copied: octave-forge-pkgs/octave-audio/branches/lenny/debian (from rev 1858, octave-forge-pkgs/octave-audio/trunk/debian)

Modified: octave-forge-pkgs/octave-audio/branches/lenny/debian/changelog
===================================================================
--- octave-forge-pkgs/octave-audio/trunk/debian/changelog	2008-05-11 08:52:11 UTC (rev 1858)
+++ octave-forge-pkgs/octave-audio/branches/lenny/debian/changelog	2008-10-13 12:58:05 UTC (rev 2440)
@@ -1,3 +1,11 @@
+octave-audio (1.1.1-2) unstable; urgency=low
+
+  * New patch: dont_set_play_utility: Don't force the play command to the
+    Mac-only ofsndplay command (closes: #496964).
+  * Add quilt stuff to debian/control and debian/rules for the patch.
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Mon, 13 Oct 2008 10:38:31 +0200
+
 octave-audio (1.1.1-1) unstable; urgency=low
 
   [ Ólafur Jens Sigurðsson ]

Modified: octave-forge-pkgs/octave-audio/branches/lenny/debian/control
===================================================================
--- octave-forge-pkgs/octave-audio/trunk/debian/control	2008-05-11 08:52:11 UTC (rev 1858)
+++ octave-forge-pkgs/octave-audio/branches/lenny/debian/control	2008-10-13 12:58:05 UTC (rev 2440)
@@ -6,7 +6,7 @@
  Thomas Weber <thomas.weber.mail at gmail.com>,
  Rafael Laboissiere <rafael at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 6), cdbs, octave-pkg-dev (>= 0.5.5)
+Build-Depends: debhelper (>= 6), cdbs, octave-pkg-dev (>= 0.5.5), quilt
 Standards-Version: 3.7.3
 Homepage: http://octave.sourceforge.net/audio
 Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/octave-forge-pkgs/octave-audio/trunk

Added: octave-forge-pkgs/octave-audio/branches/lenny/debian/patches/dont_set_play_utility
===================================================================
--- octave-forge-pkgs/octave-audio/branches/lenny/debian/patches/dont_set_play_utility	                        (rev 0)
+++ octave-forge-pkgs/octave-audio/branches/lenny/debian/patches/dont_set_play_utility	2008-10-13 12:58:05 UTC (rev 2440)
@@ -0,0 +1,14 @@
+Bug fix #496964
+Don't set the play command to the Mac-only ofsndplay
+Fix already in upstream SVN, but not yet in the 1.1.2 package
+--- a/src/OFSndPlay.cc
++++ b/src/OFSndPlay.cc
+@@ -11,8 +11,6 @@
+  *     Moved this file file from the MacOSX package to the audio package.
+  */
+ 
+-// PKG_ADD: global sound_play_utility="ofsndplay -";
+-
+ #import <Foundation/Foundation.h>
+ #import <AppKit/AppKit.h>
+ 

Added: octave-forge-pkgs/octave-audio/branches/lenny/debian/patches/series
===================================================================
--- octave-forge-pkgs/octave-audio/branches/lenny/debian/patches/series	                        (rev 0)
+++ octave-forge-pkgs/octave-audio/branches/lenny/debian/patches/series	2008-10-13 12:58:05 UTC (rev 2440)
@@ -0,0 +1 @@
+dont_set_play_utility

Modified: octave-forge-pkgs/octave-audio/branches/lenny/debian/rules
===================================================================
--- octave-forge-pkgs/octave-audio/trunk/debian/rules	2008-05-11 08:52:11 UTC (rev 1858)
+++ octave-forge-pkgs/octave-audio/branches/lenny/debian/rules	2008-10-13 12:58:05 UTC (rev 2440)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/octave-pkg.mk
 
 clean::