← Back to branch summary

~kroq-gar78/ubuntu/precise/gnome-control-center/fix-885947

« back to all changes in this revision

Viewing changes to debian/patches/16_preferred_applications_list_cleanup.patch

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Moya
  • Date: 2011-05-17 10:47:27 UTC
  • mfrom: (0.1.11 experimental) (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110517104727-lqel6m8vhfw5jby1
Tags: 1:3.0.1.1-1ubuntu1
* Rebase on Debian, remaining Ubuntu changes:
* debian/control:
  - Build-Depend on hardening-wrapper, dpkg-dev and dh-autoreconf
  - Add dependency on ubuntu-system-service
  - Remove dependency on gnome-icon-theme-symbolic
  - Move dependency on apg, gnome-icon-theme-symbolic and accountsservice to
    be a Recommends: until we get them in main
* debian/rules:
  - Use autoreconf
  - Add binary-post-install rule for gnome-control-center-data
  - Run dh-autoreconf
* debian/gnome-control-center.dirs:
* debian/gnome-control-center.links:
  - Add a link to the control center shell for indicators
* debian/patches/00_disable-nm.patch:
  - Temporary patch to disable building with NetworkManager until we get
    the new one in the archive
* debian/patches/01_git_remove_gettext_calls.patch:
  - Remove calls to AM_GNU_GETTEXT, IT_PROG_INTLTOOL should be enough
* debian/patches/01_git_kill_warning.patch:
  - Kill warning
* debian/patches/50_ubuntu_systemwide_prefs.patch:
  - Ubuntu specific proxy preferences
* debian/patches/51_ubuntu_system_keyboard.patch:
  - Implement the global keyboard spec at https://wiki.ubuntu.com/DefaultKeyboardSettings

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/16_preferred_applications_list_cleanup.patch
1
 
Description: Don't list Mozilla commands which are compatibility symlinks
2
 
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=499327
3
 
Bug-Ubuntu: http://bugs.launchpad.net/bugs/55963
4
 
 
5
 
diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.27.3/capplets/default-applications/gnome-default-applications.xml.in gnome-control-center-2.27.3.new/capplets/default-applications/gnome-default-applications.xml.in
6
 
--- gnome-control-center-2.27.3/capplets/default-applications/gnome-default-applications.xml.in 2009-07-13 19:45:12.376642974 +0100
7
 
+++ gnome-control-center-2.27.3.new/capplets/default-applications/gnome-default-applications.xml.in     2009-07-13 19:45:14.536643756 +0100
8
 
@@ -74,26 +74,6 @@
9
 
       <win-command>iceweasel -new-window "%s"</win-command>
10
 
     </web-browser>
11
 
     <web-browser>
12
 
-      <_name>Mozilla 1.6</_name>
13
 
-      <executable>mozilla-1.6</executable>
14
 
-      <command>mozilla-1.6 %s</command>
15
 
-      <icon-name>mozilla-icon</icon-name>
16
 
-      <run-in-terminal>false</run-in-terminal>
17
 
-      <netscape-remote>true</netscape-remote>
18
 
-      <tab-command>mozilla-1.6 -remote "openurl(%s,new-tab)"</tab-command>
19
 
-      <win-command>mozilla-1.6 -remote "openurl(%s,new-window)"</win-command>
20
 
-    </web-browser>
21
 
-    <web-browser>
22
 
-      <_name>Mozilla</_name>
23
 
-      <executable>mozilla</executable>
24
 
-      <command>mozilla %s</command>
25
 
-      <icon-name>mozilla-icon</icon-name>
26
 
-      <run-in-terminal>false</run-in-terminal>
27
 
-      <netscape-remote>true</netscape-remote>
28
 
-      <tab-command>mozilla -remote "openurl(%s,new-tab)"</tab-command>
29
 
-      <win-command>mozilla -remote "openurl(%s,new-window)"</win-command>
30
 
-    </web-browser>
31
 
-    <web-browser>
32
 
       <_name>SeaMonkey</_name>
33
 
       <executable>seamonkey</executable>
34
 
       <command>seamonkey %s</command>
35
 
@@ -185,13 +165,6 @@
36
 
       <run-in-terminal>false</run-in-terminal>
37
 
     </mail-reader>
38
 
     <mail-reader>
39
 
-      <_name>Mozilla Mail</_name>
40
 
-      <executable>mozilla</executable>
41
 
-      <command>mozilla -mail %s</command>
42
 
-      <icon-name>mozilla-mail-icon</icon-name>
43
 
-      <run-in-terminal>false</run-in-terminal>
44
 
-    </mail-reader>
45
 
-    <mail-reader>
46
 
       <_name>SeaMonkey Mail</_name>
47
 
       <executable>seamonkey</executable>
48
 
       <command>seamonkey -mail %s</command>