packages/qsvn: Experiment with building the same source in different variants

    Experiment with having the same source build with different versions of
    the underlying toolkit. In the best case we want to be installable in parallel.

diff --git a/packages/qsvn/qsvn-qte_0.3.0.bb b/packages/qsvn/qsvn-qte_0.3.0.bb
new file mode 100644 (file)
index 0000000..59b46ed
--- /dev/null
+++ b/packages/qsvn/qsvn-qte_0.3.0.bb
@@ -0,0 +1,3 @@
+require qsvn.inc
+FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qsvn"
+inherit qtopia4core

diff --git a/packages/qsvn/qsvn.inc b/packages/qsvn/qsvn.inc
new file mode 100644 (file)
index 0000000..edd9bfd
--- /dev/null
+++ b/packages/qsvn/qsvn.inc
@@ -0,0 +1,19 @@
+DESCRIPTION = "QSvn is a graphical Subversion client for Linux, UNIX, Mac OS X and Windows. \
+It is written in C++ using the Qt4 toolkit from Trolltech."
+HOMEPAGE = "http://ar.oszine.de/projects/qsvn/"
+AUTHOR = "Andreas Richter, Rajko Albrecht"
+LICENSE = "GPL"
+SECTION = "network"
+DEPENDS = "apr-util subversion"
+PR = "r0"
+
+SRC_URI = "http://download2.berlios.de/qsvn/qsvn-${PV}-src.tar.gz \
+        file://build.patch;patch=1"
+S = "${WORKDIR}/qsvn-${PV}"
+
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/subversion-1"
+
+do_install() {
+       install -d ${D}${bindir}
+       install -m 0755 bin/qsvn ${D}${bindir}/${PN}
+}

diff --git a/packages/qsvn/qsvn_0.3.0.bb b/packages/qsvn/qsvn_0.3.0.bb
index c96976f..db3cc09 100644 (file)
--- a/packages/qsvn/qsvn_0.3.0.bb
+++ b/packages/qsvn/qsvn_0.3.0.bb
@@ -1,20 +1,2 @@
-DESCRIPTION = "QSvn is a graphical Subversion client for Linux, UNIX, Mac OS X and Windows. \
-It is written in C++ using the Qt4 toolkit from Trolltech."
-HOMEPAGE = "http://ar.oszine.de/projects/qsvn/"
-AUTHOR = "Andreas Richter, Rajko Albrecht"
-LICENSE = "GPL"
-SECTION = "network"
-DEPENDS = "apr-util subversion"
-PR = "r0"
-
-SRC_URI = "http://download2.berlios.de/qsvn/qsvn-${PV}-src.tar.gz \
-        file://build.patch;patch=1"
-
+require qsvn.inc
 inherit qt4x11
-
-EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/subversion-1"
-
-do_install() {
-       install -d ${D}${bindir}
-       install -m 0755 bin/qsvn ${D}${bindir}
-}