merge of '3d939eee6aecc2b2d2d099a3f29faf68ba2b347b'

     and '630c8f4d885ea00cf76713379d5b1b9f9ccbe20c'

7 files changed, 9 insertions, 43 deletions

diff --git a/packages/apt/apt-0.6.46/.mtn2git_empty b/packages/apt/apt-0.6.46.2/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/apt/apt-0.6.46/.mtn2git_empty
+++ b/packages/apt/apt-0.6.46.2/.mtn2git_empty
diff --git a/packages/apt/apt-0.6.46/autofoo.patch b/packages/apt/apt-0.6.46.2/autofoo.patch
index 74d787cefd..74d787cefd 100644
--- a/packages/apt/apt-0.6.46/autofoo.patch
+++ b/packages/apt/apt-0.6.46.2/autofoo.patch
diff --git a/packages/apt/apt-0.6.46/noconfigure.patch b/packages/apt/apt-0.6.46.2/noconfigure.patch
index 682a96da24..682a96da24 100644
--- a/packages/apt/apt-0.6.46/noconfigure.patch
+++ b/packages/apt/apt-0.6.46.2/noconfigure.patch
diff --git a/packages/apt/apt-0.6.46/nodoc.patch b/packages/apt/apt-0.6.46.2/nodoc.patch
index 9101847189..9101847189 100644
--- a/packages/apt/apt-0.6.46/nodoc.patch
+++ b/packages/apt/apt-0.6.46.2/nodoc.patch
diff --git a/packages/apt/apt-native_0.6.46.bb b/packages/apt/apt-native_0.6.46.2.bb
index 43f73889f7..43f73889f7 100644
--- a/packages/apt/apt-native_0.6.46.bb
+++ b/packages/apt/apt-native_0.6.46.2.bb
diff --git a/packages/apt/apt_0.6.46.2.bb b/packages/apt/apt_0.6.46.2.bb
new file mode 100644
index 0000000000..1cd8eb270e
--- /dev/null
+++ b/packages/apt/apt_0.6.46.2.bb
@@ -0,0 +1,9 @@
+require apt.inc
+
+SRC_URI += "file://autofoo.patch;patch=1 \
+            file://nodoc.patch;patch=1"
+
+require apt-package.inc
+
+FILES_${PN} += "${bindir}/apt-key"
+apt-manpages += "doc/apt-key.8"
diff --git a/packages/apt/apt_0.6.46.bb b/packages/apt/apt_0.6.46.bb
deleted file mode 100644
index 6d21638118..0000000000
--- a/packages/apt/apt_0.6.46.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-require apt.inc
-
-require apt-package.inc
-
-FILES_${PN} += "${bindir}/apt-key"
-apt-manpages += "doc/apt-key.8"
-
-do_install () {
-        set -x
-        ${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))}
-        ${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))}
-        install -d ${D}${bindir}
-        install -m 0755 bin/apt-cdrom ${D}${bindir}/
-        install -m 0755 bin/apt-get ${D}${bindir}/
-        install -m 0755 bin/apt-config ${D}${bindir}/
-        install -m 0755 bin/apt-cache ${D}${bindir}/
-
-        install -m 0755 bin/apt-sortpkgs ${D}${bindir}/
-        install -m 0755 bin/apt-extracttemplates ${D}${bindir}/
-        
-        eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`
-        oe_libinstall -a -C bin libapt-pkg ${D}${libdir}/
-        ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so
-        oe_libinstall -a -C bin libapt-inst ${D}${libdir}/
-        ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so
-                        
-        install -d ${D}${libdir}/apt/methods 
-        install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
-
-        install -d ${D}${libdir}/dpkg/methods/apt
-        install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/
-        install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/
-        install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/
-        install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/
-        install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/
-
-        install -d ${D}${sysconfdir}/apt
-        install -d ${D}${localstatedir}/lib/apt/lists/partial
-        install -d ${D}${localstatedir}/cache/apt/archives/partial
-        install -d ${D}${docdir}/apt/examples
-        install -m 0644 doc/examples/* ${D}${docdir}/apt/examples/
-}
-