← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/desktop-files.patch

  • Committer: Package Import Robot
  • Author(s): Benjamin Drung
  • Date: 2012-06-02 12:33:00 UTC
  • mfrom: (5.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20120602123300-cmj36sgxk0zi6k0h
Tags: 2.8.12.1-11ubuntu1
https://launchpad.net/bugs/632984
https://launchpad.net/bugs/1005609
* Merge from Debian unstable. Remaining changes:
  - debian/rules: re-enable mediactrl. This allows libwx_gtk2u_media-2.8 to be
    built, as this is required by some applications (LP: #632984)
  - debian/control:
    - Build-dep on libxt-dev, libgstreamer-plugins-base0.10-dev,
      and libgconf2-dev for mediactrl.
    - Add conflict on python-wxgtk2.8 (<< 2.8.12.1-6ubuntu1~) to
      python-wxversion to guarantee upgrade ordering when moving from
      pycentral to dh_python2.
* Drop fix-bashism-in-example.patch. (LP: #1005609)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/desktop-files.patch
 
1
Description: Update .desktop files to match current specification
 
2
Author: Olly Betts <olly@survex.com>
 
3
Forwarded: http://trac.wxwidgets.org/ticket/14345
 
4
Applied-Upstream: http://trac.wxwidgets.org/changeset/71590 (2.9.4)
 
5
Last-Update: 2012-05-28
 
6
 
 
7
Index: wx/wxPython/distrib/PyAlaMode.desktop
 
8
===================================================================
 
9
--- wx.orig/wxPython/distrib/PyAlaMode.desktop  2012-05-29 05:50:18.000000000 +1200
 
10
+++ wx/wxPython/distrib/PyAlaMode.desktop       2012-05-29 05:50:18.000000000 +1200
 
11
@@ -2,7 +2,7 @@
 
12
 Name=PyAlaMode
 
13
 Comment=GUI Python Shell with Filling and editor windows
 
14
 Exec=pyalamode
 
15
-Icon=PyCrust.png
 
16
+Icon=PyCrust
 
17
 Terminal=false
 
18
 Type=Application
 
19
-Categories=Application;Development;
 
20
+Categories=Development;
 
21
Index: wx/wxPython/distrib/Editra.desktop
 
22
===================================================================
 
23
--- wx.orig/wxPython/distrib/Editra.desktop     2012-05-29 05:50:18.000000000 +1200
 
24
+++ wx/wxPython/distrib/Editra.desktop  2012-05-29 05:50:18.000000000 +1200
 
25
@@ -2,7 +2,7 @@
 
26
 Name=Editra
 
27
 Comment="Programmer's Text Editor"
 
28
 Exec=editra
 
29
-Icon=editra.png
 
30
+Icon=editra
 
31
 Terminal=false
 
32
 Type=Application
 
33
-Categories=Application;Development;
 
34
+Categories=Development;
 
35
Index: wx/wxPython/distrib/PyShell.desktop
 
36
===================================================================
 
37
--- wx.orig/wxPython/distrib/PyShell.desktop    2012-05-29 05:50:18.000000000 +1200
 
38
+++ wx/wxPython/distrib/PyShell.desktop 2012-05-29 05:50:18.000000000 +1200
 
39
@@ -2,7 +2,7 @@
 
40
 Name=PyShell
 
41
 Comment=GUI Python Shell
 
42
 Exec=pyshell
 
43
-Icon=PyCrust.png
 
44
+Icon=PyCrust
 
45
 Terminal=false
 
46
 Type=Application
 
47
-Categories=Application;Development;
 
48
+Categories=Development;
 
49
Index: wx/wxPython/distrib/PySlices.desktop
 
50
===================================================================
 
51
--- wx.orig/wxPython/distrib/PySlices.desktop   2012-05-29 05:50:18.000000000 +1200
 
52
+++ wx/wxPython/distrib/PySlices.desktop        2012-05-29 05:50:18.000000000 +1200
 
53
@@ -2,7 +2,7 @@
 
54
 Name=PySlices
 
55
 Comment=GUI Python Shell with Filling
 
56
 Exec=pyslices
 
57
-Icon=PySlices.png
 
58
+Icon=PySlices
 
59
 Terminal=false
 
60
 Type=Application
 
61
-Categories=Application;Development;
 
62
+Categories=Development;
 
63
Index: wx/wxPython/distrib/XRCed.desktop
 
64
===================================================================
 
65
--- wx.orig/wxPython/distrib/XRCed.desktop      2012-05-29 05:50:18.000000000 +1200
 
66
+++ wx/wxPython/distrib/XRCed.desktop   2012-05-29 05:50:18.000000000 +1200
 
67
@@ -2,7 +2,7 @@
 
68
 Name=XRCed
 
69
 Comment=wxPython XRC resource editor
 
70
 Exec=xrced
 
71
-Icon=XRCed.png
 
72
+Icon=XRCed
 
73
 Terminal=false
 
74
 Type=Application
 
75
-Categories=Application;Development;
 
76
+Categories=Development;
 
77
Index: wx/wxPython/distrib/PyCrust.desktop
 
78
===================================================================
 
79
--- wx.orig/wxPython/distrib/PyCrust.desktop    2012-05-29 05:50:18.000000000 +1200
 
80
+++ wx/wxPython/distrib/PyCrust.desktop 2012-05-29 05:50:18.000000000 +1200
 
81
@@ -2,7 +2,7 @@
 
82
 Name=PyCrust
 
83
 Comment=GUI Python Shell with Filling
 
84
 Exec=pycrust
 
85
-Icon=PyCrust.png
 
86
+Icon=PyCrust
 
87
 Terminal=false
 
88
 Type=Application
 
89
-Categories=Application;Development;
 
90
+Categories=Development;
 
91
Index: wx/wxPython/distrib/PySlicesShell.desktop
 
92
===================================================================
 
93
--- wx.orig/wxPython/distrib/PySlicesShell.desktop      2012-05-29 05:50:18.000000000 +1200
 
94
+++ wx/wxPython/distrib/PySlicesShell.desktop   2012-05-29 05:50:18.000000000 +1200
 
95
@@ -3,7 +3,7 @@
 
96
 Name=PySlicesShell
 
97
 Comment=GUI Python Shell
 
98
 Exec=pysliceshell
 
99
-Icon=PySlices.png
 
100
+Icon=PySlices
 
101
 Terminal=false
 
102
 Type=Application
 
103
-Categories=Application;Development;
 
104
+Categories=Development;