* revert patch from patch-59, causes all sorts of trouble

diff --git a/apt-pkg/pkgrecords.cc b/apt-pkg/pkgrecords.cc
index 1d71d3e2fb67af1085ea441ae64e2d75d8d3d39a..9c2655d6a774a3b452707f2f5958ec972fc3d7ed 100644 (file)
--- a/apt-pkg/pkgrecords.cc
+++ b/apt-pkg/pkgrecords.cc
@@ -42,9 +42,6 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
       if (Files[I->ID] == 0)
         return;
    }   
       if (Files[I->ID] == 0)
         return;
    }   

-   // We store that to make sure that the destructor won't segfault,
-   // even if the Cache object was destructed before this instance.
-   PackageFileCount = Cache.HeaderP->PackageFileCount;

 }
                                                                        /*}}}*/
 // Records::~pkgRecords - Destructor                                   /*{{{*/
 }
                                                                        /*}}}*/
 // Records::~pkgRecords - Destructor                                   /*{{{*/


@@ -52,7 +49,7 @@ pkgRecords::pkgRecords(pkgCache &Cache) : Cache(Cache), Files(0)
 /* */
 pkgRecords::~pkgRecords()
 {
 /* */
 pkgRecords::~pkgRecords()
 {

-   for (unsigned I = 0; I != PackageFileCount; I++)
+   for (unsigned I = 0; I != Cache.HeaderP->PackageFileCount; I++)

       delete Files[I];
    delete [] Files;
 }
       delete Files[I];
    delete [] Files;
 }

diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index f31e83afefb9be378bc111bc951b7489835b9ab1..08f00441463e428da12e6268c9123a5116742f55 100644 (file)
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -33,7 +33,6 @@ class pkgRecords
    
    pkgCache &Cache;
    Parser **Files;
    
    pkgCache &Cache;
    Parser **Files;

-   int PackageFileCount;

       
    public:
 
       
    public:
 

diff --git a/debian/changelog b/debian/changelog
index 090f1f8433cee99d855e89ed197009af838363e4..3bbbf3b29ebdb0cf3eba222ec3f5adceff014a5f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-apt (0.6.43) unstable; urgency=low
+apt (0.6.42.1) unstable; urgency=low

 
   * fix a incorrect example in the apt_prefrences man page
     (thanks to Filipus Klutiero, closes: #282918)
 
   * fix a incorrect example in the apt_prefrences man page
     (thanks to Filipus Klutiero, closes: #282918)

+  * apt-pkg/pkgrecords.cc:
+    - revert patch from last version, it causes trouble on alpha 
+      and ia64 (closes: #335102, #335103,#335213)

 
 

- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 21 Oct 2005 11:23:42 +0200
+ -- Michael Vogt <mvo@debian.org>  Sat, 22 Oct 2005 23:44:35 +0200

 
 apt (0.6.42) unstable; urgency=low
 
 
 apt (0.6.42) unstable; urgency=low