on xenial help sign in
Fix merges in build.sh and debian/control.
commitd59c11780a3f9ba401f965ccab7051db5a977aee authorMichał Sawicz <michal.sawicz@canonical.com> dateMon 30 Jun 2014, 15:31 (12 years ago) parent50b6fe0
2 files changed−9
build.sh−1 debian/control−8
build.sh−1
@@ -49,7 +49,6 @@ install_dependencies() {
4949 qtdeclarative5-ubuntu-settings-components \
5050 qtdeclarative5-ubuntu-thumbnailer0.1 \
5151 unity-notifications-impl \
52− qtdeclarative5-xmllistmodel-plugin \
5352 ubuntu-mobile-icons \
5453 unity-scope-home \
5554 unity-lens-applications \
debian/control−8
@@ -39,8 +39,6 @@ Build-Depends: cmake,
3939 qtdeclarative5-qtmultimedia-plugin,
4040 qtdeclarative5-ubuntu-settings-components (>= 0.2),
4141 qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48),
42− qtdeclarative5-xmllistmodel-plugin,
43− libqt5xmlpatterns5-dev,
4442 ttf-ubuntu-font-family,
4543Standards-Version: 3.9.4
4644Homepage: http://launchpad.net/unity
@@ -81,12 +79,6 @@ Depends: gsettings-desktop-schemas,
8179 qml-module-qtquick-xmllistmodel,
8280 qtdeclarative5-gsettings1.0,
8381 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,
9082 unity-launcher-impl-3,
9183 unity8-common (= ${source:Version}),
9284 unity8-private (= ${binary:Version}),