← Back to branch summary

~ubuntu-branches/ubuntu/vivid/wxwidgets2.8/vivid

« back to all changes in this revision

Viewing changes to debian/patches/editra_pixmaps.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Devid Antonio Filoni
  • Date: 2010-07-20 01:55:41 UTC
  • Revision ID: james.westby@ubuntu.com-20100720015541-f4j0v8g28tdvp9xj
Tags: 2.8.11.0-0ubuntu2
https://launchpad.net/bugs/559822
https://launchpad.net/bugs/379573
* Merge *some* changes from Debian package (version 2.8.10.1-3). This should
  make merges easier. Also fixes LP: #559822. Also merged several patches.
* Remove debian/patches/editra_pixmaps.dpatch patch, we don't ship editra
  anymore.
* Remove files which broke update-alternatives (LP: #379573).
* Switch to format 3.0 (quilt).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/editra_pixmaps.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## editra_pixmaps.dpatch by Devid Antonio Filoni <d.filoni@ubuntu.com>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: use /usr/share/python-wxgtk2.8/Editra/pixmaps as THEME_DIR,
6
 
## DP: needed to fix image-file-in-usr-lib lintian warning.
7
 
 
8
 
@DPATCH@
9
 
diff -urNad wxwidgets2.8-2.8.10.1~/wxPython/wx/tools/Editra/src/Editra.py wxwidgets2.8-2.8.10.1/wxPython/wx/tools/Editra/src/Editra.py
10
 
--- wxwidgets2.8-2.8.10.1~/wxPython/wx/tools/Editra/src/Editra.py       2009-08-11 14:38:03.000000000 +0200
11
 
+++ wxwidgets2.8-2.8.10.1/wxPython/wx/tools/Editra/src/Editra.py        2009-08-11 14:48:24.000000000 +0200
12
 
@@ -769,9 +769,9 @@
13
 
     ed_glob.CONFIG['CONFIG_DIR'] = util.ResolvConfigDir(u"")
14
 
     ed_glob.CONFIG['INSTALL_DIR'] = util.ResolvConfigDir(u"", True)
15
 
     ed_glob.CONFIG['KEYPROF_DIR'] = util.ResolvConfigDir(u"ekeys", True)
16
 
-    ed_glob.CONFIG['SYSPIX_DIR'] = util.ResolvConfigDir(u"pixmaps", True)
17
 
+    ed_glob.CONFIG['SYSPIX_DIR'] = util.ResolvConfigDir(u"/share/python-wxgtk2.8/Editra/pixmaps", True)
18
 
     ed_glob.CONFIG['PLUGIN_DIR'] = util.ResolvConfigDir(u"plugins")
19
 
-    ed_glob.CONFIG['THEME_DIR'] = util.ResolvConfigDir(os.path.join(u"pixmaps", u"theme"))
20
 
+    ed_glob.CONFIG['THEME_DIR'] = util.ResolvConfigDir(os.path.join(u"/share/python-wxgtk2.8/Editra/pixmaps", u"theme"))
21
 
     ed_glob.CONFIG['LANG_DIR'] = util.ResolvConfigDir(u"locale", True)
22
 
     ed_glob.CONFIG['STYLES_DIR'] = util.ResolvConfigDir(u"styles")
23
 
     ed_glob.CONFIG['SYS_PLUGIN_DIR'] = util.ResolvConfigDir(u"plugins", True)
24
 
diff -urNad wxwidgets2.8-2.8.10.1~/wxPython/wx/tools/Editra/src/ed_theme.py wxwidgets2.8-2.8.10.1/wxPython/wx/tools/Editra/src/ed_theme.py
25
 
--- wxwidgets2.8-2.8.10.1~/wxPython/wx/tools/Editra/src/ed_theme.py     2009-08-11 14:38:03.000000000 +0200
26
 
+++ wxwidgets2.8-2.8.10.1/wxPython/wx/tools/Editra/src/ed_theme.py      2009-08-11 14:48:58.000000000 +0200
27
 
@@ -316,7 +316,7 @@
28
 
 
29
 
         # Get the path
30
 
         if ed_glob.CONFIG['THEME_DIR'] == u'':
31
 
-            theme = util.ResolvConfigDir(os.path.join(u"pixmaps", u"theme"))
32
 
+            theme = util.ResolvConfigDir(os.path.join(u"/share/python-wxgtk2.8/Editra/pixmaps", u"theme"))
33
 
             ed_glob.CONFIG['THEME_DIR'] = theme
34
 
 
35
 
         if mime: