From 91d7c5b3cfe48bd107ae77c70935cb6a3833bdf9 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Thu, 19 Jun 2008 15:16:30 +0000
Subject: [PATCH] apt: update to 0.7.14

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4710 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/apt/{apt-0.7.3 => apt-0.7.14}/noconfigure.patch | 0
 meta/packages/apt/{apt-0.7.3 => apt-0.7.14}/nodoc.patch       | 0
 meta/packages/apt/apt-native.inc                              | 4 ++--
 .../apt/{apt-native_0.7.3.bb => apt-native_0.7.14.bb}         | 1 -
 meta/packages/apt/apt.inc                                     | 4 +++-
 meta/packages/apt/{apt_0.7.3.bb => apt_0.7.14.bb}             | 1 -
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename meta/packages/apt/{apt-0.7.3 => apt-0.7.14}/noconfigure.patch (100%)
 rename meta/packages/apt/{apt-0.7.3 => apt-0.7.14}/nodoc.patch (100%)
 rename meta/packages/apt/{apt-native_0.7.3.bb => apt-native_0.7.14.bb} (91%)
 rename meta/packages/apt/{apt_0.7.3.bb => apt_0.7.14.bb} (93%)

diff --git a/meta/packages/apt/apt-0.7.3/noconfigure.patch b/meta/packages/apt/apt-0.7.14/noconfigure.patch
similarity index 100%
rename from meta/packages/apt/apt-0.7.3/noconfigure.patch
rename to meta/packages/apt/apt-0.7.14/noconfigure.patch
diff --git a/meta/packages/apt/apt-0.7.3/nodoc.patch b/meta/packages/apt/apt-0.7.14/nodoc.patch
similarity index 100%
rename from meta/packages/apt/apt-0.7.3/nodoc.patch
rename to meta/packages/apt/apt-0.7.14/nodoc.patch
diff --git a/meta/packages/apt/apt-native.inc b/meta/packages/apt/apt-native.inc
index 75cd8f47cd..c3814842e0 100644
--- a/meta/packages/apt/apt-native.inc
+++ b/meta/packages/apt/apt-native.inc
@@ -1,10 +1,10 @@
 require apt.inc
 inherit native
 
-DEPENDS += "dpkg-native curl-native db-native"
+DEPENDS += "dpkg-native curl-native db-native gettext-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/apt-${PV}"
 PACKAGES = ""
-USE_NLS = "no"
+USE_NLS = "yes"
 
 SRC_URI += "file://db_linking_hack.patch;patch=1"
 
diff --git a/meta/packages/apt/apt-native_0.7.3.bb b/meta/packages/apt/apt-native_0.7.14.bb
similarity index 91%
rename from meta/packages/apt/apt-native_0.7.3.bb
rename to meta/packages/apt/apt-native_0.7.14.bb
index 6db567f987..43f73889f7 100644
--- a/meta/packages/apt/apt-native_0.7.3.bb
+++ b/meta/packages/apt/apt-native_0.7.14.bb
@@ -1,5 +1,4 @@
 require apt-native.inc
-PR = "r2"
 
 SRC_URI += "file://nodoc.patch;patch=1 \
             file://noconfigure.patch;patch=1"
diff --git a/meta/packages/apt/apt.inc b/meta/packages/apt/apt.inc
index 9f51f2111a..e42b63d22b 100644
--- a/meta/packages/apt/apt.inc
+++ b/meta/packages/apt/apt.inc
@@ -5,7 +5,9 @@ DEPENDS = "curl db"
 RDEPENDS = "dpkg"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
-           file://environment.patch;patch=1"
+	    file://no-ko-translation.patch;patch=1 \
+		"
+
 S = "${WORKDIR}/apt-${PV}"
 
 inherit autotools gettext
diff --git a/meta/packages/apt/apt_0.7.3.bb b/meta/packages/apt/apt_0.7.14.bb
similarity index 93%
rename from meta/packages/apt/apt_0.7.3.bb
rename to meta/packages/apt/apt_0.7.14.bb
index c4cf06544b..73285f37c3 100644
--- a/meta/packages/apt/apt_0.7.3.bb
+++ b/meta/packages/apt/apt_0.7.14.bb
@@ -1,5 +1,4 @@
 require apt.inc
-PR = "r1"
 
 SRC_URI += "file://nodoc.patch;patch=1"
 
-- 
2.40.1