[SCM] rumor packaging branch, master, updated. debian/1.0.3.beta1-2-3-g101fbdb

[ryanakca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 531bdfc3f5f50266fb7e61d33f79350329caae99
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date:   Sat Nov 7 16:09:27 2009 -0500

    Fix deprecated conversion from string constant to 'char*', (Closes: #551857)

diff --git a/debian/patches/03_const_char.diff b/debian/patches/03_const_char.diff
new file mode 100644
index 0000000..d1fed71
--- /dev/null
+++ b/debian/patches/03_const_char.diff
@@ -0,0 +1,44 @@
+Index: rumor/src/lang.hh
+===================================================================
+--- rumor.orig/src/lang.hh	2009-11-07 16:21:11.688842654 -0500
++++ rumor/src/lang.hh	2009-11-07 16:43:21.728843512 -0500
+@@ -8,9 +8,9 @@
+  * (rumor-pitches) guile command
+  */
+ 
+-char *Notator::Langs[]={"ne","en","en-short","de","no","sv","it","ca","es",""};
++const char *Notator::Langs[]={"ne","en","en-short","de","no","sv","it","ca","es",""};
+ 
+-char *Notator::LangData[][35]={
++const char *Notator::LangData[][35]={
+ 	// ne
+ 	{"ceses","ces","c","cis","cisis",
+ 	"deses","des","d","dis","disis",
+Index: rumor/src/rumor.hh
+===================================================================
+--- rumor.orig/src/rumor.hh	2009-11-07 16:21:11.612843549 -0500
++++ rumor/src/rumor.hh	2009-11-07 16:43:21.728843512 -0500
+@@ -158,8 +158,8 @@
+   Notations *pNotations;
+   std::map<std::pair<unsigned,int>,std::string> note_names;
+ public:
+-  static char *Langs[];
+-  static char *LangData[][35];
++  static const char *Langs[];
++  static const char *LangData[][35];
+   #ifdef HAVE_GUILE
+     SCM gh_rumor_rhythms(SCM,SCM,SCM,SCM);
+     SCM gh_rumor_pitches(SCM);
+Index: rumor/src/ossclient.cc
+===================================================================
+--- rumor.orig/src/ossclient.cc	2009-11-07 16:43:26.592844732 -0500
++++ rumor/src/ossclient.cc	2009-11-07 16:44:30.724846309 -0500
+@@ -20,7 +20,7 @@
+ #include <stdio.h>
+ 
+ OssMidiClient::OssMidiClient(void){
+-   char* dev="/dev/sequencer";
++   const char* dev="/dev/sequencer";
+    int n_midi = 0;
+    seqfd=open(dev,O_RDWR,0);
+    if (seqfd < 0)
diff --git a/debian/patches/series b/debian/patches/series
index f9b49f8..5a9dd62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 00_texi_info-dir-entry.diff
 01_texi_dircategory.diff
 02_no_info_dir.gz.diff
+03_const_char.diff

-- 
rumor packaging