git.iko.soy/unity8
on xenial help sign in
Merge from trunk
commit175e56e1ff08fb3fd1a13dffc8b505c36e3cc59c authorMichael Terry <michael.terry@canonical.com> dateThu 24 Jul 2014, 09:23 (12 years ago) parent9ac7165b6247b4
8 files changed+43−19
compare with xenial
unifiedsplit
debian/changelog+7 debian/control+5−1 debian/rules+7 plugins/Ubuntu/Payments/CMakeLists.txt+1−1 po/hu.po+16−16 po/is.po+1−1 tests/mocks/libusermetrics/UserMetrics.cpp+3 tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp+3
debian/changelog+7
@@ -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+
18unity8 (7.90+14.10.20140721.1-0ubuntu1) utopic; urgency=low
29
310 [ Michael Terry ]
debian/control+5−1
@@ -7,6 +7,10 @@ Build-Depends: cmake,
77 debhelper (>= 9),
88 doxyqml,
99 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,
1014 libdee-qt5-dev (>= 3.2),
1115 libgl1-mesa-dev[!armhf] | libgl-dev[!armhf],
1216 libgl1-mesa-dri,
@@ -15,7 +19,7 @@ Build-Depends: cmake,
1519 libgsettings-qt-dev,
1620 libhardware-dev,
1721 libhud-client2-dev,
18− libpay1-dev,
22+ libpay2-dev,
1923 libpulse-dev,
2024 libqmenumodel-dev (>= 0.2.8),
2125 libqt5xmlpatterns5-dev,
debian/rules+7
@@ -1,11 +1,18 @@
11#!/usr/bin/make -f
22# -*- makefile -*-
33
4+include /usr/share/dpkg/default.mk
5+
46# Uncomment this to turn on verbose mode.
57#export DH_VERBOSE=1
68export DPKG_GENSYMBOLS_CHECK_LEVEL=4
79export NO_PNG_PKG_MANGLE=1
810
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+
916%:
1017 dh $@ --parallel --fail-missing --with python2,python3
1118
plugins/Ubuntu/Payments/CMakeLists.txt+1−1
@@ -14,7 +14,7 @@ qt5_use_modules(Payments Qml Quick DBus Core)
1414
1515add_unity8_plugin(Ubuntu.Payments 0.1 Ubuntu/Payments TARGETS Payments)
1616
17−pkg_check_modules(LIBPAY REQUIRED pay-1)
17+pkg_check_modules(LIBPAY REQUIRED pay-2)
1818add_definitions(${LIBPAY_CFLAGS} ${LIBPAY_CFLAGS_OTHER})
1919
2020target_link_libraries(Payments ${LIBPAY_LDFLAGS})
po/hu.po+16−16
@@ -8,14 +8,14 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-07 12:15+0100\n"
11−"PO-Revision-Date: 2014-01-14 23:02+0000\n"
12−"Last-Translator: Kristóf Kiszel <Unknown>\n"
11+"PO-Revision-Date: 2014-07-23 10:07+0000\n"
12+"Last-Translator: Úr Balázs <urbalazs@gmail.com>\n"
1313"Language-Team: Hungarian <hu@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-09 06:37+0000\n"
18−"X-Generator: Launchpad (build 17100)\n"
17+"X-Launchpad-Export-Date: 2014-07-24 06:32+0000\n"
18+"X-Generator: Launchpad (build 17114)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -80,7 +80,7 @@ msgstr "Vészhívás"
8080
8181#: qml/Components/Lockscreen.qml:231
8282msgid "OK"
83−msgstr ""
83+msgstr "OK"
8484
8585#: qml/Components/PageHeader.qml:366
8686msgid "Recent searches"
@@ -97,11 +97,11 @@ msgstr "Szia"
9797
9898#: qml/Components/PinLockscreen.qml:198
9999msgid "CANCEL"
100−msgstr ""
100+msgstr "MÉGSE"
101101
102102#: qml/Components/PinLockscreen.qml:216
103103msgid "DONE"
104−msgstr ""
104+msgstr "KÉSZ"
105105
106106#: qml/Components/SeeMore.qml:35
107107msgid "See more"
@@ -113,15 +113,15 @@ msgstr ""
113113
114114#: qml/Dash/DashApps.qml:37
115115msgid "Recent"
116−msgstr ""
116+msgstr "Legutóbbi"
117117
118118#: qml/Dash/Previews/PreviewActionCombo.qml:34
119119msgid "More..."
120−msgstr ""
120+msgstr "Több…"
121121
122122#: qml/Dash/Previews/PreviewActionCombo.qml:34
123123msgid "Less..."
124−msgstr ""
124+msgstr "Kevesebb…"
125125
126126#: qml/Dash/Previews/PreviewRatingInput.qml:82
127127msgid "Rate this"
@@ -165,7 +165,7 @@ msgstr "Jelszó megjelenítése"
165165
166166#: qml/Notifications/NotificationMenuItemFactory.qml:103
167167msgid "Please enter SIM PIN"
168−msgstr ""
168+msgstr "Adja meg a SIM PIN kódját"
169169
170170#: qml/Panel/Indicators/MenuItemFactory.qml:583
171171msgid "In queue…"
@@ -173,23 +173,23 @@ msgstr ""
173173
174174#: qml/Panel/Indicators/MenuItemFactory.qml:587
175175msgid "Downloading"
176−msgstr ""
176+msgstr "Letöltés"
177177
178178#: qml/Panel/Indicators/MenuItemFactory.qml:589
179179msgid "Paused, tap to resume"
180−msgstr ""
180+msgstr "Szüneteltetve, koppintson a folytatáshoz"
181181
182182#: qml/Panel/Indicators/MenuItemFactory.qml:591
183183msgid "Canceled"
184−msgstr ""
184+msgstr "Megszakítva"
185185
186186#: qml/Panel/Indicators/MenuItemFactory.qml:593
187187msgid "Finished"
188−msgstr ""
188+msgstr "Befejeződött"
189189
190190#: qml/Panel/Indicators/MenuItemFactory.qml:595
191191msgid "Failed, tap to retry"
192−msgstr ""
192+msgstr "Sikertelen, koppintson az újrapróbáláshoz"
193193
194194#: qml/Panel/SearchIndicator.qml:27
195195msgid "Search"
po/is.po+1−1
@@ -16,7 +16,7 @@ msgstr ""
1616"MIME-Version: 1.0\n"
1717"Content-Type: text/plain; charset=UTF-8\n"
1818"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"
2020"X-Generator: Launchpad (build 17114)\n"
2121"Language: is\n"
2222
tests/mocks/libusermetrics/UserMetrics.cpp+3
@@ -24,6 +24,9 @@
2424#include <QtGui/QIcon>
2525#include <QMultiMap>
2626
27+#include <functional>
28+#include <random>
29+
2730using namespace UserMetricsOutput;
2831
2932namespace UserMetricsOutput
tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp+3
@@ -24,6 +24,9 @@
2424#include <QDebug>
2525#include <unitymenumodel.h>
2626
27+#include <functional>
28+#include <chrono>
29+
2730class UnityMenuModelStackTest : public QObject
2831{
2932 Q_OBJECT