[Demudi-commits] r1224 - in rosegarden/trunk/debian: . patches
Mike O'Connor
stew-guest at alioth.debian.org
Fri Apr 20 23:22:03 UTC 2007
Author: stew-guest
Date: 2007-04-20 23:22:01 +0000 (Fri, 20 Apr 2007)
New Revision: 1224
Added:
rosegarden/trunk/debian/patches/10-x-www-browser.dpatch
Removed:
rosegarden/trunk/debian/patches/20_env.dpatch
Modified:
rosegarden/trunk/debian/control
rosegarden/trunk/debian/patches/00list
Log:
using x-www-browser by default, but falling back onto kfmclient for tutorial
Modified: rosegarden/trunk/debian/control
===================================================================
--- rosegarden/trunk/debian/control 2007-04-20 06:30:38 UTC (rev 1223)
+++ rosegarden/trunk/debian/control 2007-04-20 23:22:01 UTC (rev 1224)
@@ -8,7 +8,7 @@
Package: rosegarden
Architecture: any
-Depends: ${shlibs:Depends}, khelpcenter, rosegarden-data (= ${source:Version}), libxml-twig-perl, sndfile-programs, xterm, kdebase-bin, lilypond, konqueror
+Depends: ${shlibs:Depends}, khelpcenter, rosegarden-data (= ${source:Version}), libxml-twig-perl, sndfile-programs, xterm, kdebase-bin, lilypond, www-browser
Replaces: rosegarden4,rosegarden2
Provides: rosegarden4,rosegarden2
Conflicts: rosegarden4 (<< 1:1.2.3), rosegarden2 (<< 1:1.2.3)
Modified: rosegarden/trunk/debian/patches/00list
===================================================================
--- rosegarden/trunk/debian/patches/00list 2007-04-20 06:30:38 UTC (rev 1223)
+++ rosegarden/trunk/debian/patches/00list 2007-04-20 23:22:01 UTC (rev 1224)
@@ -0,0 +1 @@
+10-x-www-browser.dpatch
Added: rosegarden/trunk/debian/patches/10-x-www-browser.dpatch
===================================================================
--- rosegarden/trunk/debian/patches/10-x-www-browser.dpatch 2007-04-20 06:30:38 UTC (rev 1223)
+++ rosegarden/trunk/debian/patches/10-x-www-browser.dpatch 2007-04-20 23:22:01 UTC (rev 1224)
@@ -0,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30-x-www-browser.dpatch by <stew at vireo.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ 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 = findExe( "x-www-browser" );
++
++ if( exe )
++ {
++ KProcess *proc = new KProcess;
++ *proc << "x-www-browser";
++ *proc << "http://rosegarden.sourceforge.net/tutorial/en/chapter-0.html";
++
++ proc->start(KProcess::DontCare);
++ proc->detach();
++ delete proc;
++ }
++ else
++ {
++ QString tutorialURL = i18n("http://rosegarden.sourceforge.net/tutorial/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 = findExe( "x-www-browser" );
++
++ if( exe )
++ {
++ KProcess *proc = new KProcess;
++ *proc << "x-www-browser";
++ *proc << "http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html";
++
++ proc->start(KProcess::DontCare);
++ proc->detach();
++ delete proc;
++ }
++ else
++ {
++ QString tutorialURL = i18n("http://rosegarden.sourceforge.net/tutorial/bug-guidelines.html");
++ kapp->invokeBrowser(tutorialURL);
++ }
+ }
+
+ void
Property changes on: rosegarden/trunk/debian/patches/10-x-www-browser.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: rosegarden/trunk/debian/patches/20_env.dpatch
===================================================================
--- rosegarden/trunk/debian/patches/20_env.dpatch 2007-04-20 06:30:38 UTC (rev 1223)
+++ rosegarden/trunk/debian/patches/20_env.dpatch 2007-04-20 23:22:01 UTC (rev 1224)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_env.dpatch by <stew at sandshark>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad rosegarden-1.2.4~/SConstruct rosegarden-1.2.4/SConstruct
---- rosegarden-1.2.4~/SConstruct 2006-07-14 06:44:25.000000000 -0400
-+++ rosegarden-1.2.4/SConstruct 2006-08-08 03:12:57.000000000 -0400
-@@ -75,7 +75,7 @@
- env.AppendUnique( ENV = {'PATH' : os.environ['PATH'], 'HOME' : os.environ['HOME']} )
-
- ## Use this to set rpath - this may cause trouble if folders are moved (chrpath)
--env.Append( RPATH = [env['QTLIBPATH'], env['KDELIBPATH'], env['KDEMODULE']] )
-+#env.Append( RPATH = [env['QTLIBPATH'], env['KDELIBPATH'], env['KDEMODULE']] )
-
- # Export 'env' so that sconscripts in subdirectories can use it
- Export( "env" )
More information about the Demudi-commits
mailing list