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

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

The following commit has been merged in the master branch:
commit 013c427b032bdf46258153ee7b0c57cd9e097ac0
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date:   Sun Nov 8 15:35:18 2009 -0500

    Remove patches that were applied upstream

diff --git a/debian/patches/00_texi_info-dir-entry.diff b/debian/patches/00_texi_info-dir-entry.diff
deleted file mode 100644
index 791703c..0000000
--- a/debian/patches/00_texi_info-dir-entry.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-## 00_texi_info-dir-entry.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
-## Description: Add the direntry to the texinfo file
-Index: rumor/doc/rumor.texi
-===================================================================
---- rumor.orig/doc/rumor.texi	2009-07-24 10:25:44.123928342 -0400
-+++ rumor/doc/rumor.texi	2009-07-24 10:26:09.095928398 -0400
-@@ -1,6 +1,9 @@
- \input texinfo   @c -*-texinfo-*-
- @setfilename rumor.info
- @settitle Rumor
-+ at direntry
-+* Rumor: (rumor).        Rumor --- Really Unintelligent Music transcriptOR
-+ at end direntry
- 
- 
- @ifnottex
diff --git a/debian/patches/01_texi_dircategory.diff b/debian/patches/01_texi_dircategory.diff
deleted file mode 100644
index 18c5eb3..0000000
--- a/debian/patches/01_texi_dircategory.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-## 01_texi_dircategory.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
-## Description: Create the dircategory Sound for the info page
-Index: rumor/doc/rumor.texi
-===================================================================
---- rumor.orig/doc/rumor.texi	2009-07-24 10:26:31.551928947 -0400
-+++ rumor/doc/rumor.texi	2009-07-24 10:26:43.767928517 -0400
-@@ -1,6 +1,7 @@
- \input texinfo   @c -*-texinfo-*-
- @setfilename rumor.info
- @settitle Rumor
-+ at dircategory Sound
- @direntry
- * Rumor: (rumor).        Rumor --- Really Unintelligent Music transcriptOR
- @end direntry
diff --git a/debian/patches/02_no_info_dir.gz.diff b/debian/patches/02_no_info_dir.gz.diff
deleted file mode 100644
index 9007d1b..0000000
--- a/debian/patches/02_no_info_dir.gz.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-## 02_no_info_dir.gz.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
-## Description: Don't ship a /usr/share/info/dir.gz ... Ever. 
-Index: rumor/doc/Makefile.in
-===================================================================
---- rumor.orig/doc/Makefile.in	2009-08-30 15:53:03.462155906 -0400
-+++ rumor/doc/Makefile.in	2009-10-19 11:22:17.296692133 -0400
-@@ -179,8 +179,7 @@
- 
- uninstall-info-am:
- 	$(PRE_UNINSTALL)
--	@if (install-info --version && \
--	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-+	@if false; then \
- 	  list='$(INFO_DEPS)'; \
- 	  for file in $$list; do \
- 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-@@ -331,8 +330,7 @@
- 	  done; \
- 	done
- 	@$(POST_INSTALL)
--	@if (install-info --version && \
--	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-+	@if false; then \
- 	  list='$(INFO_DEPS)'; \
- 	  for file in $$list; do \
- 	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
diff --git a/debian/patches/03_const_char.diff b/debian/patches/03_const_char.diff
deleted file mode 100644
index f72030e..0000000
--- a/debian/patches/03_const_char.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-## 03_const_char.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
-## Description: Fix deprecated conversion from string constant to 'char*'
-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
deleted file mode 100644
index 5a9dd62..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-00_texi_info-dir-entry.diff
-01_texi_dircategory.diff
-02_no_info_dir.gz.diff
-03_const_char.diff

-- 
rumor packaging