← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/07_use_application_indicator.patch/src/Makefile.am

  • 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:
.pc/07_use_application_indicator.patch/src/Makefile.am
43
43
        $(POPT_LIBS) \
44
44
        $(NULL)
45
45
 
 
46
dbus_built_sources = nautilus-freedesktop-generated.c nautilus-freedesktop-generated.h
 
47
$(dbus_built_sources) : Makefile.am $(top_srcdir)/data/freedesktop-dbus-interfaces.xml
 
48
        gdbus-codegen                                                                   \
 
49
                --interface-prefix org.freedesktop.                                     \
 
50
                --c-namespace NautilusFreedesktop                                       \
 
51
                --c-generate-object-manager                                             \
 
52
                --generate-c-code nautilus-freedesktop-generated                        \
 
53
                $(top_srcdir)/data/freedesktop-dbus-interfaces.xml                      \
 
54
                $(NULL)
 
55
 
 
56
UI_FILES = \
 
57
        nautilus-bookmarks-window.ui            \
 
58
        nautilus-file-management-properties.ui  \
 
59
        nautilus-icon-view-ui.xml               \
 
60
        nautilus-toolbar-ui.xml                 \
 
61
        nautilus-directory-view-ui.xml          \
 
62
        nautilus-desktop-icon-view-ui.xml       \
 
63
        nautilus-desktop-window-ui.xml          \
 
64
        nautilus-list-view-ui.xml               \
 
65
        nautilus-shell-ui.xml                   \
 
66
        $(NULL)
 
67
 
 
68
nautilus-resources.c: nautilus.gresource.xml $(UI_FILES)
 
69
        glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name nautilus $(srcdir)/nautilus.gresource.xml
 
70
 
 
71
nautilus-resources.h: nautilus.gresource.xml
 
72
        glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name nautilus $(srcdir)/nautilus.gresource.xml
 
73
 
 
74
 
 
75
BUILT_SOURCES = \
 
76
        $(dbus_built_sources) \
 
77
        nautilus-resources.c \
 
78
        nautilus-resources.h \
 
79
        $(NULL)
 
80
 
46
81
nautilus_SOURCES = \
47
82
        nautilus-actions.h                      \
48
83
        nautilus-application.c                  \
68
103
        nautilus-file-management-properties.h   \
69
104
        nautilus-floating-bar.c                 \
70
105
        nautilus-floating-bar.h                 \
 
106
        nautilus-freedesktop-dbus.c             \
 
107
        nautilus-freedesktop-dbus.h             \
71
108
        nautilus-icon-view.c                    \
72
109
        nautilus-icon-view.h                    \
73
110
        nautilus-icon-view-container.c          \
143
180
        nautilus-x-content-bar.h                \
144
181
        $(NULL)
145
182
 
 
183
nodist_nautilus_SOURCES = \
 
184
        $(BUILT_SOURCES) \
 
185
        $(NULL)
 
186
 
146
187
EMPTY_VIEW_SOURCES = \
147
188
        nautilus-empty-view.c                   \
148
189
        nautilus-empty-view.h
173
214
 
174
215
@INTLTOOL_SERVER_RULE@
175
216
 
176
 
uidir = $(datadir)/nautilus/ui
177
 
ui_DATA =                                       \
178
 
        nautilus-shell-ui.xml                   \
179
 
        nautilus-file-management-properties.ui  \
180
 
        nautilus-bookmarks-window.ui            \
181
 
        nautilus-desktop-icon-view-ui.xml       \
182
 
        nautilus-desktop-window-ui.xml  \
183
 
        nautilus-directory-view-ui.xml          \
184
 
        nautilus-icon-view-ui.xml               \
185
 
        nautilus-list-view-ui.xml               \
186
 
        nautilus-toolbar-ui.xml                 \
187
 
        $(NULL)
188
 
 
189
217
CLEANFILES = \
 
218
        $(BUILT_SOURCES)                        \
190
219
        $(server_DATA)                          \
191
220
        $(NULL)
192
221
 
193
222
EXTRA_DIST =                                    \
194
223
        $(server_in_files)                      \
195
 
        $(ui_DATA)                              \
 
224
        $(UI_FILES)                             \
 
225
        nautilus.gresource.xml                  \
196
226
        check-nautilus                          \
197
227
        $(NULL)
198
228