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).

1 files changed, 54 insertions, 0 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 13fef2d..9d5e496 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -304,6 +304,60 @@ TESTS += service-version-tester
 DISTCLEANFILES += service-version-tester service-version-bad.service service-version-good.service
 
 #############################
+# Service Versions
+#############################
+
+check_PROGRAMS += service-version-multiwatch-manager
+
+service_version_manager_SOURCES = \
+	service-version-values.h \
+	service-version-multiwatch-manager.c
+
+service_version_multiwatch_manager_CFLAGS = \
+	-Wall -Werror \
+	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+
+service_version_multiwatch_manager_LDADD = \
+	$(LIBINDICATOR_LIBS) \
+	$(top_builddir)/libindicator/.libs/libindicator.a
+
+check_PROGRAMS += service-version-multiwatch-manager-impolite
+
+service_version_manager_impolite_SOURCES = \
+	service-version-values.h \
+	service-version-multiwatch-manager-impolite.c
+
+service_version_multiwatch_manager_impolite_CFLAGS = \
+	-Wall -Werror \
+	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+
+service_version_multiwatch_manager_impolite_LDADD = \
+	$(LIBINDICATOR_LIBS) \
+	$(top_builddir)/libindicator/.libs/libindicator.a
+
+check_PROGRAMS += service-version-multiwatch-service
+
+service_version_multiwatch_service_SOURCES = \
+	service-version-values.h \
+	service-version-multiwatch-service.c
+
+service_version_multiwatch_service_CFLAGS = \
+	-Wall -Werror \
+	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+
+service_version_multiwatch_service_LDADD = \
+	$(LIBINDICATOR_LIBS) \
+	$(top_builddir)/libindicator/.libs/libindicator.a
+
+service-version-multiwatch-tester: service-version-multiwatch-manager service-version-multiwatch-service service-version-multiwatch-manager-impolite Makefile.am
+	@echo "#!/bin/sh" > $@
+	@echo dbus-test-runner --task ./service-version-multiwatch-service --task-name Service --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 --task ./service-version-multiwatch-manager --task-name Manager3 --task ./service-version-multiwatch-manager --task-name Manager4 --task ./service-version-multiwatch-manager --task-name Manager5 --task ./service-version-multiwatch-manager-impolite --task-name Impolite1 --task ./service-version-multiwatch-manager-impolite --task-name Impolite2 --task ./service-version-multiwatch-manager-impolite --task-name Impolite3 >> $@
+	@chmod +x $@
+
+TESTS += service-version-multiwatch-tester
+DISTCLEANFILES += service-version-multiwatch-tester
+
+#############################
 # Service Manager Shutdown
 #############################