From 68b671ce04b8b5d6b37025ad093c73a3e14d4d64 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 8 Mar 2016 22:04:56 -0600 Subject: add fingerprint snap decisions; test with notification dbusmock --- debian/control | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 4f05f74..5088af5 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,17 @@ Section: misc Priority: optional Maintainer: Charles Kerr Build-Depends: cmake, + cmake-extras (>= 0.4), dbus, libglib2.0-dev (>= 2.36), libproperties-cpp-dev, # for coverage reports lcov, # for tests + qt5-default, + qtbase5-dev, + libqtdbusmock1-dev (>= 0.4), + libqtdbustest1-dev, cppcheck, libgtest-dev, google-mock (>= 1.6.0+svn437), -- cgit v1.2.3 From 1e659cd3e96554c77cea09266f8b24fc153a186c Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 15 Mar 2016 20:55:15 -0500 Subject: Remove the minimum version of 0.4 for libqtdbusmock1-dev, it's causing a failure on Jenkins wily and was only included due to copy-paste from indicator-network. So let's see how Wily goes without it. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 5088af5..9de530d 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: cmake, # for tests qt5-default, qtbase5-dev, - libqtdbusmock1-dev (>= 0.4), + libqtdbusmock1-dev, libqtdbustest1-dev, cppcheck, libgtest-dev, -- cgit v1.2.3 From b7d7f15ab25708c6ee7a3c22389246e07fd6183d Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 17 Mar 2016 13:27:12 -0500 Subject: sync with lp:~ubuntu-branches/ubuntu/wily/indicator-display/wily/ to pick up 0.1+15.10.20150727-0ubuntu2~gcc5.1 --- debian/changelog | 6 ++++++ debian/control | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9d66cb6..d2e5b8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-display (0.1+15.10.20150727-0ubuntu2~gcc5.1) wily; urgency=medium + + * No-change test rebuild for g++5 ABI transition + + -- Steve Langasek Mon, 27 Jul 2015 22:57:15 +0000 + indicator-display (0.1+15.10.20150727-0ubuntu1) wily; urgency=medium [ CI Train Bot ] diff --git a/debian/control b/debian/control index 9de530d..529fa37 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: indicator-display Section: misc Priority: optional -Maintainer: Charles Kerr +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Charles Kerr Build-Depends: cmake, cmake-extras (>= 0.4), dbus, -- cgit v1.2.3 From 7a25132c125f6e5e413ad26ea950ae22bee982f5 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 21 Mar 2016 13:40:11 -0500 Subject: if our USB device is disconnected while prompting the user for ADBD, cancel the prompt. --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 529fa37..90e2590 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Build-Depends: cmake, cmake-extras (>= 0.4), dbus, libglib2.0-dev (>= 2.36), + libgudev-1.0-dev, libproperties-cpp-dev, # for coverage reports lcov, -- cgit v1.2.3