[Pkg-cli-apps-commits] r4352 - in /packages/monodevelop-boo/trunk/debian: changelog control patches/00list patches/shellpanel_ftbfs_fix.dpatch rules

laney-guest at users.alioth.debian.org laney-guest at users.alioth.debian.org
Mon Dec 22 01:26:40 UTC 2008 

Author: laney-guest
Date: Mon Dec 22 01:26:39 2008
New Revision: 4352

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4352
Log:
* debian/patches/shellpanel_ftbfs_fix.dpatch: Fix FTBFS by backporting
  upstream changes



Added:
    packages/monodevelop-boo/trunk/debian/patches/shellpanel_ftbfs_fix.dpatch   (with props)
Modified:
    packages/monodevelop-boo/trunk/debian/changelog
    packages/monodevelop-boo/trunk/debian/control
    packages/monodevelop-boo/trunk/debian/patches/00list
    packages/monodevelop-boo/trunk/debian/rules

Modified: packages/monodevelop-boo/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop-boo/trunk/debian/changelog?rev=4352&op=diff
==============================================================================
--- packages/monodevelop-boo/trunk/debian/changelog (original)
+++ packages/monodevelop-boo/trunk/debian/changelog Mon Dec 22 01:26:39 2008
@@ -1,3 +1,10 @@
+monodevelop-boo (1.0-3) UNRELEASED; urgency=low
+
+  * debian/patches/shellpanel_ftbfs_fix.dpatch: Fix FTBFS by backporting
+    upstream changes
+
+ -- Iain Lane <laney at ubuntu.com>  Mon, 22 Dec 2008 01:09:06 +0000
+
 monodevelop-boo (1.0-2) unstable; urgency=low
 
   * Rebuild against against libgtksourceview2.0-cil 0.12-1

Modified: packages/monodevelop-boo/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop-boo/trunk/debian/control?rev=4352&op=diff
==============================================================================
--- packages/monodevelop-boo/trunk/debian/control (original)
+++ packages/monodevelop-boo/trunk/debian/control Mon Dec 22 01:26:39 2008
@@ -17,7 +17,7 @@
  libboo2.0-cil,
  libmono-system2.0-cil,
  libmono-system-runtime2.0-cil
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
 Homepage: http://www.monodevelop.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop-boo/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/monodevelop-boo/trunk/

Modified: packages/monodevelop-boo/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop-boo/trunk/debian/patches/00list?rev=4352&op=diff
==============================================================================
--- packages/monodevelop-boo/trunk/debian/patches/00list (original)
+++ packages/monodevelop-boo/trunk/debian/patches/00list Mon Dec 22 01:26:39 2008
@@ -1,0 +1,1 @@
+shellpanel_ftbfs_fix

Added: packages/monodevelop-boo/trunk/debian/patches/shellpanel_ftbfs_fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop-boo/trunk/debian/patches/shellpanel_ftbfs_fix.dpatch?rev=4352&op=file
==============================================================================
--- packages/monodevelop-boo/trunk/debian/patches/shellpanel_ftbfs_fix.dpatch (added)
+++ packages/monodevelop-boo/trunk/debian/patches/shellpanel_ftbfs_fix.dpatch Mon Dec 22 01:26:39 2008
@@ -1,0 +1,82 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## shellpanel_ftbfs_fix.dpatch by  <iain at intrepid>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Backported upstream fix for FTBFS
+
+ at DPATCH@
+diff -urNad monodevelop-boo-1.0~/Gui/OptionPanels/GeneralBooShellPanel.boo monodevelop-boo-1.0/Gui/OptionPanels/GeneralBooShellPanel.boo
+--- monodevelop-boo-1.0~/Gui/OptionPanels/GeneralBooShellPanel.boo	2008-12-22 01:14:24.000000000 +0000
++++ monodevelop-boo-1.0/Gui/OptionPanels/GeneralBooShellPanel.boo	2008-12-22 01:14:25.000000000 +0000
+@@ -33,7 +33,7 @@
+ 
+ public class GeneralBooShellPanel(GeneralShellPanel):
+ 
+-	public Properties as ShellProperties:
++	public ShellProperties as ShellProperties:
+ 		get:
+ 			return BooShellProperties()
+ 
+diff -urNad monodevelop-boo-1.0~/Gui/OptionPanels/GeneralShellPanel.boo monodevelop-boo-1.0/Gui/OptionPanels/GeneralShellPanel.boo
+--- monodevelop-boo-1.0~/Gui/OptionPanels/GeneralShellPanel.boo	2008-12-22 01:14:24.000000000 +0000
++++ monodevelop-boo-1.0/Gui/OptionPanels/GeneralShellPanel.boo	2008-12-22 01:15:02.000000000 +0000
+@@ -43,7 +43,7 @@
+ 	private defaultMonoRadio as RadioButton
+ 	private customFontRadio as RadioButton
+ 
+-	protected virtual Properties as ShellProperties:
++	protected virtual ShellProperties as ShellProperties:
+ 		get:
+ 			pass
+ 
+@@ -93,7 +93,7 @@
+ 		vbox.PackStart (hboxTmp, false, false, 0)
+ 		Add (vbox)
+ 
+-		s = Properties.FontName
++		s = ShellProperties.FontName
+ 
+ 		if s == "__default_monospace":
+ 			defaultMonoRadio.Active = true
+@@ -102,27 +102,27 @@
+ 			customFontRadio.Active = true
+ 
+ 		fontButton.Sensitive = customFontRadio.Active
+-		autoIndentCheckButton.Active = Properties.AutoIndentBlocks
+-		resetClearsScrollbackCheckButton.Active = Properties.ResetClearsScrollback
+-		resetClearsHistoryCheckButton.Active = Properties.ResetClearsHistory
+-		loadAssemblyCheckButton.Active =  Properties.LoadAssemblyAfterBuild
++		autoIndentCheckButton.Active = ShellProperties.AutoIndentBlocks
++		resetClearsScrollbackCheckButton.Active = ShellProperties.ResetClearsScrollback
++		resetClearsHistoryCheckButton.Active = ShellProperties.ResetClearsHistory
++		loadAssemblyCheckButton.Active =  ShellProperties.LoadAssemblyAfterBuild
+ 
+ 
+ 	public override def StorePanelContents() as bool:
+ 		if customFontRadio.Active:
+-			Properties.FontName =  fontButton.FontName
++			ShellProperties.FontName =  fontButton.FontName
+ 		elif defaultMonoRadio.Active:
+-			Properties.FontName = "__default_monospace"
++			ShellProperties.FontName = "__default_monospace"
+ 
+-		if Properties.AutoIndentBlocks != autoIndentCheckButton.Active:
+-			Properties.AutoIndentBlocks = autoIndentCheckButton.Active
++		if ShellProperties.AutoIndentBlocks != autoIndentCheckButton.Active:
++			ShellProperties.AutoIndentBlocks = autoIndentCheckButton.Active
+ 
+-		if Properties.ResetClearsScrollback != resetClearsScrollbackCheckButton.Active:
+-			Properties.ResetClearsScrollback = resetClearsScrollbackCheckButton.Active
+-		if Properties.ResetClearsHistory != resetClearsHistoryCheckButton.Active:
+-			Properties.ResetClearsHistory = resetClearsHistoryCheckButton.Active
+-		if Properties.LoadAssemblyAfterBuild != loadAssemblyCheckButton.Active:
+-			Properties.LoadAssemblyAfterBuild = loadAssemblyCheckButton.Active
++		if ShellProperties.ResetClearsScrollback != resetClearsScrollbackCheckButton.Active:
++			ShellProperties.ResetClearsScrollback = resetClearsScrollbackCheckButton.Active
++		if ShellProperties.ResetClearsHistory != resetClearsHistoryCheckButton.Active:
++			ShellProperties.ResetClearsHistory = resetClearsHistoryCheckButton.Active
++		if ShellProperties.LoadAssemblyAfterBuild != loadAssemblyCheckButton.Active:
++			ShellProperties.LoadAssemblyAfterBuild = loadAssemblyCheckButton.Active
+ 		return true
+ 	
+ 	private def ItemToggled (o, args as EventArgs):

Propchange: packages/monodevelop-boo/trunk/debian/patches/shellpanel_ftbfs_fix.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/monodevelop-boo/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/monodevelop-boo/trunk/debian/rules?rev=4352&op=diff
==============================================================================
--- packages/monodevelop-boo/trunk/debian/rules (original)
+++ packages/monodevelop-boo/trunk/debian/rules Mon Dec 22 01:26:39 2008
@@ -25,6 +25,8 @@
 	rm -rf $(CURDIR)/.wapi
 	rm -f configure-stamp
 	rm -f build-stamp
+	rm -f config.log
+	rm -f config.make
 	dh_clean 
 
 install: build

More information about the Pkg-cli-apps-commits mailing list