← Back to branch summary

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

« back to all changes in this revision

Viewing changes to data/Makefile.in

  • 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:
data/Makefile.in
321
321
mimedir = $(datadir)/mime/packages
322
322
mime_DATA = $(xml_files)
323
323
servicedir = $(datadir)/dbus-1/services
324
 
service_in_files = org.gnome.Nautilus.service.in
325
324
service_DATA = $(service_in_files:.service.in=.service)
 
325
service_in_files = \
 
326
        org.freedesktop.FileManager1.service.in \
 
327
        org.gnome.Nautilus.service.in
 
328
 
326
329
nautilusdatadir = $(datadir)/nautilus
327
330
nautilusdata_DATA = \
328
331
        nautilus-extras.placeholder     \
333
336
        nautilus.desktop                \
334
337
        nautilus.desktop.in             \
335
338
        dbus-interfaces.xml             \
 
339
        freedesktop-dbus-interfaces.xml \
336
340
        $(xml_in_files)                 \
337
341
        $(desktop_in_files)             \
338
342
        $(service_in_files)             \
820
824
org.gnome.Nautilus.service: org.gnome.Nautilus.service.in Makefile
821
825
        $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
822
826
 
 
827
org.freedesktop.FileManager1.service: org.freedesktop.FileManager1.service.in Makefile
 
828
        $(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
 
829
 
823
830
install-data-hook:
824
831
@ENABLE_UPDATE_MIMEDB_TRUE@     $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
825
832