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

This reverts commit fda18b0113f136ca340ea074ebb14f293606ab3d.

Build of examples depend on a installed libmeegotouch

6 files changed, 3 insertions, 57 deletions

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