From: Steve Langasek <steve.langasek@canonical.com>
Date: Fri, 30 Mar 2012 17:01:05 +0000 (-0700)
Subject: merge fix for bug #968828
X-Git-Tag: 0.9.13.exp1ubuntu1~86
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/7cf3e9a75ace344416da4d53d723768cee088e76?ds=inline;hp=-c

merge fix for bug #968828
---

7cf3e9a75ace344416da4d53d723768cee088e76
diff --combined debian/changelog
index cbf596362,bda65c543..9fe896f22
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,7 -2,8 +2,9 @@@ apt (0.8.16~exp12ubuntu7) UNRELEASED; u
  
    * clean up obsolete conffile /etc/apt/apt.conf.d/01ubuntu, which was
      dropped in maverick.
 -  * don't treat build-depends-indep as cross-build-dependencies; we should
 +  * Build-depend on gettext:any for cross-building support.
++  * Don't treat build-depends-indep as cross-build-dependencies; we should
+     always install the host arch versions.  LP: #968828.
  
   -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 24 Mar 2012 00:05:43 -0700