← Back to branch summary

~ubuntu-branches/ubuntu/raring/gnome-system-tools/raring-proposed

« back to all changes in this revision

Viewing changes to src/shares/nautilus/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-06-11 16:06:30 UTC
  • mfrom: (1.5.9 upstream) (1.2.11 sid)
  • Revision ID: james.westby@ubuntu.com-20100611160630-8iolgbowspfaydud
Tags: 2.30.2-1ubuntu1
* Merge with debian unstable, remaining Ubuntu changes:
* debian/control.in:
  - Build-depend on libpango1.0-dev
  - Add Vcs-Bzr URL link
  - Add gnome-network-admin package
* debian/rules:
  - Run autotools on build
  - Don't build services-admin
  - Build POT files
* debian/gnome-network-admin.*:
* debian/gnome-system-tools.*:
  - Put network-admin in it's own package
* debian/patches/25_sambashare_group_definition.patch:
  - Add sambashare to known groups
* debian/patches/26_user_profiles_conf.patch:
  - Don't add new user to audio group
* debian/patches/80_gst-packages-common.patch:
  - Used by following 2 patches
* debian/patches/81_gst-packages-shares-admin.patch:
  - Install nfs-kernel-server and samba on demand
* debian/patches/82_gst-packages-time-admin.patch:
  - Install ntp on demand
* debian/patches/90_relibtoolize.patch:
  - Not required, autotools now run on build
* debian/watch:
  - Watch unstable series

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/shares/nautilus/Makefile.in
37
37
subdir = src/shares/nautilus
38
38
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
39
39
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
40
 
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 
40
am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
 
41
        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
41
42
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
42
43
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
43
44
        $(top_srcdir)/configure.in
159
160
GST_CFLAGS = @GST_CFLAGS@
160
161
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
161
162
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
 
163
GST_IW_LIBS = @GST_IW_LIBS@
162
164
GST_LIBS = @GST_LIBS@
163
165
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
164
166
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
173
175
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
174
176
INSTOBJEXT = @INSTOBJEXT@
175
177
INTLLIBS = @INTLLIBS@
 
178
INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
 
179
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
 
180
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
176
181
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 
182
INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
 
183
INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
177
184
INTLTOOL_MERGE = @INTLTOOL_MERGE@
 
185
INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
178
186
INTLTOOL_PERL = @INTLTOOL_PERL@
 
187
INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
 
188
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
 
189
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
 
190
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
 
191
INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
 
192
INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
 
193
INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
 
194
INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
 
195
INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
 
196
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
179
197
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
 
198
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
 
199
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
 
200
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
180
201
LD = @LD@
181
202
LDFLAGS = @LDFLAGS@
182
203
LIBOBJS = @LIBOBJS@