Просмотр исходного кода

Merge with Michael

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-82
   * merged with bubulle 

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-83
   * cmdline/apt-get.cc: fix bug in FindSrc() (debian #335213)

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-84
   * added armeb to archtable
Christian Perrier лет назад: 20
Родитель
Сommit
2cf1aee845
4 измененных файлов с 13 добавлено и 1 удалено
  1. 1 0
      buildlib/archtable
  2. 1 0
      buildlib/sizetable
  3. 1 1
      cmdline/apt-get.cc
  4. 10 0
      debian/changelog

+ 1 - 0
buildlib/archtable

@@ -11,6 +11,7 @@ sparc	sparc
 sparc64	sparc
 alpha.*	alpha
 m68k	m68k
+armeb.*	armeb
 arm.*	arm
 powerpc	powerpc
 ppc	powerpc

+ 1 - 0
buildlib/sizetable

@@ -12,6 +12,7 @@
 # CPU endian sizeof: char, int, short, long
 i386    little  1 4 2 4
 arm     little  1 4 2 4
+armeb   big     1 4 2 4
 alpha   little  1 4 2 8
 mipsel  little  1 4 2 4
 sparc   big     1 4 2 4

+ 1 - 1
cmdline/apt-get.cc

@@ -1200,7 +1200,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
       VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end());
       TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash);
    } 
-   else  if(DefRel.empty() == false)
+   else  if(!Pkg.end() && DefRel.empty() == false)
    {
       // we have a default release, try to locate the pkg. we do it like
       // this because GetCandidateVer() will not "downgrade", that means

+ 10 - 0
debian/changelog

@@ -1,3 +1,13 @@
+apt (0.6.42.2) unstable; urgency=low
+
+  * Merge bubulle@debian.org--2005/apt--main--0 up to patch-118:
+    - patch-118: Russian translation update by Yuri Kozlov (closes: #335164)
+  * cmdline/apt-get.cc:
+    - bufix in FindSrc  (closes: #335213)
+  * added armeb to archtable (closes: #333599)
+   
+ --
+
 apt (0.6.42.1) unstable; urgency=low
 
   * fix a incorrect example in the apt_prefrences man page