[SCM] rosegarden packaging branch, master, updated. debian/1.7.3-1.1-11-g20345eb

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

The following commit has been merged in the master branch:
commit e739579bd0ef5e6d6daab4a163b32303863f45b4
Author: Stuart Prescott <stuart+debian at nanonanonano.net>
Date:   Wed Mar 31 11:16:41 2010 +0100

    Drop all existing Debian patches (no longer required)
    
      * 10-x-www-browser.dpatch: change to Qt means that xdg-open is used, if
        installed, which respects system and user preferences like x-www-browser.
      * 30-midi-mime.dpatch: mime-type now included in upstream .desktop file
      * 40-missing-includes-gcc44.dpatch: applied upstream

diff --git a/debian/patches/10-x-www-browser.dpatch b/debian/patches/10-x-www-browser.dpatch
deleted file mode 100755
index 42712b5..0000000
--- a/debian/patches/10-x-www-browser.dpatch
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-x-www-browser.dpatch by  <stew at vireo.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: change the default behavior of the help function to launch
-## DP: 'sensible-browser' as the web browser to display help instead of 
-## DP: kde's built in 'invokeBrowser' which uses konqueror so that we
-## DP: don't have to depend explicitly on konqueror
-
-
- at DPATCH@
-diff -urNad rosegarden-1.5.1~/src/gui/application/RosegardenGUIApp.cpp rosegarden-1.5.1/src/gui/application/RosegardenGUIApp.cpp
---- rosegarden-1.5.1~/src/gui/application/RosegardenGUIApp.cpp	2007-03-13 08:50:32.000000000 -0400
-+++ rosegarden-1.5.1/src/gui/application/RosegardenGUIApp.cpp	2007-04-20 18:28:13.000000000 -0400
-@@ -7351,15 +7351,45 @@
- void
- RosegardenGUIApp::slotTutorial()
- {
--    QString tutorialURL = i18n("http://rosegarden.sourceforge.net/tutorial/en/chapter-0.html");
--    kapp->invokeBrowser(tutorialURL);
-+    QString exe = KStandardDirs::findExe( "sensible-browser" );
-+
-+    if( exe )
-+    {
-+        KProcess *proc = new KProcess;
-+        *proc << "sensible-browser";
-+        *proc << "http://www.rosegardenmusic.com/tutorials/en/chapter-0.html";
-+
-+        proc->start(KProcess::DontCare);
-+        proc->detach();
-+        delete proc;
-+    }
-+    else
-+    {
-+        QString tutorialURL = i18n("http://www.rosegardenmusic.com/tutorials/en/chapter-0.html");
-+        kapp->invokeBrowser(tutorialURL);
-+    }
- }
- 
- void
- RosegardenGUIApp::slotBugGuidelines()
- {
--    QString glURL = i18n("http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html");
--    kapp->invokeBrowser(glURL);
-+    QString exe = KStandardDirs::findExe( "sensible-browser" );
-+
-+    if( exe )
-+    {
-+        KProcess *proc = new KProcess;
-+        *proc << "sensible-browser";
-+        *proc << "http://www.rosegardenmusic.com/tutorials/bug-guidelines.html";
-+
-+        proc->start(KProcess::DontCare);
-+        proc->detach();
-+        delete proc;
-+    }
-+    else
-+    {
-+        QString tutorialURL = i18n("http://www.rosegardenmusic.com/tutorials/bug-guidelines.html");
-+        kapp->invokeBrowser(tutorialURL);
-+    }
- }
- 
- void
diff --git a/debian/patches/30-midi-mime.dpatch b/debian/patches/30-midi-mime.dpatch
deleted file mode 100755
index 0e00fac..0000000
--- a/debian/patches/30-midi-mime.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30-midi-mime.dpatch by Free Ekanayaka <freee at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad rosegarden-1.5.1~/data/desktop/rosegarden.desktop rosegarden-1.5.1/data/desktop/rosegarden.desktop
---- rosegarden-1.5.1~/data/desktop/rosegarden.desktop	2007-03-13 13:50:32.000000000 +0100
-+++ rosegarden-1.5.1/data/desktop/rosegarden.desktop	2007-07-19 02:07:00.000000000 +0200
-@@ -2,8 +2,8 @@
- Encoding=UTF-8
- Type=Application
- Categories=AudioVideo;Audio;Midi;Sequencer;X-SuSE-Sequencer;X-Red-Hat-Base;
--Exec=rosegarden -caption "%c" %i %m
--MimeType=audio/x-rosegarden;audio/x-rosegarden-device
-+Exec=rosegarden
-+MimeType=audio/x-rosegarden;audio/x-rosegarden-device;audio/midi
- X-KDE-NativeMimeType=audio/x-rosegarden
- Icon=rosegarden.png
- DocPath=rosegarden/index.html
diff --git a/debian/patches/40-missing-includes-gcc44.dpatch b/debian/patches/40-missing-includes-gcc44.dpatch
deleted file mode 100755
index 3e3db21..0000000
--- a/debian/patches/40-missing-includes-gcc44.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40-missing-includes-gcc44.dpatch by Martin Michlmayr <tbm at cyrius.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add extra includes required by gcc 4.4 (see #504893)
-
- at DPATCH@
-diff -urNad rosegarden-1.7.2~/src/base/Instrument.cpp
-rosegarden-1.7.2/src/base/Instrument.cpp
---- rosegarden-1.7.2~/src/base/Instrument.cpp   2008-09-04 01:32:56.000000000 +0000
-+++ rosegarden-1.7.2/src/base/Instrument.cpp    2009-01-19 21:02:30.000000000 +0000
-@@ -25,6 +25,7 @@
- #include <sstream>
- #endif
-
-+#include <cstdio>
-
- namespace Rosegarden
- {

-- 
rosegarden packaging