42 files changed, 182 insertions, 154 deletions

diff --git a/debian/changelog b/debian/changelog
index 531efea2..4cf2f846 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdui (0.20.0~3) unstable; urgency=low
+libmeegotouch (0.20.0~3) unstable; urgency=low
 
   * New version [UNRELEASED]
   * Fixes: NB#158420 - Bottom toolbar shown with hidden actions in portrait mode
diff --git a/debian/control b/debian/control
index 15288bea..f0088048 100644
--- a/debian/control
+++ b/debian/control
@@ -1,231 +1,282 @@
-Source: libdui
+Source: libmeegotouch
 Section: libs
 Priority: extra
 Maintainer: Tomas Junnonen <tomas.junnonen@nokia.com>
 Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.6.0), libicu-dev, libx11-dev, doxygen (>=1.5.9), libgconf2-dev, libcontextsubscriber-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgles2-sgx-img-dev [arm armel], opengles-sgx-img-common-dev [arm armel], libgl-dev [i386], libgl1 [i386], libqt4-opengl-dev, pkg-config (>= 0.22), libxdamage-dev, xsltproc
 Standards-Version: 3.7.2
 
-Package: libdui0
+Package: libmeegotouchcore0
 Architecture: any
-Depends: ${misc:Depends}, ${launcher:Depends}, ${shlibs:Depends}, libdui-l10n-engineering-english (= ${Source-Version}), dbus-x11, duitheme (>= 0.20.0~)
-Provides: libdui
-Conflicts: libdui
-Suggests: libdui-l10n-ar, libdui-l10n-de, libdui-l10n-en, libdui-l10n-fi, libdui-l10n-ur, libdui-l10n-zh-cn
-Description: DirectUI library
- libdui framework libraries
+Depends: ${misc:Depends}, ${launcher:Depends}, ${shlibs:Depends}, libmeegotouch-bin (= ${Source-Version}), libmeegotouch-l10n-engineering-english (= ${Source-Version}), dbus-x11, meegotouchtheme (>= 0.20.0~)
+Suggests: libmeegotouch-l10n-ar, libmeegotouch-l10n-de, libmeegotouch-l10n-en, libmeegotouch-l10n-fi, libmeegotouch-l10n-ur, libmeegotouch-l10n-zh-cn
+Description: DirectUI core library
+ libmeegotouch core framework libraries
 
-Package: libdui-dev
+Package: libmeegotouchextensions0
+Architecture: any
+Depends: ${misc:Depends}, ${launcher:Depends}, ${shlibs:Depends}
+Description: DirectUI extensions library
+ libmeegotouch extensions framework libraries
+
+Package: libmeegotouchsettings0
+Architecture: any
+Depends: ${misc:Depends}, ${launcher:Depends}, ${shlibs:Depends}
+Description: DirectUI settings library
+ libmeegotouch settings framework libraries
+
+Package: libmeegotouchviews0
+Architecture: any
+Depends: ${misc:Depends}, ${launcher:Depends}, ${shlibs:Depends}
+Description: DirectUI views library
+ libmeegotouch views framework libraries
+
+Package: libmeegotouch-bin
+Replaces: libmeegotouch0
+Architecture: any
+Depends: ${misc:Depends}, ${launcher:Depends}, ${shlibs:Depends}
+Description: DirectUI binary files
+ binary files of the libmeegotouch framework
+
+Package: libmeegotouch-dev
 Section: devel
 Architecture: any
-Depends: libdui0 (= ${Source-Version}), dui-dev-tools (=${Source-Version}), libqt4-dev (>= 4.6.0), libx11-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgconf2-dev, libcontextsubscriber-dev, libxdamage-dev
-Description: libdui development files
+Depends: libmeegotouchcore0 (= ${Source-Version}), meegotouch-dev-tools (=${Source-Version}), libqt4-dev (>= 4.6.0), libx11-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgconf2-dev, libcontextsubscriber-dev, libxdamage-dev
+Description: libmeegotouch development files
  Development files for DirectUI
 
-Package: dui-dev-tools
+Package: meegotouch-dev-tools
 Section: devel
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: perl (>= 5.10.0)
-Description: libdui specific development and testing tools
- Collection of tools for testing and developing on top of libdui. Includes 
+Description: libmeegotouch specific development and testing tools
+ Collection of tools for testing and developing on top of libmeegotouch. Includes 
  stuff like applettester and code/mock generation.
 
-Package: dui-demos
+Package: meegotouch-demos
 Section: devel
 Architecture: any
-Depends: dui-demos-widgetsgallery, dui-demos-plainqt
+Depends: meegotouch-demos-widgetsgallery, meegotouch-demos-plainqt
 Description: Demo applications for DirectUI
  Collection of demo applications for DirectUI
 
-Package: dui-demos-widgetsgallery
+Package: meegotouch-demos-widgetsgallery
 Section: devel
 Architecture: any
-Depends: libdui0 (= ${Source-Version}), dui-demos-widgetsgallery-l10n-engineering-english (= ${Source-Version})
-Suggests: dui-demos-widgetsgallery-l10n-ar, dui-demos-widgetsgallery-l10n-de, dui-demos-widgetsgallery-l10n-en, dui-demos-widgetsgallery-l10n-fi, dui-demos-widgetsgallery-l10n-ur, dui-demos-widgetsgallery-l10n-zh-cn
+Depends: ${shlibs:Depends}, meegotouch-demos-widgetsgallery-l10n-engineering-english (= ${Source-Version})
+Suggests: meegotouch-demos-widgetsgallery-l10n-ar, meegotouch-demos-widgetsgallery-l10n-de, meegotouch-demos-widgetsgallery-l10n-en, meegotouch-demos-widgetsgallery-l10n-fi, meegotouch-demos-widgetsgallery-l10n-ur, meegotouch-demos-widgetsgallery-l10n-zh-cn
 Description: Demo application for DirectUI
 
-Package: dui-demos-widgetsgallery-tests
+Package: meegotouch-demos-widgetsgallery-tests
 Section: devel
 Architecture: any
-Depends: libdui0 (= ${Source-Version}), duitestrunner, dui-demos-widgetsgallery (= ${Source-Version})
+Depends: ${shlibs:Depends}, meegotouchtestrunner, meegotouch-demos-widgetsgallery (= ${Source-Version})
 Description: Demo application for DirectUI
 
-Package: dui-demos-widgetsgallery-dbg
+Package: meegotouch-demos-widgetsgallery-dbg
 Section: devel
 Architecture: any
-Depends: dui-demos-widgetsgallery (= ${Source-Version})
+Depends: meegotouch-demos-widgetsgallery (= ${Source-Version})
 Description: Demo application for DirectUI.
  .
  This package contains the debug symbols.
 
-Package: dui-demos-widgetsgallery-l10n-engineering-english
+Package: meegotouch-demos-widgetsgallery-l10n-engineering-english
 Section: devel
 Architecture: any
-Enhances: dui-demos-widgetsgallery
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
+Enhances: meegotouch-demos-widgetsgallery
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
 Description: Engineering English translations for widgetsgallery
 
-Package: dui-demos-widgetsgallery-l10n-ar
+Package: meegotouch-demos-widgetsgallery-l10n-ar
 Section: devel
 Architecture: any
-Enhances: dui-demos-widgetsgallery
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
+Enhances: meegotouch-demos-widgetsgallery
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
 Description: Arabic translations for widgetsgallery
 
-Package: dui-demos-widgetsgallery-l10n-de
+Package: meegotouch-demos-widgetsgallery-l10n-de
 Section: devel
 Architecture: any
-Enhances: dui-demos-widgetsgallery
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
+Enhances: meegotouch-demos-widgetsgallery
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
 Description: German translations for widgetsgallery
 
-Package: dui-demos-widgetsgallery-l10n-en
+Package: meegotouch-demos-widgetsgallery-l10n-en
 Section: devel
 Architecture: any
-Enhances: dui-demos-widgetsgallery
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
+Enhances: meegotouch-demos-widgetsgallery
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
 Description: English translations for widgetsgallery
 
-Package: dui-demos-widgetsgallery-l10n-fi
+Package: meegotouch-demos-widgetsgallery-l10n-fi
 Section: devel
 Architecture: any
-Enhances: dui-demos-widgetsgallery
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
+Enhances: meegotouch-demos-widgetsgallery
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
 Description: Finnish translations for widgetsgallery
 
-Package: dui-demos-widgetsgallery-l10n-hu
+Package: meegotouch-demos-widgetsgallery-l10n-hu
 Section: devel
 Architecture: any
-Enhances: dui-demos-widgetsgallery
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
+Enhances: meegotouch-demos-widgetsgallery
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
 Description: Hungarian translations for widgetsgallery
 
-Package: dui-demos-widgetsgallery-l10n-ur
+Package: meegotouch-demos-widgetsgallery-l10n-ur
 Section: devel
 Architecture: any
-Enhances: dui-demos-widgetsgallery
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
+Enhances: meegotouch-demos-widgetsgallery
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
 Description: Urdu translations for widgetsgallery
 
-Package: dui-demos-widgetsgallery-l10n-zh-cn
+Package: meegotouch-demos-widgetsgallery-l10n-zh-cn
 Section: devel
 Architecture: any
-Enhances: dui-demos-widgetsgallery
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
+Enhances: meegotouch-demos-widgetsgallery
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
 Description: Simplified Chinese translations for widgetsgallery
 
-Package: dui-demos-plainqt
+Package: meegotouch-demos-plainqt
 Section: devel
 Architecture: any
-Depends: libdui0 (= ${Source-Version})
-Replaces: dui-demos-plainqt (<< 0.16.0-1)
+Depends: ${shlibs:Depends}
+Replaces: meegotouch-demos-plainqt (<< 0.16.0-1)
 Description: Demo applications showing the capabilities of the plain qt style.
 
-Package: dui-demos-plainqt-dbg
+Package: meegotouch-demos-plainqt-dbg
 Section: devel
 Architecture: any
-Depends: dui-demos-plainqt (= ${Source-Version})
-Replaces: dui-demos-plainqt-dbg (<< 0.16.0-1)
+Depends: meegotouch-demos-plainqt (= ${Source-Version})
+Replaces: meegotouch-demos-plainqt-dbg (<< 0.16.0-1)
 Description: debug symbols of the plain qt examples
 
-Package: dui-demos-appletinstallationsource
+Package: meegotouch-demos-appletinstallationsource
 Section: devel
 Architecture: any
-Depends: libdui0 (= ${Source-Version})
+Depends: ${shlibs:Depends}
 Description: Demo applet installation source for the applet library.
 
-Package: dui-demos-appletinstallationsource-dbg
+Package: meegotouch-demos-appletinstallationsource-dbg
 Section: devel
 Architecture: any
-Depends: dui-demos-appletinstallationsource (= ${Source-Version})
+Depends: meegotouch-demos-appletinstallationsource (= ${Source-Version})
 Description: Debug symbols of the demo applet installation source.
 
-Package: dui-demos-applicationextension
+Package: meegotouch-demos-applicationextension
 Section: devel
 Architecture: any
-Depends: libdui0 (= ${Source-Version})
+Depends: ${shlibs:Depends}
 Description: Demo application for application extensions
 
-Package: dui-demos-applicationextension-dbg
+Package: meegotouch-demos-applicationextension-dbg
 Section: devel
 Architecture: any
-Depends: dui-demos-applicationextension (= ${Source-Version})
+Depends: meegotouch-demos-applicationextension (= ${Source-Version})
 Description: Debug symbols of the demo application for application extensions
 
-Package: libdui-tests
+Package: libmeegotouch-tests
 Section: extra
 Architecture: any
-Depends: libdui0 (= ${Source-Version}), libqtgui4, testrunner, locales, ${shlibs:Depends}
-Description: libdui unit tests
- Unit testing binaries and shellscripts for testing libdui library
+Depends: ${shlibs:Depends}, testrunner, locales
+Description: libmeegotouch unit tests
+ Unit testing binaries and shellscripts for testing libmeegotouch library
 
-Package: libdui-benchmarks
+Package: libmeegotouch-benchmarks
 Section: extra
 Architecture: any
-Depends: libdui0 (= ${Source-Version}), ${shlibs:Depends}, dui-demos-widgetsgallery
-Description: libdui benchmarks
- Benchmarking binaries for testing libdui library
+Depends: ${shlibs:Depends}, meegotouch-demos-widgetsgallery
+Description: libmeegotouch benchmarks
+ Benchmarking binaries for testing libmeegotouch library
+
+Package: libmeegotouchcore0-dbg
+Architecture: any
+Section: devel
+Depends: libmeegotouchcore0 (= ${Source-Version})
+Description: libmeegotouch debug package
+ libmeegotouch debug symbols.
+
+Package: libmeegotouchviews0-dbg
+Architecture: any
+Section: devel
+Depends: libmeegotouchviews0 (= ${Source-Version})
+Description: libmeegotouch debug package
+ libmeegotouch debug symbols.
+
+Package: libmeegotouchextensions0-dbg
+Architecture: any
+Section: devel
+Depends: libmeegotouchextensions0 (= ${Source-Version})
+Description: libmeegotouch debug package
+ libmeegotouch debug symbols.
+
+Package: libmeegotouchsettings0-dbg
+Architecture: any
+Section: devel
+Depends: libmeegotouchsettings0 (= ${Source-Version})
+Description: libmeegotouch debug package
+ libmeegotouch debug symbols.
 
-Package: libdui0-dbg
+Package: libmeegotouch-bin-dbg
 Architecture: any
 Section: devel
-Depends: libdui0 (= ${Source-Version})
-Description: libdui debug package
- libdui debug symbols.
+Depends: libmeegotouch-bin (= ${Source-Version})
+Description: libmeegotouch debug package
+ libmeegotouch debug symbols.
 
-Package: libdui-doc
+Package: libmeegotouch-doc
 Section: doc
 Architecture: all
-Description: API documentation for libdui
+Description: API documentation for libmeegotouch
 
-Package: libdui-l10n-engineering-english
+Package: libmeegotouch-l10n-engineering-english
 Section: devel
 Architecture: any
-Enhances: libdui0
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
-Description: Engineering English translations for libdui
+Enhances: libmeegotouchcore0
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
+Description: Engineering English translations for libmeegotouch
 
-Package: libdui-l10n-ar
+Package: libmeegotouch-l10n-ar
 Section: devel
 Architecture: any
-Enhances: libdui0
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
-Description: Arabic translations for libdui
+Enhances: libmeegotouchcore0
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
+Description: Arabic translations for libmeegotouch
 
-Package: libdui-l10n-de
+Package: libmeegotouch-l10n-de
 Section: devel
 Architecture: any
-Enhances: libdui0
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
-Description: German translations for libdui
+Enhances: libmeegotouchcore0
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
+Description: German translations for libmeegotouch
 
-Package: libdui-l10n-en
+Package: libmeegotouch-l10n-en
 Section: devel
 Architecture: any
-Enhances: libdui0
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
-Description: English translations for libdui
+Enhances: libmeegotouchcore0
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
+Description: English translations for libmeegotouch
 
-Package: libdui-l10n-fi
+Package: libmeegotouch-l10n-fi
 Section: devel
 Architecture: any
-Enhances: libdui0
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
-Description: Finnish translations for libdui
+Enhances: libmeegotouchcore0
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
+Description: Finnish translations for libmeegotouch
 
-Package: libdui-l10n-ur
+Package: libmeegotouch-l10n-ur
 Section: devel
 Architecture: any
-Enhances: libdui0
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
-Description: Urdu translations for libdui
+Enhances: libmeegotouchcore0
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
+Description: Urdu translations for libmeegotouch
 
-Package: libdui-l10n-zh-cn
+Package: libmeegotouch-l10n-zh-cn
 Section: devel
 Architecture: any
-Enhances: libdui0
-Replaces: dui-demos-widgetsgallery (<< 0.17.0-0)
-Description: Simplified Chinese translations for libdui
+Enhances: libmeegotouchcore0
+Replaces: meegotouch-demos-widgetsgallery (<< 0.17.0-0)
+Description: Simplified Chinese translations for libmeegotouch
 
 
 
diff --git a/debian/dui-demos-widgetsgallery.dirs b/debian/dui-demos-widgetsgallery.dirs
deleted file mode 100644
index 0346ff3a..00000000
--- a/debian/dui-demos-widgetsgallery.dirs
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/bin
-usr/lib
-usr/share/widgetsgallery/themes
-usr/share/widgetsgallery/themes/style
-usr/share/widgetsgallery/themes/images
-usr/share/widgetsgallery/themes/images/contacts
-usr/share/widgetsgallery/themes/svg
-usr/share/themes/base/dui/widgetsgallery/feedbacks
-usr/share/applications
diff --git a/debian/libdui-dev.dirs b/debian/libdui-dev.dirs
deleted file mode 100644
index ba745b4b..00000000
--- a/debian/libdui-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/dui
-usr/lib/pkgconfig
diff --git a/debian/libdui-tests.dirs b/debian/libdui-tests.dirs
deleted file mode 100644
index 714f060e..00000000
--- a/debian/libdui-tests.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libdui-tests
-usr/share/libdui-tests
diff --git a/debian/libdui0.dirs b/debian/libdui0.dirs
deleted file mode 100644
index a9e6bb34..00000000
--- a/debian/libdui0.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/
-usr/lib/dui/applets
diff --git a/debian/libdui-benchmarks.install b/debian/libmeegotouch-benchmarks.install
index 42a23e1c..42a23e1c 100644
--- a/debian/libdui-benchmarks.install
+++ b/debian/libmeegotouch-benchmarks.install
diff --git a/debian/libdui0.install b/debian/libmeegotouch-bin.install
index 067bfffb..37c22413 100644
--- a/debian/libdui0.install
+++ b/debian/libmeegotouch-bin.install
@@ -1,9 +1,6 @@
-usr/lib/libmeegotouch*.so*
-usr/lib/qt4/plugins/styles/libmeegotouch*.so*
 usr/bin/mthemedaemon
 usr/bin/mservicemapper
 usr/share/dbus-1/services/com.nokia.servicefw.service
 usr/share/meegotouch/shaders/*
 usr/lib/meegotouch/applets/mappletrunner
 etc/meegotouch/devices.conf
-
diff --git a/debian/libdui-dev.install b/debian/libmeegotouch-dev.install
index 93213e42..1d2c258a 100644
--- a/debian/libdui-dev.install
+++ b/debian/libmeegotouch-dev.install
@@ -1,3 +1,4 @@
+usr/lib/libmeegotouch*.so
 usr/include/*
 usr/lib/pkgconfig/*
 usr/share/qt4/mkspecs/features/meegotouch.prf
diff --git a/debian/libdui-doc.install b/debian/libmeegotouch-doc.install
index 519e823c..519e823c 100644
--- a/debian/libdui-doc.install
+++ b/debian/libmeegotouch-doc.install
diff --git a/debian/libdui-l10n-ar.install b/debian/libmeegotouch-l10n-ar.install
index b27da2e9..b27da2e9 100644
--- a/debian/libdui-l10n-ar.install
+++ b/debian/libmeegotouch-l10n-ar.install
diff --git a/debian/libdui-l10n-de.install b/debian/libmeegotouch-l10n-de.install
index 00727d56..00727d56 100644
--- a/debian/libdui-l10n-de.install
+++ b/debian/libmeegotouch-l10n-de.install
diff --git a/debian/libdui-l10n-en.install b/debian/libmeegotouch-l10n-en.install
index 35735641..35735641 100644
--- a/debian/libdui-l10n-en.install
+++ b/debian/libmeegotouch-l10n-en.install
diff --git a/debian/libdui-l10n-engineering-english.install b/debian/libmeegotouch-l10n-engineering-english.install
index 20d754c8..20d754c8 100644
--- a/debian/libdui-l10n-engineering-english.install
+++ b/debian/libmeegotouch-l10n-engineering-english.install
diff --git a/debian/libdui-l10n-fi.install b/debian/libmeegotouch-l10n-fi.install
index f79c9d3a..f79c9d3a 100644
--- a/debian/libdui-l10n-fi.install
+++ b/debian/libmeegotouch-l10n-fi.install
diff --git a/debian/libdui-l10n-ur.install b/debian/libmeegotouch-l10n-ur.install
index 5fefc14e..5fefc14e 100644
--- a/debian/libdui-l10n-ur.install
+++ b/debian/libmeegotouch-l10n-ur.install
diff --git a/debian/libdui-l10n-zh-cn.install b/debian/libmeegotouch-l10n-zh-cn.install
index 821bfc60..821bfc60 100644
--- a/debian/libdui-l10n-zh-cn.install
+++ b/debian/libmeegotouch-l10n-zh-cn.install
diff --git a/debian/libdui-tests.install b/debian/libmeegotouch-tests.install
index c3d0fe48..c3d0fe48 100644
--- a/debian/libdui-tests.install
+++ b/debian/libmeegotouch-tests.install
diff --git a/debian/libdui-tests.postinst b/debian/libmeegotouch-tests.postinst
index 0c6e28d3..98083fc2 100644
--- a/debian/libdui-tests.postinst
+++ b/debian/libmeegotouch-tests.postinst
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # add en_US.UTF-8 locale if not already there:
-# (this locale is needed for the test ft_duigconfitem)
+# (this locale is needed for the test ft_meegotouchgconfitem)
 
 if ! egrep -q -E "^[[:space:]]*en_US.UTF-8[[:space:]]+UTF-8" /etc/locale.gen ; then
    echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
diff --git a/debian/libmeegotouchcore0.install b/debian/libmeegotouchcore0.install
new file mode 100644
index 00000000..c2e04b02
--- /dev/null
+++ b/debian/libmeegotouchcore0.install
@@ -0,0 +1 @@
+usr/lib/libmeegotouchcore.so.0*
\ No newline at end of file
diff --git a/debian/libmeegotouchcore0.postinst b/debian/libmeegotouchcore0.postinst
new file mode 100755
index 00000000..dffa9b1a
--- /dev/null
+++ b/debian/libmeegotouchcore0.postinst
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# create cache directory
+mkdir -p -m a+w /var/cache/meegotouch
+mkdir -p -m a+w /var/cache/meegotouch/css
+
diff --git a/debian/libmeegotouchcore0.postrm b/debian/libmeegotouchcore0.postrm
new file mode 100755
index 00000000..180f2b2f
--- /dev/null
+++ b/debian/libmeegotouchcore0.postrm
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# remove cached data
+if [ -d /var/cache/meegotouch ]; then
+  rm -rf /var/cache/meegotouch
+fi
diff --git a/debian/libmeegotouchextensions0.install b/debian/libmeegotouchextensions0.install
new file mode 100644
index 00000000..d87d5077
--- /dev/null
+++ b/debian/libmeegotouchextensions0.install
@@ -0,0 +1 @@
+usr/lib/libmeegotouchextensions.so.0*
\ No newline at end of file
diff --git a/debian/libmeegotouchsettings0.install b/debian/libmeegotouchsettings0.install
new file mode 100644
index 00000000..2d04ddfe
--- /dev/null
+++ b/debian/libmeegotouchsettings0.install
@@ -0,0 +1 @@
+usr/lib/libmeegotouchsettings.so.0*
\ No newline at end of file
diff --git a/debian/libmeegotouchviews0.install b/debian/libmeegotouchviews0.install
new file mode 100644
index 00000000..a9aa5fd3
--- /dev/null
+++ b/debian/libmeegotouchviews0.install
@@ -0,0 +1 @@
+usr/lib/libmeegotouchviews.so.0*
\ No newline at end of file
diff --git a/debian/dui-demos-appletinstallationsource.install b/debian/meegotouch-demos-appletinstallationsource.install
index b0d0b327..b0d0b327 100644
--- a/debian/dui-demos-appletinstallationsource.install
+++ b/debian/meegotouch-demos-appletinstallationsource.install
diff --git a/debian/dui-demos-applicationextension.install b/debian/meegotouch-demos-applicationextension.install
index 68b3f818..68b3f818 100644
--- a/debian/dui-demos-applicationextension.install
+++ b/debian/meegotouch-demos-applicationextension.install
diff --git a/debian/dui-demos-plainqt.install b/debian/meegotouch-demos-plainqt.install
index 67e179f1..67e179f1 100644
--- a/debian/dui-demos-plainqt.install
+++ b/debian/meegotouch-demos-plainqt.install
diff --git a/debian/dui-demos-widgetsgallery-l10n-ar.install b/debian/meegotouch-demos-widgetsgallery-l10n-ar.install
index 02f5488a..02f5488a 100644
--- a/debian/dui-demos-widgetsgallery-l10n-ar.install
+++ b/debian/meegotouch-demos-widgetsgallery-l10n-ar.install
diff --git a/debian/dui-demos-widgetsgallery-l10n-de.install b/debian/meegotouch-demos-widgetsgallery-l10n-de.install
index 49825ca7..49825ca7 100644
--- a/debian/dui-demos-widgetsgallery-l10n-de.install
+++ b/debian/meegotouch-demos-widgetsgallery-l10n-de.install
diff --git a/debian/dui-demos-widgetsgallery-l10n-en.install b/debian/meegotouch-demos-widgetsgallery-l10n-en.install
index a08040a2..a08040a2 100644
--- a/debian/dui-demos-widgetsgallery-l10n-en.install
+++ b/debian/meegotouch-demos-widgetsgallery-l10n-en.install
diff --git a/debian/dui-demos-widgetsgallery-l10n-engineering-english.install b/debian/meegotouch-demos-widgetsgallery-l10n-engineering-english.install
index 733c16f4..733c16f4 100644
--- a/debian/dui-demos-widgetsgallery-l10n-engineering-english.install
+++ b/debian/meegotouch-demos-widgetsgallery-l10n-engineering-english.install
diff --git a/debian/dui-demos-widgetsgallery-l10n-fi.install b/debian/meegotouch-demos-widgetsgallery-l10n-fi.install
index efd2a009..efd2a009 100644
--- a/debian/dui-demos-widgetsgallery-l10n-fi.install
+++ b/debian/meegotouch-demos-widgetsgallery-l10n-fi.install
diff --git a/debian/dui-demos-widgetsgallery-l10n-hu.install b/debian/meegotouch-demos-widgetsgallery-l10n-hu.install
index 1cc77adf..1cc77adf 100644
--- a/debian/dui-demos-widgetsgallery-l10n-hu.install
+++ b/debian/meegotouch-demos-widgetsgallery-l10n-hu.install
diff --git a/debian/dui-demos-widgetsgallery-l10n-ur.install b/debian/meegotouch-demos-widgetsgallery-l10n-ur.install
index 09c1dcd2..09c1dcd2 100644
--- a/debian/dui-demos-widgetsgallery-l10n-ur.install
+++ b/debian/meegotouch-demos-widgetsgallery-l10n-ur.install
diff --git a/debian/dui-demos-widgetsgallery-l10n-zh-cn.install b/debian/meegotouch-demos-widgetsgallery-l10n-zh-cn.install
index 8f410164..8f410164 100644
--- a/debian/dui-demos-widgetsgallery-l10n-zh-cn.install
+++ b/debian/meegotouch-demos-widgetsgallery-l10n-zh-cn.install
diff --git a/debian/dui-demos-widgetsgallery-tests.install b/debian/meegotouch-demos-widgetsgallery-tests.install
index 19bd5ac8..19bd5ac8 100644
--- a/debian/dui-demos-widgetsgallery-tests.install
+++ b/debian/meegotouch-demos-widgetsgallery-tests.install
diff --git a/debian/dui-demos-widgetsgallery.install b/debian/meegotouch-demos-widgetsgallery.install
index 6e89e6ae..6e89e6ae 100644
--- a/debian/dui-demos-widgetsgallery.install
+++ b/debian/meegotouch-demos-widgetsgallery.install
diff --git a/debian/dui-dev-tools.install b/debian/meegotouch-dev-tools.install
index 537f17be..537f17be 100644
--- a/debian/dui-dev-tools.install
+++ b/debian/meegotouch-dev-tools.install
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100755
index 040469c2..00000000
--- a/debian/postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# create cache directory
-mkdir -p -m a+w /var/cache/dui
-mkdir -p -m a+w /var/cache/dui/css
-
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100755
index dfd5e125..00000000
--- a/debian/postrm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# remove cached data
-if [ -d /var/cache/dui ]; then
-  rm -rf /var/cache/dui
-fi
diff --git a/debian/rules b/debian/rules
index 6ec5a198..292e2827 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,7 +114,6 @@ ifneq (0,$(MAKEDOCS))
 	cd $(BUILD_DIR) && make $(PARALLEL_MAKEFLAGS) doc
 endif
 
-	#libmeegotouch0 package
 	cd $(BUILD_DIR) && INSTALL_ROOT=$(CURDIR)/debian/tmp make $(PARALLEL_MAKEFLAGS) install
 
 	install -m 644 -D -p $(BUILD_DIR)/demos/widgetsgallery/translations/widgetsgallery.ts $(CURDIR)/debian/tmp/usr/share/doc/meegotouch-demos-widgetsgallery-l10n-engineering-english/widgetsgallery.ts
@@ -131,28 +130,19 @@ binary-arch: build install
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
-	dh_install --sourcedir=debian/tmp -v 
-#	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-#	dh_installman
+	dh_install --sourcedir=debian/tmp -v
+	# print warnings for not installed files
+	dh_install --sourcedir=debian/tmp/ --list-missing
 	dh_link
-	dh_strip -p libmeegotouch0 --dbg-package=libmeegotouch0
-	dh_strip -p meegotouch-demos-widgetsgallery --dbg-package=meegotouch-demos-widgetsgallery
-	dh_strip -p meegotouch-demos-plainqt --dbg-package=meegotouch-demos-plainqt
+	dh_strip -p libmeegotouchcore0 --dbg-package=libmeegotouchcore0
+	dh_strip -p libmeegotouchviews0 --dbg-package=libmeegotouchviews0
+	dh_strip -p libmeegotouchsettings0 --dbg-package=libmeegotouchsettings0
+	dh_strip -p libmeegotouchextensions0 --dbg-package=libmeegotouchextensions0
+	dh_strip -p meegotouch-demos-widgetsgallery --dbg-package=meegotouch-demos-widgetsgallery-dbg
+	dh_strip -p meegotouch-demos-plainqt --dbg-package=meegotouch-demos-plainqt-dbg
 	dh_strip -p libmeegotouch-tests
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps