[PATCH] Add support for supplying more types of debian package relationships

["Dalamagkidis, Konstantinos" <konstantinos.dalamagkidis@siemens.com>]

We need to be able to specify other package relationships, such as
Pre-Depends or Provides/Replaces/Conflicts.

This change supports supplying DEBIAN_PREDEPENDS, DEBIAN_REPLACES,
DEBIAN_CONFLICTS and DEBIAN_PROVIDES, as well as bitbake-style RDEPENDS
or RDEPENDS_{PN} variables. The DEBIAN_* take priority.

Signed-off-by: Konstantinos Dalamagkidis <konstantinos.dalamagkidis@siemens.com>
---
 meta/classes/debianize.bbclass | 19 +++++++++++++++++++
 meta/classes/dpkg-raw.bbclass  |  1 -
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass
index ad3a98e..26002c5 100644
--- a/meta/classes/debianize.bbclass
+++ b/meta/classes/debianize.bbclass
@@ -5,6 +5,21 @@
 
 CHANGELOG_V ?= "${PV}"
 
+DEBIAN_DEPENDS ??= "${@deb_get_relationship(d, 'RDEPENDS')}"
+DEBIAN_PREDEPENDS ??= "${@deb_get_relationship(d, 'RPREDEPENDS')}"
+DEBIAN_CONFLICTS ??= "${@deb_get_relationship(d, 'RCONFLICTS')}"
+DEBIAN_REPLACES ??= "${@deb_get_relationship(d, 'RREPLACES')}"
+DEBIAN_PROVIDES ??= "${@deb_get_relationship(d, 'RPROVIDES')}"
+
+def deb_get_relationship(d, relationship):
+    rel = d.getVar(relationship + '_' + d.getVar('PN', True), True)
+    if rel:
+        return rel
+    rel = d.getVar(relationship, True)
+    if rel:
+        return rel
+    return ""
+
 deb_add_changelog() {
 	timestamp=$(find ${S}/ -type f -not -path "${S}/debian/*" -printf "%T@\n"|sort -n -r|head -n 1)
 	if [ -n "${timestamp}" ]; then
@@ -42,6 +57,10 @@ Build-Depends: debhelper (>= ${compat})
 Package: ${PN}
 Architecture: any
 Depends: ${DEBIAN_DEPENDS}
+Pre-Depends: ${DEBIAN_PREDEPENDS}
+Replaces: ${DEBIAN_REPLACES}
+Conflicts: ${DEBIAN_CONFLICTS}
+Provides: ${DEBIAN_PROVIDES}
 Description: ${DESCRIPTION}
 EOF
 }
diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass
index ea03ea4..0c484fc 100644
--- a/meta/classes/dpkg-raw.bbclass
+++ b/meta/classes/dpkg-raw.bbclass
@@ -5,7 +5,6 @@
 
 inherit dpkg
 
-DEBIAN_DEPENDS ?= ""
 MAINTAINER ?= "Unknown maintainer <unknown@example.com>"
 
 D = "${S}"
-- 
2.20.1