diff options
| author | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:03:46 +0200 |
|---|---|---|
| committer | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:03:46 +0200 |
| commit | b4d146190da79eaf88b63d38e7d0d40856b5262f (patch) | |
| tree | cd3b5e99ccb2ba8a7fd32fe20d78b9c6563ef82f /Makefile.in | |
| parent | 34b4a4d73f886573fc992d0618f44817ec12c3a5 (diff) | |
| parent | d14f25ad6ec36e956cd2d2c031147b8cb2fddec3 (diff) | |
| download | libayatana-indicator-b4d146190da79eaf88b63d38e7d0d40856b5262f.tar.gz libayatana-indicator-b4d146190da79eaf88b63d38e7d0d40856b5262f.tar.bz2 libayatana-indicator-b4d146190da79eaf88b63d38e7d0d40856b5262f.zip | |
Merging new upstream release and some changes from Ubuntu.
Don't drop debian/source
* 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.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index f374041..901cece 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,7 +40,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ compile config.guess config.sub depcomp install-sh ltmain.sh \ missing 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) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |