git.iko.soy/unity8
on xenial help sign in
Merge from trunk
175e56eMichael Terry
debian/changelog+7
compare with xenial
unifiedsplit
@@ -1,3 +1,10 @@
1+unity8 (7.90+14.10.20140723.4-0ubuntu1) utopic; urgency=low
2+
3+ [ thomas-voss ]
4+ * Explicitly select gcc version.
5+
6+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 23 Jul 2014 15:32:41 +0000
7+
1unity8 (7.90+14.10.20140721.1-0ubuntu1) utopic; urgency=low
8unity8 (7.90+14.10.20140721.1-0ubuntu1) utopic; urgency=low
2
9
3 [ Michael Terry ]
10 [ Michael Terry ]
debian/control+5−1
@@ -7,6 +7,10 @@ Build-Depends: cmake,
7 debhelper (>= 9),
7 debhelper (>= 9),
8 doxyqml,
8 doxyqml,
9 graphviz,
9 graphviz,
10+# We rely on C++11 features, and to prevent from ABI breaks
11+# in libstdc++ causing us issues, we explicitly select a G++
12+# version.
13+ g++-4.9,
10 libdee-qt5-dev (>= 3.2),
14 libdee-qt5-dev (>= 3.2),
11 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
15 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
12 libgl1-mesa-dri,
16 libgl1-mesa-dri,
@@ -15,7 +19,7 @@ Build-Depends: cmake,
15 libgsettings-qt-dev,
19 libgsettings-qt-dev,
16 libhardware-dev,
20 libhardware-dev,
17 libhud-client2-dev,
21 libhud-client2-dev,
18− libpay1-dev,
22+ libpay2-dev,
19 libpulse-dev,
23 libpulse-dev,
20 libqmenumodel-dev (>= 0.2.8),
24 libqmenumodel-dev (>= 0.2.8),
21 libqt5xmlpatterns5-dev,
25 libqt5xmlpatterns5-dev,
debian/rules+7
@@ -1,11 +1,18 @@
1#!/usr/bin/make -f
1#!/usr/bin/make -f
2# -*- makefile -*-
2# -*- makefile -*-
3
3
4+include /usr/share/dpkg/default.mk
5+
4# Uncomment this to turn on verbose mode.
6# Uncomment this to turn on verbose mode.
5#export DH_VERBOSE=1
7#export DH_VERBOSE=1
6export DPKG_GENSYMBOLS_CHECK_LEVEL=4
8export DPKG_GENSYMBOLS_CHECK_LEVEL=4
7export NO_PNG_PKG_MANGLE=1
9export NO_PNG_PKG_MANGLE=1
8
10
11+# Explicitly selecting a G{CC,++}-version here to avoid accidental
12+# ABI breaks introduced by toolchain updates.
13+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
14+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
15+
9%:
16%:
10 dh $@ --parallel --fail-missing --with python2,python3
17 dh $@ --parallel --fail-missing --with python2,python3
11
18
plugins/Ubuntu/Payments/CMakeLists.txt+1−1
@@ -14,7 +14,7 @@ qt5_use_modules(Payments Qml Quick DBus Core)
14
14
15add_unity8_plugin(Ubuntu.Payments 0.1 Ubuntu/Payments TARGETS Payments)
15add_unity8_plugin(Ubuntu.Payments 0.1 Ubuntu/Payments TARGETS Payments)
16
16
17−pkg_check_modules(LIBPAY REQUIRED pay-1)
17+pkg_check_modules(LIBPAY REQUIRED pay-2)
18add_definitions(${LIBPAY_CFLAGS} ${LIBPAY_CFLAGS_OTHER})
18add_definitions(${LIBPAY_CFLAGS} ${LIBPAY_CFLAGS_OTHER})
19
19
20target_link_libraries(Payments ${LIBPAY_LDFLAGS})
20target_link_libraries(Payments ${LIBPAY_LDFLAGS})
po/hu.po+16−16
@@ -8,14 +8,14 @@ msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
10"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-01-14 23:02+0000\n"
11+"PO-Revision-Date: 2014-07-23 10:07+0000\n"
12−"Last-Translator: Kristóf Kiszel <Unknown>\n"
12+"Last-Translator: Úr Balázs <urbalazs@gmail.com>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-24 06:32+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
18+"X-Generator: Launchpad (build 17114)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -80,7 +80,7 @@ msgstr "Vészhívás"
80
80
81#: qml/Components/Lockscreen.qml:231
81#: qml/Components/Lockscreen.qml:231
82msgid "OK"
82msgid "OK"
83−msgstr ""
83+msgstr "OK"
84
84
85#: qml/Components/PageHeader.qml:366
85#: qml/Components/PageHeader.qml:366
86msgid "Recent searches"
86msgid "Recent searches"
@@ -97,11 +97,11 @@ msgstr "Szia"
97
97
98#: qml/Components/PinLockscreen.qml:198
98#: qml/Components/PinLockscreen.qml:198
99msgid "CANCEL"
99msgid "CANCEL"
100−msgstr ""
100+msgstr "MÉGSE"
101
101
102#: qml/Components/PinLockscreen.qml:216
102#: qml/Components/PinLockscreen.qml:216
103msgid "DONE"
103msgid "DONE"
104−msgstr ""
104+msgstr "KÉSZ"
105
105
106#: qml/Components/SeeMore.qml:35
106#: qml/Components/SeeMore.qml:35
107msgid "See more"
107msgid "See more"
@@ -113,15 +113,15 @@ msgstr ""
113
113
114#: qml/Dash/DashApps.qml:37
114#: qml/Dash/DashApps.qml:37
115msgid "Recent"
115msgid "Recent"
116−msgstr ""
116+msgstr "Legutóbbi"
117
117
118#: qml/Dash/Previews/PreviewActionCombo.qml:34
118#: qml/Dash/Previews/PreviewActionCombo.qml:34
119msgid "More..."
119msgid "More..."
120−msgstr ""
120+msgstr "Több…"
121
121
122#: qml/Dash/Previews/PreviewActionCombo.qml:34
122#: qml/Dash/Previews/PreviewActionCombo.qml:34
123msgid "Less..."
123msgid "Less..."
124−msgstr ""
124+msgstr "Kevesebb…"
125
125
126#: qml/Dash/Previews/PreviewRatingInput.qml:82
126#: qml/Dash/Previews/PreviewRatingInput.qml:82
127msgid "Rate this"
127msgid "Rate this"
@@ -165,7 +165,7 @@ msgstr "Jelszó megjelenítése"
165
165
166#: qml/Notifications/NotificationMenuItemFactory.qml:103
166#: qml/Notifications/NotificationMenuItemFactory.qml:103
167msgid "Please enter SIM PIN"
167msgid "Please enter SIM PIN"
168−msgstr ""
168+msgstr "Adja meg a SIM PIN kódját"
169
169
170#: qml/Panel/Indicators/MenuItemFactory.qml:583
170#: qml/Panel/Indicators/MenuItemFactory.qml:583
171msgid "In queue…"
171msgid "In queue…"
@@ -173,23 +173,23 @@ msgstr ""
173
173
174#: qml/Panel/Indicators/MenuItemFactory.qml:587
174#: qml/Panel/Indicators/MenuItemFactory.qml:587
175msgid "Downloading"
175msgid "Downloading"
176−msgstr ""
176+msgstr "Letöltés"
177
177
178#: qml/Panel/Indicators/MenuItemFactory.qml:589
178#: qml/Panel/Indicators/MenuItemFactory.qml:589
179msgid "Paused, tap to resume"
179msgid "Paused, tap to resume"
180−msgstr ""
180+msgstr "Szüneteltetve, koppintson a folytatáshoz"
181
181
182#: qml/Panel/Indicators/MenuItemFactory.qml:591
182#: qml/Panel/Indicators/MenuItemFactory.qml:591
183msgid "Canceled"
183msgid "Canceled"
184−msgstr ""
184+msgstr "Megszakítva"
185
185
186#: qml/Panel/Indicators/MenuItemFactory.qml:593
186#: qml/Panel/Indicators/MenuItemFactory.qml:593
187msgid "Finished"
187msgid "Finished"
188−msgstr ""
188+msgstr "Befejeződött"
189
189
190#: qml/Panel/Indicators/MenuItemFactory.qml:595
190#: qml/Panel/Indicators/MenuItemFactory.qml:595
191msgid "Failed, tap to retry"
191msgid "Failed, tap to retry"
192−msgstr ""
192+msgstr "Sikertelen, koppintson az újrapróbáláshoz"
193
193
194#: qml/Panel/SearchIndicator.qml:27
194#: qml/Panel/SearchIndicator.qml:27
195msgid "Search"
195msgid "Search"
po/is.po+1−1
@@ -16,7 +16,7 @@ msgstr ""
16"MIME-Version: 1.0\n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"
18"Content-Transfer-Encoding: 8bit\n"
19−"X-Launchpad-Export-Date: 2014-07-23 07:01+0000\n"
19+"X-Launchpad-Export-Date: 2014-07-24 06:32+0000\n"
20"X-Generator: Launchpad (build 17114)\n"
20"X-Generator: Launchpad (build 17114)\n"
21"Language: is\n"
21"Language: is\n"
22
22
tests/mocks/libusermetrics/UserMetrics.cpp+3
@@ -24,6 +24,9 @@
24#include <QtGui/QIcon>
24#include <QtGui/QIcon>
25#include <QMultiMap>
25#include <QMultiMap>
26
26
27+#include <functional>
28+#include <random>
29+
27using namespace UserMetricsOutput;
30using namespace UserMetricsOutput;
28
31
29namespace UserMetricsOutput
32namespace UserMetricsOutput
tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp+3
@@ -24,6 +24,9 @@
24#include <QDebug>
24#include <QDebug>
25#include <unitymenumodel.h>
25#include <unitymenumodel.h>
26
26
27+#include <functional>
28+#include <chrono>
29+
27class UnityMenuModelStackTest : public QObject
30class UnityMenuModelStackTest : public QObject
28{
31{
29 Q_OBJECT
32 Q_OBJECT