Split out the irssi files that are shared between the X & text versions into a common...

BKrev: 41aedafcZ4UBRlO27diBaBHD_nRn9A

diff --git a/irssi/irssi_cvs.oe b/irssi/irssi_cvs.oe
index 3c0fe0e..717234d 100644 (file)
--- a/irssi/irssi_cvs.oe
+++ b/irssi/irssi_cvs.oe
@@ -3,9 +3,14 @@ HOMEPAGE = "http://irssi.org/"
 SECTION = "console/network"
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "ncurses glib-2.0"
+DEPENDS += "ncurses glib-2.0"
 PV = "0.8.9+cvs${CVSDATE}"
-PR = "r1"
+PR = "r2"
+
+PACKAGES += "${PN}-common"
+FILES_${PN} = "${bindir}/irssi"
+FILES_${PN}-common = "${datadir}/irssi ${sysconfdir}"
+RDEPENDS_${PN} += "${PN}-common"
 
 inherit autotools
 
@@ -38,9 +43,10 @@ do_configure () {
        files=`echo $files|sed 's/\.in//g'`
        cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/Makefile.am
        
-       # .html -> .txt with lynx
+       # .HTML -> .txt with lynx
        # echo "Documentation: html -> txt..."
        # lynx -dump -nolist docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
+       > docs/faq.txt
        
        autotools_do_configure
 }
@@ -56,3 +62,8 @@ do_stage () {
        done
        install -m 0644 irssi-config ${STAGING_LIBDIR}/../irssi/
 }
+
+do_install () {
+       autotools_do_install
+       rm -f ${D}/${docdir}/irssi/faq.txt
+}

diff --git a/irssi/xirssi_cvs.oe b/irssi/xirssi_cvs.oe
index 37a3f07..e40d210 100644 (file)
--- a/irssi/xirssi_cvs.oe
+++ b/irssi/xirssi_cvs.oe
@@ -3,9 +3,10 @@ HOMEPAGE = "http://irssi.org/"
 SECTION = "x11/network"
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-DEPENDS = "irssi gtk+"
+DEPENDS += "irssi gtk+"
+RDEPENDS_${PN} += "irssi-common"
 PV = "0.0+cvs${CVSDATE}"
-PR = "r1"
+PR = "r2"
 
 inherit autotools