From: nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Date: Sun, 2 Jan 2005 22:40:07 +0000 (+0000)
Subject: Merge bk://oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~15486
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f21abcec9f7b28795774fd2c2c3d8baeb60595f4;p=openembedded.git

Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/02 22:32:44+00:00 nexus.co.uk!pb
update update-rc.d to 0.7, and blow away some old versions


2005/01/02 22:30:57+00:00 nexus.co.uk!pb
reinstate lost prismstumbler-doc package

BKrev: 41d878470mmnrepgK0Dyw8N87SNXnA
---

diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb
index 6f29742f28..9e287a8298 100644
--- a/packages/prismstumbler/prismstumbler_0.7.3.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.3.bb
@@ -1,7 +1,7 @@
 SECTION = "x11/network"
-PR = "r2"
+PR = "r3"
 
-PACKAGES = "prismstumbler prismstumbler-frontend"
+PACKAGES = "prismstumbler prismstumbler-frontend prismstumbler-doc"
 DESCRIPTION = "Prismstumbler wireless LAN scanner"
 LICENSE = "GPL"
 MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
diff --git a/packages/update-rc.d/update-rc.d_0.3.bb b/packages/update-rc.d/update-rc.d_0.3.bb
deleted file mode 100644
index 2422979ed0..0000000000
--- a/packages/update-rc.d/update-rc.d_0.3.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-SECTION = "base"
-PRIORITY = "standard"
-DESCRIPTION = "Manage symlinks in /etc/rcN.d"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-S = ${WORKDIR}/update-rc.d
-LICENSE = "GPL"
-SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_3"
-
-do_compile() {
-}
-
-do_install() {
-	install -d ${D}/${sbindir}
-	install -m 0755 ${S}/update-rc.d ${D}/${sbindir}/update-rc.d
-}
-
diff --git a/packages/update-rc.d/update-rc.d_0.4.bb b/packages/update-rc.d/update-rc.d_0.4.bb
deleted file mode 100644
index 5eaf30f385..0000000000
--- a/packages/update-rc.d/update-rc.d_0.4.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SECTION = "base"
-PRIORITY = "standard"
-DESCRIPTION = "Manage symlinks in /etc/rcN.d"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-S = ${WORKDIR}/update-rc.d
-LICENSE = "GPL"
-
-SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_4"
-
-do_compile() {
-}
-
-do_stage() {
-	install -m 0755 ${S}/update-rc.d ${STAGING_BINDIR}/
-}
-
-do_install() {
-	install -d ${D}/${sbindir}
-	install -m 0755 ${S}/update-rc.d ${D}/${sbindir}/update-rc.d
-}
diff --git a/packages/update-rc.d/update-rc.d_0.5.bb b/packages/update-rc.d/update-rc.d_0.7.bb
similarity index 100%
rename from packages/update-rc.d/update-rc.d_0.5.bb
rename to packages/update-rc.d/update-rc.d_0.7.bb