I have made the following changes intended for : CE:UX:MTF / meegotouchcp-connman
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/5151 Thank You, Marko Saukko [This message was auto-generated] --- Request # 5151: Messages from BOSS: State: review at 2012-06-28T06:35:45 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: Project:MTF:UX / meegotouchcp-connman -> CE:UX:MTF / meegotouchcp-connman changes files: -------------- --- meegotouchcp-connman.changes +++ meegotouchcp-connman.changes @@ -0,0 +1,3 @@ +* Thu Jun 28 2012 Marko Saukko <[email protected]> - 0.2.0 +- Added 0001-Fix-connman-qt-import.patch to fix import issue. + new: ---- 0001-Fix-connman-qt-import.patch spec files: ----------- --- meegotouchcp-connman.spec +++ meegotouchcp-connman.spec @@ -16,6 +16,7 @@ URL: http://www.meego.com Source0: %{name}-%{version}.tar.bz2 Source100: meegotouchcp-connman.yaml +Patch0: 0001-Fix-connman-qt-import.patch Requires: connman-qt-declarative BuildRequires: qt-qmake @@ -27,6 +28,8 @@ %prep %setup -q -n %{name}-%{version} +# 0001-Fix-connman-qt-import.patch +%patch0 -p1 # >> setup # << setup other changes: -------------- ++++++ 0001-Fix-connman-qt-import.patch (new) --- 0001-Fix-connman-qt-import.patch +++ 0001-Fix-connman-qt-import.patch @@ -0,0 +1,25 @@ +From 19d81beabbb67358d230cca9b7191e57a766f4b8 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Thu, 28 Jun 2012 05:50:30 +0000 +Subject: [PATCH] Fix connman-qt import. + +Signed-off-by: Marko Saukko <[email protected]> +--- + qml/mainpage.qml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qml/mainpage.qml b/qml/mainpage.qml +index fd9daa3..5789f8c 100644 +--- a/qml/mainpage.qml ++++ b/qml/mainpage.qml +@@ -1,6 +1,6 @@ + import QtQuick 1.1 + import com.nokia.meego 1.0 +-import Connman.Qt 0.2 ++import MeeGo.Connman 0.2 + import "/usr/lib/qt4/imports/Connman/js/mustache.js" as M + + PageStack { +-- +1.7.10.3 + ++++++ meegotouchcp-connman.yaml --- meegotouchcp-connman.yaml +++ meegotouchcp-connman.yaml @@ -7,6 +7,8 @@ URL: http://www.meego.com Sources: - "%{name}-%{version}.tar.bz2" +Patches: + - 0001-Fix-connman-qt-import.patch Description: | This is a plugin for meegotouch-controlpanel that does wifi
