Revert "Changes: package the examples into an own debian package"

This reverts commit fda18b0113f136ca340ea074ebb14f293606ab3d.

Build of examples depend on a installed libmeegotouch

11 files changed, 31 insertions, 84 deletions

diff --git a/configure b/configure
index 605961cb..7fa3cb9f 100755
--- a/configure
+++ b/configure
@@ -61,7 +61,6 @@ CFG_MINIMAL=no
 CFG_BUILD_TESTS=no
 CFG_BUILD_BENCHMARKS=no
 CFG_BUILD_PLAINQT=yes
-CFG_BUILD_EXAMPLES=no
 
 M_DEFAULT_BUILD_PARTS="libs demos"
 CFG_BUILD_PARTS=""
@@ -218,7 +217,6 @@ while [ "$#" -gt 0 ]; do
     dev)
         CFG_DEV="yes"
         CFG_BUILD_TESTS="yes"
-        CFG_BUILD_EXAMPLES="yes"
         CFG_BUILD_BENCHMARKS="yes"
         CFG_BUILD_PLAINQT="yes"
         ;;
@@ -228,9 +226,6 @@ while [ "$#" -gt 0 ]; do
     tests)
         CFG_BUILD_TESTS="yes"
         ;;
-    examples)
-        CFG_BUILD_EXAMPLES="yes"
-        ;;
     benchmarks)
         CFG_BUILD_BENCHMARKS="yes"
         ;;
@@ -342,14 +337,6 @@ else
   fi
 fi
 
-if [ "$CFG_BUILD_EXAMPLES" = "yes" ]; then
-    CFG_BUILD_PARTS="$CFG_BUILD_PARTS examples"
-else
-  if echo $CFG_BUILD_PARTS | grep examples >/dev/null 2>&1; then
-    CFG_BUILD_EXAMPLES="yes"
-  fi
-fi
-
 # is this a shadow build?
 if [ "$OPT_SHADOW" = "maybe" ]; then
     OPT_SHADOW=no
@@ -475,7 +462,6 @@ Additional options:
 
     -tests ............. Build the tests.
     -benchmarks ........ Build the benchmarks.
-    -examples .......... Build the examples.
 
     -n900 .............. Build libmeegotouch for the N900 device.
 
@@ -795,7 +781,6 @@ echo
 echo "Benchmarks .......... $CFG_BUILD_BENCHMARKS"
 echo "Plain Qt support .... $CFG_BUILD_PLAINQT"
 echo "Tests ............... $CFG_BUILD_TESTS"
-echo "Examples ............ $CFG_BUILD_EXAMPLES"
 
 if [ "$HAVE_N900" = "yes" ]; then
     echo ""
diff --git a/debian/control b/debian/control
index 50f7c012..e295d11f 100644
--- a/debian/control
+++ b/debian/control
@@ -356,15 +356,3 @@ Section: devel
 Architecture: any
 Enhances: meegotouch-demos-widgetsgallery
 Description: Simplified Chinese translations for widgetsgallery
-
-Package: meegotouch-examples
-Section: devel
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Example applications
-
-Package: meegotouch-examples-dbg
-Section: devel
-Architecture: any
-Depends: meegotouch-examples (= ${Source-Version})
-Description: Debug symbols of the example applications
diff --git a/debian/libmeegotouch-dev.install b/debian/libmeegotouch-dev.install
index b97e16a7..48dd7028 100644
--- a/debian/libmeegotouch-dev.install
+++ b/debian/libmeegotouch-dev.install
@@ -1,4 +1,4 @@
 usr/lib/libmeegotouch*.so
-usr/include/meegotouch/*
+usr/include/*
 usr/lib/pkgconfig/*
 usr/share/qt4/mkspecs/features/meegotouch*
diff --git a/debian/meegotouch-demos-widgetsgallery.install b/debian/meegotouch-demos-widgetsgallery.install
index 414c052a..1f5e8e0c 100644
--- a/debian/meegotouch-demos-widgetsgallery.install
+++ b/debian/meegotouch-demos-widgetsgallery.install
@@ -1,6 +1,5 @@
 usr/bin/widgetsgallery
-usr/share/themes/base/meegotouch/icons/*
-usr/share/themes/base/meegotouch/widgetsgallery/*
+usr/share/themes/*
 usr/share/applications/*widgetsgallery.desktop
 usr/share/applications/hildon/*widgetsgallery.desktop
 usr/share/dbus-1/services/com.nokia.widgetsgallery.service
diff --git a/debian/meegotouch-dev-tools.install b/debian/meegotouch-dev-tools.install
index 664e0fdf..2807e627 100644
--- a/debian/meegotouch-dev-tools.install
+++ b/debian/meegotouch-dev-tools.install
@@ -8,4 +8,3 @@ usr/bin/mnotificationtool
 usr/bin/mnotificationstresstest
 usr/bin/dui-rename-files
 usr/bin/dui-rename-symbols
-usr/share/themes/base/meegotouch/mapplettester/style/mapplettester.css
diff --git a/debian/meegotouch-examples.install b/debian/meegotouch-examples.install
deleted file mode 100644
index bd15e8ec..00000000
--- a/debian/meegotouch-examples.install
+++ /dev/null
@@ -1,40 +0,0 @@
-usr/bin/animatedlayout
-usr/bin/chainingexampleapp1
-usr/bin/chainingexampleapp2
-usr/bin/com.nokia.textprocessor
-usr/bin/lifecycle
-usr/bin/org.maemo.textprocessor
-usr/bin/user
-usr/lib/libchainingexampleinterface.so.1
-usr/lib/libchainingexampleinterface.so.1.0
-usr/lib/libchainingexampleinterface.so.1.0.0
-usr/lib/libtextprocessor.so.1
-usr/lib/libtextprocessor.so.1.0
-usr/lib/libtextprocessor.so.1.0.0
-usr/share/animatedlayout/themes/animatedlayout.conf
-usr/share/animatedlayout/themes/images/background.png
-usr/share/animatedlayout/themes/images/dui-logo-blue.png
-usr/share/animatedlayout/themes/images/dui-logo-red.png
-usr/share/animatedlayout/themes/images/dui-logo.png
-usr/share/animatedlayout/themes/images/flow.png
-usr/share/animatedlayout/themes/images/horizontal.png
-usr/share/animatedlayout/themes/images/tile.png
-usr/share/animatedlayout/themes/images/vertical.png
-usr/share/animatedlayout/themes/style/animatedlayout.css
-usr/share/applications/chainingexampleapp1.desktop
-usr/share/applications/chainingexampleapp2.desktop
-usr/share/applications/lifecycle.desktop
-usr/share/dbus-1/interfaces/com.nokia.ChainingExampleInterface.xml
-usr/share/dbus-1/interfaces/com.nokia.TextProcessorInterface.xml
-usr/share/dbus-1/services/com.nokia.chainingexampleapp1.service
-usr/share/dbus-1/services/com.nokia.chainingexampleapp2.service
-usr/share/dbus-1/services/com.nokia.lifecycle.service
-usr/share/dbus-1/services/com.nokia.textprocessor.service
-usr/share/dbus-1/services/org.maemo.textprocessor.service
-usr/share/l10n/meegotouch/animatedlayout.qm
-usr/share/l10n/meegotouch/animatedlayout_de.qm
-usr/share/l10n/meegotouch/animatedlayout_en.qm
-usr/share/l10n/meegotouch/animatedlayout_ja.qm
-usr/share/meegotouch/imtoolbars/toolbar1.xml
-usr/share/meegotouch/imtoolbars/toolbar2.xml
-usr/share/themes/base/meegotouch/SeparatorTest/style/SeparatorTest.css
diff --git a/debian/rules b/debian/rules
index ae77c0cb..62ed5cc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,7 @@ endif
 
 # Perform a minimal build by setting DEB_BUILD_OPTION=minimal,...
 ifeq (,$(findstring minimal,$(DEB_BUILD_OPTIONS)))
-     OPTIONS += -make "tests benchmarks examples"
+     OPTIONS += -make "tests benchmarks"
 else
      OPTIONS += -minimal
      MAKEDOCS = 0
diff --git a/examples/imtoolbar/imtoolbar.pro b/examples/imtoolbar/imtoolbar.pro
index a2e72c71..721baa00 100644
--- a/examples/imtoolbar/imtoolbar.pro
+++ b/examples/imtoolbar/imtoolbar.pro
@@ -1,3 +1,6 @@
+MROOT = ../..
+include($$MROOT/mkspecs/common.pri)
+
 TEMPLATE = app
 TARGET = imtoolbar
 CONFIG += meegotouch 
@@ -9,8 +12,8 @@ INCLUDEPATH += .
 HEADERS += imtoolbarpage.h
 SOURCES += imtoolbarpage.cpp main.cpp
 
-install.files = toolbar1.xml \
-                toolbar2.xml
-install.path = /usr/share/meegotouch/imtoolbars/
+install.files =  ./toolbar1.xml \
+                ./toolbar2.xml
+install.path = /usr/share/m/imtoolbars/
 INSTALLS += install
 
diff --git a/examples/multipleinstances/multipleinstances.pro b/examples/multipleinstances/multipleinstances.pro
index f6e92ac5..a56e7e36 100644
--- a/examples/multipleinstances/multipleinstances.pro
+++ b/examples/multipleinstances/multipleinstances.pro
@@ -10,3 +10,4 @@ SOURCES += main.cpp
 # libm first:
 INCLUDEPATH += ../../src/include
 QMAKE_LIBDIR += ../../lib/
+LIBS += -lmeegotouchcore
diff --git a/examples/separatorTest/separatorTest.pro b/examples/separatorTest/separatorTest.pro
index 55b95d57..97c317e1 100644
--- a/examples/separatorTest/separatorTest.pro
+++ b/examples/separatorTest/separatorTest.pro
@@ -1,18 +1,32 @@
-include(../../mkspecs/common.pri)
-
 TEMPLATE = app
 TARGET = SeparatorTest
-CONFIG += meegotouch
-
-LIBS += -lmeegotouchcore
+CONFIG += meegotouch 
 
 # Input
 SOURCES += main.cpp SeparatorTestPage.cpp
 
-INCLUDEPATH += . ../../src ../../src/include
+MROOT = ../..
+
+include($$MROOT/mkspecs/common.pri)
+
+MLIB = $$MROOT/lib
+MSRC = $$MROOT/src
+MSRCINCLUDE = $$MSRC/include
+MSFWINCLUDE = $$MROOT/servicefw/include
+
+INCLUDEPATH += . \
+    $$MSRCINCLUDE \
+    $$MSRC \
+
+QMAKE_LIBDIR += \
+    $$MLIB \
+
+INCLUDEPATH += ../../src/include
+QMAKE_LIBDIR += ../../lib/
 
+style_sheet.path = $$M_THEME_DIR/SeparatorTest
 style_sheet.files = style/SeparatorTest.css
-style_sheet.path = $$M_THEME_DIR/base/meegotouch/SeparatorTest/style
+view_configuration.path = $$M_THEME_DIR/SeparatorTest
 
 INSTALLS += \
     style_sheet \
diff --git a/projects.pro b/projects.pro
index 5f8a2643..34bc76e7 100644
--- a/projects.pro
+++ b/projects.pro
@@ -60,8 +60,6 @@ for(PROJECT, $$list($$lower($$unique(M_BUILD_PARTS)))) {
        win32:SUBDIRS -= benchmarks
     }  else:isEqual(PROJECT, demos) {
        SUBDIRS += demos
-    }  else:isEqual(PROJECT, examples) {
-       SUBDIRS += examples
     } else {
        message(Unknown PROJECT: $$PROJECT)
     }