Merged mainline.

6 files changed, 45 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 8c2daf7..acdf0fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+qmenumodel (0.1.4) UNRELEASED; urgency=low
+
+  * Expose a C++ library, and separate into 3 binary packages:
+    - libqmenumodel0: C++ library
+    - libqmenumodel-dev: development headers for the C++ library
+    - qmenumodel-qml: QML module
+
+ -- Olivier Tilloy <olivier.tilloy@canonical.com>  Mon, 15 Oct 2012 11:51:13 +0200
+
 qmenumodel (0.1.3) quantal; urgency=low
 
   * Rebuild for armhf
diff --git a/debian/control b/debian/control
index 211a3c1..0e5d4c1 100644
--- a/debian/control
+++ b/debian/control
@@ -10,10 +10,36 @@ Build-Depends: debhelper (>= 8.0.0),
                qtdeclarative (>= 5.0),
 Standards-Version: 3.9.2
 
+Package: libqmenumodel0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Description: Qt binding for GMenuModel - shared library
+ Qt binding for GMenuModel that allows connecting to a menu model exposed on
+ D-Bus and presents it as a list model.
+
+Package: libqmenumodel-dev
+Section: libdevel
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libqmenumodel0 (= ${binary:Version}),
+         qtbase (>= 5.0),
+Description: Qt binding for GMenuModel - development files
+ Qt binding for GMenuModel that allows connecting to a menu model exposed on
+ D-Bus and presents it as a list model.
+ .
+ This package contains the development headers for libqmenumodel.
+
 Package: qmenumodel-qml
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Description: QML bindings for GMenuModel
+         libqmenumodel0 (= ${binary:Version}),
+Description: Qt binding for GMenuModel - QML module
+ QML module that allows connecting to a menu model exposed on D-Bus and presents
+ it as a list model.
 
diff --git a/debian/libqmenumodel-dev.install b/debian/libqmenumodel-dev.install
new file mode 100644
index 0000000..31c0d09
--- /dev/null
+++ b/debian/libqmenumodel-dev.install
@@ -0,0 +1,4 @@
+usr/include/qmenumodel/*.h
+usr/lib/*/pkgconfig/qmenumodel.pc
+usr/lib/*/libqmenumodel.so
+
diff --git a/debian/libqmenumodel0.install b/debian/libqmenumodel0.install
new file mode 100644
index 0000000..bea61ce
--- /dev/null
+++ b/debian/libqmenumodel0.install
@@ -0,0 +1,2 @@
+usr/lib/*/libqmenumodel.so.*
+
diff --git a/debian/qmenumodel-qml.install b/debian/qmenumodel-qml.install
new file mode 100644
index 0000000..58ec19a
--- /dev/null
+++ b/debian/qmenumodel-qml.install
@@ -0,0 +1,2 @@
+opt/qt5/imports/QMenuModel/*
+
diff --git a/debian/rules b/debian/rules
index 2756628..7e8093d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 # -*- makefile -*-
 
 DEB_CMAKE_EXTRA_FLAGS = -DCMAKE_PREFIX_PATH=/opt/qt5/lib/cmake
+DEB_DH_MAKESHLIBS_ARGS_qmenumodel-qml = -Xlibqmenumodel-qml.so
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk