Package: gtkwhiteboard
Version: 1.3+dfsg-5.1
Severity: normal
Tags: patch
User: freewx-ma...@lists.alioth.debian.org
Usertags: wx2.6

When the current version of gtkwhiteboard is ran with python-wxgtk2.8
installed (since it's the default version and this program doesn't
make use of wxversion to force using wx 2.6), an error is generated
due to a behavior change in wxwidgets. Apparently starting with
wxwidgets 2.8, an error message is displayed when an icon (such as the
one that was removed from the gtkwhiteboard package) is attempted to
be loaded but doesn't exist. So the attached patch removes the code
that tries to use the icon that was removed. It also updates the
dependencies to include python-wxgtk2.8. "Severity: normal" because
this causes an annoying error dialog on startup for some users. Also,
I wasn't able to fully test the application because I don't have the
hardware to do so. If it still doesn't work with wx 2.8, wxversion
should be used to ensure that wx 2.6 is used.

Cheers,
Ryan

-- 
_________________________
Ryan Niebur
ryanrya...@gmail.com
diff -u gtkwhiteboard-1.3+dfsg/debian/changelog gtkwhiteboard-1.3+dfsg/debian/changelog
--- gtkwhiteboard-1.3+dfsg/debian/changelog
+++ gtkwhiteboard-1.3+dfsg/debian/changelog
@@ -1,3 +1,11 @@
+gtkwhiteboard (1.3+dfsg-5.2) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * fix error due to removed file with wx 2.8 and update dependencies
+    for wx 2.8
+
+ -- Ryan Niebur <r...@debian.org>  Mon, 14 Dec 2009 19:48:22 -0800
+
 gtkwhiteboard (1.3+dfsg-5.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u gtkwhiteboard-1.3+dfsg/debian/control gtkwhiteboard-1.3+dfsg/debian/control
--- gtkwhiteboard-1.3+dfsg/debian/control
+++ gtkwhiteboard-1.3+dfsg/debian/control
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Thomas Knott <zu...@sidux-ev.de>
 Build-Depends: debhelper (>= 7), python-central (>= 0.5), python 
-Build-Depends-Indep: docbook-to-man, python-wxgtk2.6, python-bluez (>= 0.15), python-xlib (>= 0.14)
+Build-Depends-Indep: docbook-to-man, python-wxgtk2.8 | python-wxgtk2.6, python-bluez (>= 0.15), python-xlib (>= 0.14)
 Standards-Version: 3.8.0
 XS-Python-Version: current
 
 Package: gtkwhiteboard
 Architecture: all
-Depends: ${python:Depends}, python-wxgtk2.6, python-bluez (>= 0.15), python-xlib (>= 0.14), bluez (>= 3.30)
+Depends: ${python:Depends}, python-wxgtk2.8 | python-wxgtk2.6, python-bluez (>= 0.15), python-xlib (>= 0.14), bluez (>= 3.30)
 XB-Python-Version: ${python:Versions}
 Description: GTK+ Wiimote Whiteboard
  This application allows you to turn any display into an electronic whiteboard 
only in patch2:
unchanged:
--- gtkwhiteboard-1.3+dfsg.orig/gtkwhiteboard.py
+++ gtkwhiteboard-1.3+dfsg/gtkwhiteboard.py
@@ -252,9 +252,6 @@
         #self.border.Fit(self) #called by UpdateSideChoices...
         #self.Layout()
         self.SetBackgroundColour((236,233,216))
-        iconFile = "gtkwhiteboard.ico"
-        icon1 = wx.Icon(iconFile, wx.BITMAP_TYPE_ICO)
-        self.SetIcon(icon1)
 	
 	self.cbSaveOnExit.SetValue(True)
 	if not self.LoadOptions():

Attachment: signature.asc
Description: Digital signature

Reply via email to