Merge lp:~jbicha/app-install-data-ubuntu/cleanup-firefox-extensions into lp:app-install-data-ubuntu

Proposed by Jeremy Bicha on 2011-04-29
Status: Merged
Merged at revision: 675
Proposed branch: lp:~jbicha/app-install-data-ubuntu/cleanup-firefox-extensions
Merge into: lp:app-install-data-ubuntu
Diff against target: 115 lines (+2/-72)
6 files modified
menu-data-xul-extensions/all-in-one-sidebar.desktop (+0/-14)
menu-data-xul-extensions/firebug.desktop (+0/-14)
menu-data-xul-extensions/firefox-greasemonkey.desktop (+0/-14)
menu-data-xul-extensions/firefox-ubuntu-it-menu.desktop (+0/-14)
menu-data-xul-extensions/flashblock.desktop (+0/-14)
menu-data-xul-extensions/xul-ext-ubufox.desktop (+2/-2)
To merge this branch: bzr merge lp:~jbicha/app-install-data-ubuntu/cleanup-firefox-extensions
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2011-04-29 Pending
Review via email: mp+59500@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'menu-data-xul-extensions/all-in-one-sidebar.desktop'
2--- menu-data-xul-extensions/all-in-one-sidebar.desktop 2008-10-23 20:19:18 +0000
3+++ menu-data-xul-extensions/all-in-one-sidebar.desktop 1970-01-01 00:00:00 +0000
4@@ -1,14 +0,0 @@
5-[Desktop Entry]
6-Encoding=UTF-8
7-Name=All in one Sidebar extension for Firefox
8-Comment=A sidebar extension for Firefox
9-GenericName=Firefox extension
10-Type=Application
11-Icon=all-in-one-sidebar
12-Categories=Application;Network;
13-MimeType=application/x-debian-xul-extension-firefox
14-StartupNotify=true
15-
16-X-AppInstall-Package=all-in-one-sidebar
17-X-AppInstall-Popcon=0
18-X-AppInstall-Section=universe
19
20=== removed file 'menu-data-xul-extensions/firebug.desktop'
21--- menu-data-xul-extensions/firebug.desktop 2010-08-01 12:49:23 +0000
22+++ menu-data-xul-extensions/firebug.desktop 1970-01-01 00:00:00 +0000
23@@ -1,14 +0,0 @@
24-[Desktop Entry]
25-Encoding=UTF-8
26-Name=Firebug extension for Firefox
27-Comment=Powerful web development extension
28-GenericName=Firefox extension
29-Type=Application
30-Icon=firebug
31-Categories=Application;Network;
32-MimeType=application/x-debian-xul-extension-firefox
33-StartupNotify=true
34-
35-X-AppInstall-Package=xul-ext-firebug
36-X-AppInstall-Popcon=0
37-X-AppInstall-Section=universe
38
39=== removed file 'menu-data-xul-extensions/firefox-greasemonkey.desktop'
40--- menu-data-xul-extensions/firefox-greasemonkey.desktop 2010-08-01 12:49:23 +0000
41+++ menu-data-xul-extensions/firefox-greasemonkey.desktop 1970-01-01 00:00:00 +0000
42@@ -1,14 +0,0 @@
43-[Desktop Entry]
44-Encoding=UTF-8
45-Name=Greasemonkey extension for Firefox
46-Comment=Firefox extension that enables customization of webpages with user scripts
47-GenericName=Firefox user-script extension
48-Type=Application
49-Icon=firefox-greasemonkey
50-Categories=Application;Network;
51-MimeType=application/x-debian-xul-extension-firefox
52-StartupNotify=true
53-
54-X-AppInstall-Package=xul-ext-greasemonkey
55-X-AppInstall-Popcon=0
56-X-AppInstall-Section=universe
57
58=== removed file 'menu-data-xul-extensions/firefox-ubuntu-it-menu.desktop'
59--- menu-data-xul-extensions/firefox-ubuntu-it-menu.desktop 2008-10-23 20:19:18 +0000
60+++ menu-data-xul-extensions/firefox-ubuntu-it-menu.desktop 1970-01-01 00:00:00 +0000
61@@ -1,14 +0,0 @@
62-[Desktop Entry]
63-Encoding=UTF-8
64-Name=Ubuntu-it menu extension for Firefox
65-Comment=Firefox extension for a quick browse of Ubuntu-it community
66-GenericName=Firefox extension
67-Type=Application
68-Icon=firefox-ubuntu-it-menu
69-Categories=Application;Network;
70-MimeType=application/x-debian-xul-extension-firefox
71-StartupNotify=true
72-
73-X-AppInstall-Package=firefox-ubuntu-it-menu
74-X-AppInstall-Popcon=0
75-X-AppInstall-Section=universe
76
77=== removed file 'menu-data-xul-extensions/flashblock.desktop'
78--- menu-data-xul-extensions/flashblock.desktop 2010-08-01 12:49:23 +0000
79+++ menu-data-xul-extensions/flashblock.desktop 1970-01-01 00:00:00 +0000
80@@ -1,14 +0,0 @@
81-[Desktop Entry]
82-Encoding=UTF-8
83-Name=Flashblock extension for Firefox
84-Comment=Firefox extension that replaces flash plugin by a button
85-GenericName=Firefox extension
86-Type=Application
87-Icon=flashblock
88-Categories=Application;Network;
89-MimeType=application/x-debian-xul-extension-firefox
90-StartupNotify=true
91-
92-X-AppInstall-Package=xul-ext-flashblock
93-X-AppInstall-Popcon=0
94-X-AppInstall-Section=universe
95
96=== renamed file 'menu-data-xul-extensions/ubufox.desktop' => 'menu-data-xul-extensions/xul-ext-ubufox.desktop'
97--- menu-data-xul-extensions/ubufox.desktop 2011-01-27 16:43:28 +0000
98+++ menu-data-xul-extensions/xul-ext-ubufox.desktop 2011-04-29 12:25:33 +0000
99@@ -1,7 +1,7 @@
100 [Desktop Entry]
101 Encoding=UTF-8
102 Name=Ubufox extension for Firefox
103-Comment=Extension package for Firefox, that ships various modifications for the Ubuntu default install of Firefox.
104+Comment=Ubuntu-specific configuration defaults and apt support for Firefox
105 GenericName=Firefox theme extension
106 Type=Application
107 Icon=ubufox
108@@ -9,6 +9,6 @@
109 MimeType=application/x-debian-xul-extension-firefox;application/x-debian-xul-extension-firefox-2
110 StartupNotify=true
111
112-X-AppInstall-Package=ubufox
113+X-AppInstall-Package=xul-ext-ubufox
114 X-AppInstall-Popcon=1
115 X-AppInstall-Section=main

Subscribers

People subscribed via source and target branches

to all changes: