← Back to branch summary

~ubuntu-branches/ubuntu/raring/nautilus/raring

« back to all changes in this revision

Viewing changes to debian/patches/16_run_in_gnome_unity.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Jeremy Bicha
  • Date: 2012-01-31 13:45:01 UTC
  • mfrom: (1.17.25)
  • Revision ID: package-import@ubuntu.com-20120131134501-yn7mqny7fgzx9fao
Tags: 1:3.3.4-0ubuntu1
https://launchpad.net/bugs/126540
https://launchpad.net/bugs/61786
https://launchpad.net/bugs/503330
https://launchpad.net/bugs/846289
https://launchpad.net/bugs/575719
https://launchpad.net/bugs/230098
* New upstream version which fixes:
  - "Opening Popupmenu in Context of Folder with List-View impossible?"
    (lp: #126540)
  - "'Create folder in here' context menu option for nautilus" (lp: #61786)
  - the file count and the size count change in opposite direction.
    (lp: #503330)
  - the mounts in the place menu should have a properties entry.
    (lp: #846289)
  - add command line option to select file (lp: #575719)
  - Media in 'Places' side bar should have same context menu as in 
    'Computer' (lp: #230098)
* debian/nautilus-data.install:
  - updated, ui and icons have been moved into gresources
* debian/patches/05_desktop_menu_export.patch:
   - updated to correctly include the gresources desktop definition

[ Jeremy Bicha ]
* New upstream release.
* debian/control.in:
  - Bump minimum GTK and glib
* Refreshed patches
* Dropped upstream patches:
  - 17_dont_allow_new_tab_on_desktop.patch
  - 18_fix_crash_in_get_current_uri.patch
  - 19_lazily_initialize_notification_service.patch
  - git_sideplace_sorting.patch
  - git_next_row.patch
  - git_dont_document_browser_option.patch
  - git_browser_compat.patch
  - git_bookmarks_reordering.patch
  - git_listview_context_menus.patch
  - git_use_gtk_grid.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/16_run_in_gnome_unity.patch
1
 
Index: nautilus-3.2.1/data/nautilus-autostart.desktop.in
 
1
Index: nautilus-3.3.4/data/nautilus-autostart.desktop.in
2
2
===================================================================
3
 
--- nautilus-3.2.1.orig/data/nautilus-autostart.desktop.in      2011-12-16 12:37:19.532145333 +0100
4
 
+++ nautilus-3.2.1/data/nautilus-autostart.desktop.in   2011-12-16 12:37:24.688145155 +0100
5
 
@@ -4,3 +4,4 @@
6
 
 Exec=nautilus -n
 
3
--- nautilus-3.3.4.orig/data/nautilus-autostart.desktop.in      2012-01-29 11:12:36.253436964 -0500
 
4
+++ nautilus-3.3.4/data/nautilus-autostart.desktop.in   2012-01-29 11:13:07.625592527 -0500
 
5
@@ -5,3 +5,4 @@
 
6
 OnlyShowIn=GNOME;Unity;
7
7
 AutostartCondition=GSettings org.gnome.desktop.background show-desktop-icons
8
8
 NoDisplay=true
9
9
+OnlyShowIn=GNOME;Unity;