diff options
| author | Adam Endrodi <ext-adam.endrodi@nokia.com> | 2010-12-15 16:34:30 +0200 |
|---|---|---|
| committer | Adam Endrodi <ext-adam.endrodi@nokia.com> | 2010-12-15 16:34:30 +0200 |
| commit | c4ee63bbba2e6e99b9b52185f40cb5f63f7c52b4 (patch) | |
| tree | 80482d0cb7600c14402b6c435b2c0868d82bae0f | |
| parent | 93a67b37ec46b04e5b981159263a2185ed6d914f (diff) | |
| parent | 87ee6230ae631c0954dcfdf856e42c0e692cd691 (diff) | |
Merge branch 'master' into for_0.8.1
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | tests/functional/functional.pro | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/control b/debian/control index 2bed8c0..e06b2df 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: extra Maintainer: Abdiel Janulgue <abdiel.janulgue@nokia.com> Build-Depends: debhelper (>= 5), libqt4-dev, libmeegotouch-dev, libgles2-sgx-img-dev [arm armel], opengles-sgx-img-common-dev [arm armel], libgl-dev [i386], libgl1 [i386], libqt4-opengl-dev, libxrender-dev, libxcomposite-dev, libxdamage-dev, libxtst-dev, libxi-dev, mce-dev [arm armel], libcontextsubscriber-dev, pkg-config, aegis-builder (>= 1.4), libxml2-utils, test-definition, libx11-xcb-dev, libxcb-render0-dev, libxext-dev, libxcb-shape0-dev, libxrandr-dev -Standards-Version: 3.7.2 +Standards-Version: 3.9.1 Package: mcompositor Replaces: duicompositor @@ -15,7 +15,7 @@ Description: MeeGo Touch UI Compositing Window Manager Package: mcompositor-dbg Architecture: any -Depends: mcompositor (=${Source-Version}) +Depends: mcompositor (=${binary:Version}) Description: MeeGo Touch UI Compositing Window Manager debug symbols MeeGo Touch UI Compositor debug symbols diff --git a/tests/functional/functional.pro b/tests/functional/functional.pro index 9bbb9e4..885e69d 100644 --- a/tests/functional/functional.pro +++ b/tests/functional/functional.pro @@ -13,7 +13,7 @@ INSTALLS += initScript # Install all test scripts. scripts.files += test*.py -scripts.path = /usr/share/meegotouch/testscripts/$$SUITENAME +scripts.path = /usr/share/$$SUITENAME INSTALLS += scripts # Simple and easy way to build tests.xml. |