aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-08-25 15:23:47 +0000
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>2008-08-25 15:23:47 +0000
commit5d24a4f916c1491f5d44406a899569d2bb306874 (patch)
tree87a48715d248e0425fb10996452a522f96987635
parentd90cdcf08622717e9d61bc7dd9636f61b2a32ebc (diff)
parentc3005ac1ad16e980158e41eb13f2438c35afd147 (diff)
downloadopenembedded-5d24a4f916c1491f5d44406a899569d2bb306874.tar.gz
merge of '74c061404accba6de9e626ef3f093a8293209def'
and 'af69f1d59affc73e1d3f65055a0ad0ff767a39e1'
-rw-r--r--contrib/distro-packages/debian/openembedded-essential-1.4/debian/control2
-rw-r--r--packages/nonworking/meta/.mtn2git_empty0
-rw-r--r--packages/nonworking/meta/meta-gpephone.bb (renamed from packages/meta/meta-gpephone.bb)0
-rw-r--r--packages/nonworking/meta/meta-sectest-gpe.bb (renamed from packages/meta/meta-sectest-gpe.bb)0
4 files changed, 1 insertions, 1 deletions
diff --git a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control
index 01f9f4b906..9f1e0953d4 100644
--- a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control
+++ b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.7.3
Package: openembedded-essential
Architecture: all
-Depends: python (>= 2.3), ccache, build-essential, quilt, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk, bc, python-pysqlite2
+Depends: python (>= 2.3), ccache, build-essential, quilt, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk, bc, python-pysqlite2, help2man
Description: Metapackage to install all needed packages to start using OpenEmbedded
OpenEmbedded is a full-featured development environment allowing users to
target a wide variety of devices. Supporting multiple build, release paths and
diff --git a/packages/nonworking/meta/.mtn2git_empty b/packages/nonworking/meta/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/meta/.mtn2git_empty
diff --git a/packages/meta/meta-gpephone.bb b/packages/nonworking/meta/meta-gpephone.bb
index 9912ddbf30..9912ddbf30 100644
--- a/packages/meta/meta-gpephone.bb
+++ b/packages/nonworking/meta/meta-gpephone.bb
diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/nonworking/meta/meta-sectest-gpe.bb
index a73559ab1a..a73559ab1a 100644
--- a/packages/meta/meta-sectest-gpe.bb
+++ b/packages/nonworking/meta/meta-sectest-gpe.bb