[Pkg-cli-apps-commits] [SCM] monobristol branch, master, updated. debian/0.60.1-2-4-gdb41a2e
Stefan Ebner
sebner at ubuntu.com
Wed Nov 24 19:42:50 UTC 2010
The following commit has been merged in the master branch:
commit db41a2eb32ab0b393de8f80bbaecffea76fa10b8
Author: Stefan Ebner <sebner at ubuntu.com>
Date: Wed Nov 24 20:41:59 2010 +0100
Remove 02_fix_bristol_call, merged upstream. Bump Standards-Version
diff --git a/debian/changelog b/debian/changelog
index e1b7fe5..7f5d320 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
monobristol (0.60.2-1) UNRELEASED; urgency=low
* New upstream release
+ + debian/patches/02_fix_bristol_call: Merged upstream
+ * debian/control: Bump Standards-Version to 3.9.1
-- Stefan Ebner <sebner at ubuntu.com> Wed, 24 Nov 2010 20:31:45 +0100
diff --git a/debian/control b/debian/control
index e936959..cf73029 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7.0.50), cli-common-dev (>= 0.7), autoconf,
imagemagick, automake, libtool
Build-Depends-Indep: mono-devel (>= 2.4.3), libgtk2.0-cil-dev,
libglib2.0-cil-dev, libglade2.0-cil-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://dacr.hu/monobristol
Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/monobristol.git
Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/monobristol.git
diff --git a/debian/patches/02_fix_bristol_call b/debian/patches/02_fix_bristol_call
deleted file mode 100644
index fd2b029..0000000
--- a/debian/patches/02_fix_bristol_call
+++ /dev/null
@@ -1,310 +0,0 @@
-Description: Fix the external start of bristol
-Author: Stefan Ebner <sebner at ubuntu.com>
-Origin: Takashi Sakamoto
-Bug: https://bugs.launchpad.net/ubuntu/+source/monobristol/+bug/660627
-Bug-Debian: http://bugs.debian.org/582581
-Forwarded: done per mail
-
-Index: monobristol.git/MainWindow.cs
-===================================================================
---- monobristol.git.orig/MainWindow.cs 2010-11-22 22:10:29.240662261 +0100
-+++ monobristol.git/MainWindow.cs 2010-11-22 22:11:00.760662262 +0100
-@@ -10,7 +10,7 @@
-
- public partial class MainWindow: Gtk.Window
- {
--
-+ public string startBristol = "startBristol";
- public string adriver, ogain, onogain, igain, oningain, rate, onrate;
- public string mdriver, channel, onchannel;
- public string voices, onvoices, tcp, host, ontcp, onhost, onpreload, preload, period, onperiod;
-@@ -650,242 +650,242 @@
- protected virtual void OnBmoogminiPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -mini");
-+ System.Diagnostics.Process.Start (startBristol, param+" -mini");
- }
-
- protected virtual void OnBmoogvoyagerPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -explorer");
-+ System.Diagnostics.Process.Start (startBristol, param+" -explorer");
-
- }
-
- protected virtual void OnBvoybluePressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -voyager");
-+ System.Diagnostics.Process.Start (startBristol, param+" -voyager");
- }
-
- protected virtual void OnBmoogmemoPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -memory");
-+ System.Diagnostics.Process.Start (startBristol, param+" -memory");
- }
-
- protected virtual void OnBmoogrealPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -mg1");
-+ System.Diagnostics.Process.Start (startBristol, param+" -mg1");
- }
-
- protected virtual void OnBsonicPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -sonic6");
-+ System.Diagnostics.Process.Start (startBristol, param+" -sonic6");
- }
-
- protected virtual void OnBpro5Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -prophet");
-+ System.Diagnostics.Process.Start (startBristol, param+" -prophet");
- }
-
- protected virtual void OnBpro10Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -pro10");
-+ System.Diagnostics.Process.Start (startBristol, param+" -pro10");
- }
-
- protected virtual void OnBpro52Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -pro52");
-+ System.Diagnostics.Process.Start (startBristol, param+" -pro52");
- }
-
- protected virtual void OnBpro1Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -pro1");
-+ System.Diagnostics.Process.Start (startBristol, param+" -pro1");
- }
-
- protected virtual void OnBobxPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -obx");
-+ System.Diagnostics.Process.Start (startBristol, param+" -obx");
- }
-
- protected virtual void OnBobxaPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -obxa");
-+ System.Diagnostics.Process.Start (startBristol, param+" -obxa");
- }
-
- protected virtual void OnBaxxePressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -axxe");
-+ System.Diagnostics.Process.Start (startBristol, param+" -axxe");
- }
-
- protected virtual void OnBodyPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -odyssey");
-+ System.Diagnostics.Process.Start (startBristol, param+" -odyssey");
- }
-
- protected virtual void OnB2600Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -arp2600");
-+ System.Diagnostics.Process.Start (startBristol, param+" -arp2600");
- }
-
- protected virtual void OnBsolinaPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -solina");
-+ System.Diagnostics.Process.Start (startBristol, param+" -solina");
- }
-
- protected virtual void OnBjuno6Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -juno");
-+ System.Diagnostics.Process.Start (startBristol, param+" -juno");
- }
-
- protected virtual void OnBjupiter8Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -jupiter");
-+ System.Diagnostics.Process.Start (startBristol, param+" -jupiter");
- }
-
- protected virtual void OnBmonopolyPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -monopoly");
-+ System.Diagnostics.Process.Start (startBristol, param+" -monopoly");
- }
-
- protected virtual void OnBms20Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -ms20");
-+ System.Diagnostics.Process.Start (startBristol, param+" -ms20");
- }
-
- protected virtual void OnBpoly800Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -poly800");
-+ System.Diagnostics.Process.Start (startBristol, param+" -poly800");
- }
-
- protected virtual void OnBpolysixPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -polysix");
-+ System.Diagnostics.Process.Start (startBristol, param+" -polysix");
- }
-
- protected virtual void OnBvoxconPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -vox");
-+ System.Diagnostics.Process.Start (startBristol, param+" -vox");
- }
-
- protected virtual void OnBcon300Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -voxM2");
-+ System.Diagnostics.Process.Start (startBristol, param+" -voxM2");
- }
-
- protected virtual void OnBb3Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -b3");
-+ System.Diagnostics.Process.Start (startBristol, param+" -b3");
- }
-
- protected virtual void OnBmodulPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -hammond");
-+ System.Diagnostics.Process.Start (startBristol, param+" -hammond");
- }
-
- protected virtual void OnBrhode73Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -rhodes");
-+ System.Diagnostics.Process.Start (startBristol, param+" -rhodes");
- }
-
- protected virtual void OnBrhodebassPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -rhodesbass");
-+ System.Diagnostics.Process.Start (startBristol, param+" -rhodesbass");
- }
-
- protected virtual void OnBydxPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -dx");
-+ System.Diagnostics.Process.Start (startBristol, param+" -dx");
- }
-
- protected virtual void OnBcs80Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -cs80");
-+ System.Diagnostics.Process.Start (startBristol, param+" -cs80");
- }
-
- protected virtual void OnBbit1Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -bitone");
-+ System.Diagnostics.Process.Start (startBristol, param+" -bitone");
- }
-
- protected virtual void OnBbit99Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -bit99");
-+ System.Diagnostics.Process.Start (startBristol, param+" -bit99");
- }
-
- protected virtual void OnBbit100Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -bit100");
-+ System.Diagnostics.Process.Start (startBristol, param+" -bit100");
- }
-
- protected virtual void OnBroadrunnerPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -roadrunner");
-+ System.Diagnostics.Process.Start (startBristol, param+" -roadrunner");
- }
-
- protected virtual void OnBstratusPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -stratus");
-+ System.Diagnostics.Process.Start (startBristol, param+" -stratus");
- }
-
- protected virtual void OnBtrilogyPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -trilogy");
-+ System.Diagnostics.Process.Start (startBristol, param+" -trilogy");
- }
-
- protected virtual void OnBaksPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -aks");
-+ System.Diagnostics.Process.Start (startBristol, param+" -aks");
- }
-
- protected virtual void OnBbme700Pressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -bme700");
-+ System.Diagnostics.Process.Start (startBristol, param+" -bme700");
- }
-
- protected virtual void OnBsidPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -sid");
-+ System.Diagnostics.Process.Start (startBristol, param+" -sid");
- }
-
- protected virtual void OnBmixerPressed (object sender, System.EventArgs e)
- {
- SetMode ();
-- System.Diagnostics.Process.Start ("startBristol "+param+" -mixer");
-+ System.Diagnostics.Process.Start (startBristol, param+" -mixer");
- }
-
- //set default settings
-@@ -1125,4 +1125,4 @@
- }
- }
- }
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/series b/debian/patches/series
index 3542028..c8c66e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01_use_mono-csc
-02_fix_bristol_call
--
monobristol
More information about the Pkg-cli-apps-commits
mailing list