wxwidgets2.8 (2.8.10.1-3) xrced_bitmaps.dpatch

#! /bin/sh /usr/share/dpatch/dpatch-run
## xrced_bitmaps.dpatch by Devid Filoni <d.filoni@techemail.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: load bitmaps from /usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps,
## DP: needed to fix image-file-in-usr-lib lintian warning.

@DPATCH@
--- a/wxPython/wx/tools/XRCed/component.py
+++ b/wxPython/wx/tools/XRCed/component.py
@@ -688,7 +688,7 @@
         if panel not in self.panels: self.panels[panel] = []
         # Auto-select bitmap if not provided
         if not bitmap:
-            bmpPath = os.path.join('bitmaps', component.klass + '.png')
+            bmpPath = os.path.join('/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps', component.klass + '.png')
             if os.path.exists(bmpPath):
                 bitmap = wx.Bitmap(bmpPath)
             else:
--- a/wxPython/wx/tools/XRCed/misc/maketools.py
+++ b/wxPython/wx/tools/XRCed/misc/maketools.py
@@ -142,23 +142,23 @@
 
 def snap(evt):
     if evt.GetId() == xrc.XRCID('snap_panels'):
-        WCTF(app.frame_panels, 'bitmaps')
+        WCTF(app.frame_panels, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps')
     elif evt.GetId() == xrc.XRCID('snap_controls'):
-        WCTF(app.frame_controls, 'bitmaps')
+        WCTF(app.frame_controls, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps')
     elif evt.GetId() == xrc.XRCID('snap_frame'):
-        WTF(app.frame_frame, 'bitmaps/wxFrame.png')
+        WTF(app.frame_frame, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps/wxFrame.png')
     elif evt.GetId() == xrc.XRCID('snap_dialog'):
-        WTF(app.frame_dialog, 'bitmaps/wxDialog.png')
+        WTF(app.frame_dialog, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps/wxDialog.png')
     elif evt.GetId() == xrc.XRCID('snap_propsheetdialog'):
         print 'sleeping 1 sec'
         time.sleep(1)
-        WTF(app.frame_propsheetdialog, 'bitmaps/wxPropertySheetDialog.png')
+        WTF(app.frame_propsheetdialog, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps/wxPropertySheetDialog.png')
     elif evt.GetId() == xrc.XRCID('snap_menubar'):
-        WTFC(app.frame_menubar, 'bitmaps/wxMenuBar.png', app.frame_menubar.GetMenuBar())
+        WTFC(app.frame_menubar, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps/wxMenuBar.png', app.frame_menubar.GetMenuBar())
     elif evt.GetId() == xrc.XRCID('snap_menu'):
-        WTFC(app.frame_menubar, 'bitmaps/wxMenuBar.png')
+        WTFC(app.frame_menubar, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps/wxMenuBar.png')
     elif evt.GetId() == xrc.XRCID('snap_toolbar'):
-        WTFC(app.frame_menubar, 'bitmaps/wxToolBar.png', app.frame_menubar.GetToolBar())
+        WTFC(app.frame_menubar, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps/wxToolBar.png', app.frame_menubar.GetToolBar())
 
 if __name__ == '__main__':
     try: 
@@ -192,7 +192,7 @@
     app.frame_menubar = res.LoadFrame(main_frame, 'FRAME_ToolBar')
     app.frame_menubar.Show()
 
-    if not os.path.exists('bitmaps'): os.mkdir('bitmaps')
+    if not os.path.exists('/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps'): os.mkdir('bitmaps')
 
     main_frame.Bind(wx.EVT_MENU, snap, id=xrc.XRCID('snap_panels'))
     main_frame.Bind(wx.EVT_MENU, snap, id=xrc.XRCID('snap_controls'))