diff options
| author | Bileto Bot <ci-train-bot@canonical.com> | 2019-03-04 17:07:16 +0000 |
|---|---|---|
| committer | Bileto Bot <ci-train-bot@canonical.com> | 2019-03-04 17:07:16 +0000 |
| commit | cb7ae65f8e26320661b2b156462fda0fba09af77 (patch) | |
| tree | c80029ec63b03886bd4c4e66de1bad9858baac56 | |
| parent | 0dbd8327a3c9fed4e48e3bc931e889d752ac20c8 (diff) | |
| parent | 2c0245427d4127af4da969d700072adea80f638e (diff) | |
Releasing 7.5.0+19.04.20190304-0ubuntu17.5.0+19.04.20190304-0ubuntu1
| -rw-r--r-- | UnityCore/GLibDBusServer.cpp | 2 | ||||
| -rw-r--r-- | debian/changelog | 21 | ||||
| -rw-r--r-- | launcher/DevicesSettingsImp.cpp | 1 | ||||
| -rw-r--r-- | launcher/FavoriteStoreGSettings.cpp | 2 | ||||
| -rw-r--r-- | launcher/FavoriteStorePrivate.h | 2 | ||||
| -rw-r--r-- | unity-shared/IconLoader.h | 1 |
6 files changed, 28 insertions, 1 deletions
diff --git a/UnityCore/GLibDBusServer.cpp b/UnityCore/GLibDBusServer.cpp index 49b70d7c0..8fcfdf9d7 100644 --- a/UnityCore/GLibDBusServer.cpp +++ b/UnityCore/GLibDBusServer.cpp @@ -17,7 +17,9 @@ * Authored by: Marco Trevisan (Treviño) <marco.trevisan@canonical.com> */ +#include <algorithm> #include <unordered_map> + #include <NuxCore/Logger.h> #include "GLibDBusServer.h" diff --git a/debian/changelog b/debian/changelog index 848447525..c30e50b5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +unity (7.5.0+19.04.20190304-0ubuntu1) disco; urgency=medium + + [ disco/unity: Failed to merge https://git.launchpad.net/unity. ] + * Add missing includes for build w/o pch + + -- Marco Trevisan (Treviño) <mail@3v1n0.net> Mon, 04 Mar 2019 17:07:16 +0000 + unity (7.5.0+19.04.20190217-0ubuntu1) disco; urgency=medium [ Andrea Azzarone ] @@ -30,6 +37,20 @@ unity (7.5.0+19.04.20190103-0ubuntu1) disco; urgency=medium -- Dmitry Shachnev <mitya57@ubuntu.com> Thu, 03 Jan 2019 18:07:42 +0000 +<<<<<<< +======= +unity (7.5.0+18.10.20180926.2-0ubuntu2) UNRELEASED; urgency=medium + + [ Marco Trevisan (Treviño) ] + * debian/gbp.conf: add default settings to use gbp-buildpackage + * debian: use native source format + + [ Aleksey Tulinov ] + * Add missing includes for build w/o pch + + -- Marco Trevisan (Treviño) <marco@ubuntu.com> Sun, 04 Nov 2018 20:26:08 -0600 + +>>>>>>> unity (7.5.0+18.10.20180926.2-0ubuntu1) cosmic; urgency=medium [ Alexander Hale ] diff --git a/launcher/DevicesSettingsImp.cpp b/launcher/DevicesSettingsImp.cpp index 08eddb9cb..25f40a6b2 100644 --- a/launcher/DevicesSettingsImp.cpp +++ b/launcher/DevicesSettingsImp.cpp @@ -17,6 +17,7 @@ * Authored by: Andrea Azzarone <andrea.azzarone@canonical.com> */ +#include <algorithm> #include <list> #include <gio/gio.h> diff --git a/launcher/FavoriteStoreGSettings.cpp b/launcher/FavoriteStoreGSettings.cpp index 415a04bfe..493e823b1 100644 --- a/launcher/FavoriteStoreGSettings.cpp +++ b/launcher/FavoriteStoreGSettings.cpp @@ -18,6 +18,8 @@ * Marco Trevisan <marco.trevisan@canonical.com> */ +#include <algorithm> + #include <NuxCore/Logger.h> #include <UnityCore/DesktopUtilities.h> diff --git a/launcher/FavoriteStorePrivate.h b/launcher/FavoriteStorePrivate.h index 3edad2357..ebd3cfe2a 100644 --- a/launcher/FavoriteStorePrivate.h +++ b/launcher/FavoriteStorePrivate.h @@ -22,6 +22,7 @@ #include <list> #include <string> +#include <vector> namespace unity { @@ -47,4 +48,3 @@ bool IsDesktopFilePath(std::string const& path); } // namespace unity #endif - diff --git a/unity-shared/IconLoader.h b/unity-shared/IconLoader.h index fb4587e35..595def484 100644 --- a/unity-shared/IconLoader.h +++ b/unity-shared/IconLoader.h @@ -22,6 +22,7 @@ #include <boost/utility.hpp> +#include <functional> #include <memory> #include <gtk/gtk.h> #include <UnityCore/ActionHandle.h> |