← Back to branch summary

~manishsinha/ubuntu/saucy/nautilus/move-to-zeitgeist2

« back to all changes in this revision

Viewing changes to data/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Sebastien Bacher, Iain Lane, Jeremy Bicha, Robert Ancell, Rico Tzschichholz, Tim Lunn, Marco Trevisan (Treviño)
  • Date: 2013-06-21 17:10:06 UTC
  • mfrom: (1.17.42)
  • Revision ID: package-import@ubuntu.com-20130621171006-0vajxyu6ebhp1p9p
Tags: 1:3.8.2-0ubuntu1
https://launchpad.net/bugs/1130746
https://launchpad.net/bugs/1039014
https://launchpad.net/bugs/585472
[ Sebastien Bacher ]
* Bring the 3.8 update work from the gnome3 ppa to the distribution vcs
* debian/patches/16_unity_new_documents.patch: 
  - updated to work on 3.8 (by adding a revert of the commit that broke it)
* debian/patches/ubuntu_revert_no_wallpaper.patch:
  - revert upstream changes to use a rgba desktop view, until the other
    components are ready for that change, see lp #1159430 for details
* debian/patches/ubuntu_sync_background_to_accountsservice.patch:
  - restore that dropped patch since we keep display the wallpaper there

[ Iain Lane ]
* debian/patches/disconnect-extra-location-widgets.patch:
  - updated for the new nautilus codebase

[ Jeremy Bicha ]
* New upstream release (LP: #1130746)
  - Share the show-hidden-files setting with the GTK file chooser
    (LP: #1039014)
  - Limit folder size and content count to a single filesystem (LP: #585472)
* debian/nautilus.install:
  - Shell search provider doesn't need a separate library any more
* Drop git patches
* Refreshed patches

[ Robert Ancell ]
* debian/control:
  - Bump build-depends on libglib2.0-dev

[ Rico Tzschichholz ]
* New upstream release
* debian/control:
  - Bump build-depends on libgtk-3-dev (>= 3.7.7)
* debian/patches:
  - 09_no-initial-fade.patch:
  - 10_sync_background_to_accountsservice.patch:
    + Dropped, Nautilus doesn't draw the background itself any more
* Refreshed patches

[ Tim Lunn ]
* Add build-dep on gsettings-desktop-schemas

[ Marco Trevisan (Treviño) ]
* debian/patches:
  - 19_unity_open_location_xid.patch: updated to apply properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/Makefile.am
5
5
@INTLTOOL_XML_RULE@
6
6
 
7
7
desktopdir       = $(datadir)/applications
8
 
desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
 
8
desktop_DATA     =                                      \
 
9
        $(desktop_in_files:.desktop.in=.desktop)        \
 
10
        nautilus-classic.desktop
9
11
desktop_in_files =                                      \
10
12
        nautilus.desktop.in                             \
11
13
        nautilus-autorun-software.desktop.in            \
34
36
        $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
35
37
 
36
38
org.gnome.Nautilus.SearchProvider.service: org.gnome.Nautilus.SearchProvider.service.in Makefile
37
 
        $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
39
        $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
38
40
 
39
41
searchproviderdir = $(datadir)/gnome-shell/search-providers
40
42
searchprovider_DATA = nautilus-search-provider.ini