[maemo-commits] [maemo-commits] r16134 - in projects/haf/trunk/apt: . apt-pkg

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-09-15 21:47:12 +0300 (Mon, 15 Sep 2008)
New Revision: 16134

Modified:
   projects/haf/trunk/apt/apt-pkg/acquire-item.h
   projects/haf/trunk/apt/trusthook.patch
Log:
Correctiified trusthook.patch.  Ooops.


Modified: projects/haf/trunk/apt/apt-pkg/acquire-item.h
===================================================================
--- projects/haf/trunk/apt/apt-pkg/acquire-item.h	2008-09-15 18:18:45 UTC (rev 16133)
+++ projects/haf/trunk/apt/apt-pkg/acquire-item.h	2008-09-15 18:47:12 UTC (rev 16134)
@@ -28,6 +28,8 @@
 #include <apt-pkg/indexrecords.h>
 #include <apt-pkg/hashes.h>
 
+#include <list>
+
 /** \addtogroup acquire
  *  @{
  *
@@ -614,8 +616,6 @@
    /** \brief The last good signature file */
    string LastGoodSig;
 
-#include <list>
-
    /** \brief The fetch request that is currently being processed. */
    pkgAcquire::ItemDesc Desc;
 

Modified: projects/haf/trunk/apt/trusthook.patch
===================================================================
--- projects/haf/trunk/apt/trusthook.patch	2008-09-15 18:18:45 UTC (rev 16133)
+++ projects/haf/trunk/apt/trusthook.patch	2008-09-15 18:47:12 UTC (rev 16134)
@@ -197,14 +197,15 @@
 ===================================================================
 --- apt-pkg/acquire-item.h	(revision 16129)
 +++ apt-pkg/acquire-item.h	(working copy)
-@@ -614,6 +614,7 @@ class pkgAcqMetaSig : public pkgAcquire:
-    /** \brief The last good signature file */
-    string LastGoodSig;
+@@ -28,6 +28,8 @@
+ #include <apt-pkg/indexrecords.h>
+ #include <apt-pkg/hashes.h>
  
 +#include <list>
- 
-    /** \brief The fetch request that is currently being processed. */
-    pkgAcquire::ItemDesc Desc;
++
+ /** \addtogroup acquire
+  *  @{
+  *
 @@ -792,8 +793,8 @@ class pkgAcqArchive : public pkgAcquire:
      */
     string &StoreFilename;