* changelog merged with older debian versions, apt-secure support added (but #if 0ed for performance reasons)

2 files changed, 31 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 140c067d..3b502c6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,25 @@
 python-apt (0.6.13) breezy; urgency=low
 
   * support for Marked{Downgrade,Reinstall} added
-  * Cache.GetChanges() added 
-  * FilteredCache() improvements
-  * added "connect()" to {Pre,Post}CacheChange
   * support for the PkgProblemResolver
   * added tests/ directory with various tests for the code
-  * made the apt/ python code pep8 conform
+  * native apt/ python directory added that contains
+    a more pythonic interface to apt_pkg
+  * made the apt/ python code PEP08 conform
   
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  1 Jun 2005 14:57:57 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  5 Aug 2005 10:30:31 +0200
+
+python-apt (0.6.12.2) unstable; urgency=low
+
+   * rebuild against the latest apt (c++ transition)
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 1 Aug 2005 11:06:03 +0200
+
+python-apt (0.6.12.1) unstable; urgency=low
+
+   * rebuild against the latest apt
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 28 Jun 2005 18:29:57 +0200 
 
 python-apt (0.6.12ubuntu1) breezy; urgency=low
 
diff --git a/python/cache.cc b/python/cache.cc
index 4fb3d389..c0d9048b 100644
--- a/python/cache.cc
+++ b/python/cache.cc
@@ -19,6 +19,7 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/sourcelist.h>
 
 #include <Python.h>
 #include "progress.h"
@@ -548,6 +549,20 @@ static PyObject *VersionAttr(PyObject *Self,char *Name)
       return PyString_FromString(Ver.PriorityType());
    else if (strcmp("Downloadable", Name) == 0)
       return Py_BuildValue("b", Ver.Downloadable());
+#if 0 // FIXME: enable once pkgSourceList is stored somewhere
+   else if (strcmp("IsTrusted", Name) == 0)
+   {
+      pkgSourceList Sources;
+      Sources.ReadMainList();
+      for(pkgCache::VerFileIterator i = Ver.FileList(); !i.end(); i++)
+      {
+	 pkgIndexFile *index;
+	 if(Sources.FindIndex(i.File(), index) && !index->IsTrusted())
+	    return Py_BuildValue("b", false);
+      }
+      return Py_BuildValue("b", true);
+   }
+#endif
 
    PyErr_SetString(PyExc_AttributeError,Name);
    return 0;