← Back to branch summary

~ubuntu-branches/ubuntu/vivid/nautilus/vivid-proposed

« back to all changes in this revision

Viewing changes to .pc/12_unity_launcher_support.patch/src/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Iain Lane, Tim Lunn, Rico Tzschichholz, Iain Lane
  • Date: 2014-12-18 11:08:41 UTC
  • mfrom: (1.17.44)
  • Revision ID: package-import@ubuntu.com-20141218110841-bxmpa39jeo2fakiu
Tags: 1:3.14.2-0ubuntu1
https://launchpad.net/bugs/1393252
[ Tim Lunn ]
* New upstream release (LP: #1393252)
* debian/watch: watch for stable releases
* debian/nautilus-data.install: install appdata.xml
* debian/patches:
  + Refresh some Ubuntu patches
    - 15_use-ubuntu-help.patch
    - ubuntu_show_titlebar.patch
    - restore-traditional-menu-bar.patch
  + revert_remove_unused_GtkActions.patch: These are used by the menubar
  + 20_unity_control_center.patch: Dropped, fix differently upstream
  + no_search_on_desktop.patch, Dropped fix included in new version

[ Rico Tzschichholz ]
* debian/control.in:
  - Bump build-dep on libgtk-3-dev (>= 3.13.2)
* debian/patches:
  - Refreshed as needed
  - Drop git patches
* debian/nautilus-data.install: placeholder files no longer shipped

[ Iain Lane ]
* Replace titlebar patches with those submitted upstream (bgo #740617)
* Remove 05_desktop_menu_export.patch which was already not applied.
* Remove dupe libtracker-sparql BD
* New upstream release 3.14.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/12_unity_launcher_support.patch/src/Makefile.am
42
42
        $(POPT_LIBS) \
43
43
        $(NULL)
44
44
 
 
45
dbus_built_sources =                                    \
 
46
        nautilus-generated.c                            \
 
47
        nautilus-generated.h
 
48
 
 
49
$(dbus_built_sources) : Makefile.am $(top_srcdir)/data/dbus-interfaces.xml
 
50
        gdbus-codegen                                                                   \
 
51
                --interface-prefix org.gnome.Nautilus.                                  \
 
52
                --c-namespace NautilusDBus                                              \
 
53
                --c-generate-object-manager                                             \
 
54
                --generate-c-code nautilus-generated                                    \
 
55
                $(top_srcdir)/data/dbus-interfaces.xml                                  \
 
56
                $(NULL)
 
57
 
45
58
dbus_freedesktop_built_sources =                        \
46
59
        nautilus-freedesktop-generated.c                \
47
60
        nautilus-freedesktop-generated.h
93
106
                        --eprod "#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
94
107
                        --eprod "GType @enum_name@_get_type (void);\n" \
95
108
                $(headers) ) > xgen-gth \
96
 
        && (cmp -s xgen-gth nautilus-enum-type.h || cp xgen-gth nautilus-enum-types.h) \
 
109
        && (cmp -s xgen-gth nautilus-enum-types.h || cp xgen-gth nautilus-enum-types.h) \
97
110
        && rm -f xgen-gth \
98
111
        && echo timestamp > $(@F)
99
112
 
117
130
        && rm -f xgen-gtc
118
131
 
119
132
nautilus_built_sources = \
 
133
        $(dbus_built_sources) \
120
134
        $(dbus_freedesktop_built_sources) \
121
135
        $(dbus_shell_search_provider_built_sources) \
122
136
        nautilus-resources.c \
129
143
        nautilus-actions.h                      \
130
144
        nautilus-application.c                  \
131
145
        nautilus-application.h                  \
 
146
        nautilus-application-actions.c          \
 
147
        nautilus-application-actions.h          \
132
148
        nautilus-bookmark-list.c                \
133
149
        nautilus-bookmark-list.h                \
134
150
        nautilus-bookmarks-window.c             \
139
155
        nautilus-canvas-view-container.h        \
140
156
        nautilus-connect-server-dialog.c        \
141
157
        nautilus-connect-server-dialog.h        \
 
158
        nautilus-dbus-manager.c                 \
 
159
        nautilus-dbus-manager.h                 \
142
160
        nautilus-desktop-canvas-view.c          \
143
161
        nautilus-desktop-canvas-view.h          \
144
162
        nautilus-desktop-item-properties.c      \
233
251
 
234
252
BUILT_SOURCES =                                         \
235
253
        $(nautilus_built_sources)                       \
236
 
        $(dbus_shell_search_provider_built_sources)     \
237
254
        $(NULL)
238
255
 
239
256
TESTS=check-nautilus