aboutsummaryrefslogtreecommitdiff
path: root/tools/Makefile.in
diff options
context:
space:
mode:
authorEvgeni Golov <evgeni@debian.org>2010-07-14 10:00:17 +0200
committerEvgeni Golov <evgeni@debian.org>2010-07-14 10:00:17 +0200
commitd14f25ad6ec36e956cd2d2c031147b8cb2fddec3 (patch)
tree0314066c4f5b3177ba896b005bbb1062cbd5c052 /tools/Makefile.in
parentec36577978bd7e31c0f52083d5d9d05976edc2db (diff)
parentb52f07039fdf21d25fb1724c47a34a66c4981798 (diff)
downloadlibayatana-indicator-d14f25ad6ec36e956cd2d2c031147b8cb2fddec3.tar.gz
libayatana-indicator-d14f25ad6ec36e956cd2d2c031147b8cb2fddec3.tar.bz2
libayatana-indicator-d14f25ad6ec36e956cd2d2c031147b8cb2fddec3.zip
Merging lp:~ubuntu-desktop/libindicator/ubuntu
* Merged in fix for (LP: #603489) * New upstream release. * Removing checking for style properties that aren't used. * Make it so that a watcher dying is the same as unregistering. * Merge debian changes * Drop debian/source/* * debian/control: Switch VCS for this branch to be the indicator applet developers branch. * Revert cdbs drop, as requested by the Ubuntu maintainers. * Update Maintainer and Vcs-* fields for pkg-ayatana. * Merge Ubuntu package into Debian. Closes: #549999 * debian/copyright: + Update to machine readable format. * debian/control: + Drop cdbs Build-Dep, bump debhelper to >=7. + Standards-Version 3.8.4. + Update Vcs-* fields. + Drop GNOME from Description, the package is not GNOME specific. + Slightly update Description, thanks lintian. * debian/rules: + Use minimal debhelper 7 rules without cdbs. + Disable tests for now, they fail (launchpad 587811) * debian/source/format: + Add file, make package 3.0 (quilt).
Diffstat (limited to 'tools/Makefile.in')
-rw-r--r--tools/Makefile.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 8c30598..69cf64c 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -38,7 +38,10 @@ libexec_PROGRAMS = indicator-loader$(EXEEXT)
subdir = tools
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d