on xenial help sign in
Fix merges in build.sh and debian/control.
d59c117Michał Sawicz
build.sh−1
@@ -49,7 +49,6 @@ install_dependencies() {
49 qtdeclarative5-ubuntu-settings-components \
49 qtdeclarative5-ubuntu-settings-components \
50 qtdeclarative5-ubuntu-thumbnailer0.1 \
50 qtdeclarative5-ubuntu-thumbnailer0.1 \
51 unity-notifications-impl \
51 unity-notifications-impl \
52− qtdeclarative5-xmllistmodel-plugin \
53 ubuntu-mobile-icons \
52 ubuntu-mobile-icons \
54 unity-scope-home \
53 unity-scope-home \
55 unity-lens-applications \
54 unity-lens-applications \
debian/control−8
@@ -39,8 +39,6 @@ Build-Depends: cmake,
39 qtdeclarative5-qtmultimedia-plugin,
39 qtdeclarative5-qtmultimedia-plugin,
40 qtdeclarative5-ubuntu-settings-components (>= 0.2),
40 qtdeclarative5-ubuntu-settings-components (>= 0.2),
41 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48),
41 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48),
42− qtdeclarative5-xmllistmodel-plugin,
43− libqt5xmlpatterns5-dev,
44 ttf-ubuntu-font-family,
42 ttf-ubuntu-font-family,
45Standards-Version: 3.9.4
43Standards-Version: 3.9.4
46Homepage: http://launchpad.net/unity
44Homepage: http://launchpad.net/unity
@@ -81,12 +79,6 @@ Depends: gsettings-desktop-schemas,
81 qml-module-qtquick-xmllistmodel,
79 qml-module-qtquick-xmllistmodel,
82 qtdeclarative5-gsettings1.0,
80 qtdeclarative5-gsettings1.0,
83 qtdeclarative5-ubuntu-settings-components (>= 0.2),
81 qtdeclarative5-ubuntu-settings-components (>= 0.2),
84− qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,
85− ubuntu-thumbnailer-impl-0,
86− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48),
87− qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,
88− qtdeclarative5-xmllistmodel-plugin,
89− unity-application-impl-2,
90 unity-launcher-impl-3,
82 unity-launcher-impl-3,
91 unity8-common (= ${source:Version}),
83 unity8-common (= ${source:Version}),
92 unity8-private (= ${binary:Version}),
84 unity8-private (= ${binary:Version}),