Mon Jan 17 22:01:28 UTC 2005

Author: scop

Update of /cvs/extras/rpms/apt/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv18331

Modified Files:
	apt-0.5.15cnc6-pymake.patch apt.spec default.conf 
	mirror-select.conf upgradevirt.lua 
Added Files:
	apt-0.5.15cnc6-pymake2.patch 
	apt-0.5.15cnc6-python-update.patch apt-0.5.15cnc6-r362.patch 
	apt-0.5.15cnc6-scriptdir.patch apt.cron apt.init apt.sysconfig 
	comps2prio.xsl rpmpriorities.1 rpmpriorities.2 rpmpriorities.3 
	rpmpriorities.Rawhide 
Removed Files:
	apt-0.5.15cnc6-build-dep-fixdeps.patch 
	apt-0.5.5-rpmdir-symlink.patch rpmpriorities 
Log Message:
Per Panu's approval, bring in lots of accumulated work from him,
and add some bits from yours truly.


apt-0.5.15cnc6-pymake2.patch:

--- NEW FILE apt-0.5.15cnc6-pymake2.patch ---
--- python/Makefile~	2004-03-19 14:51:39.000000000 +0200
+++ python/Makefile	2005-01-16 11:55:44.552686258 +0200
@@ -8,8 +8,8 @@
 #SWIG = /var/tmp/swig/BUILD/SWIG-1.3.16/swig
 LUAFLAGS = -DWITH_LUA
 
-PYTHONVER = $(shell python -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v" 2>/dev/null || echo NONE)
-PYTHONFLAGS=-I/usr/include/python$(PYTHONVER)
+PYTHON = python
+PYTHONFLAGS = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_inc; print '-I' + get_python_inc(1)")
 
 all: $(MODULES)
 
@@ -25,4 +25,4 @@
 	rm -f *.cxx
 
 distclean: clean
-	rm -f $(MODULES) *.pyc _*.so
+	rm -f $(MODULES) *.pyc *.pyo *.so

apt-0.5.15cnc6-python-update.patch:

--- NEW FILE apt-0.5.15cnc6-python-update.patch ---
--- apt-0.5.15cnc6/python/apt.py.pyupdate	2004-08-14 16:35:16.427061350 +0300
+++ apt-0.5.15cnc6/python/apt.py	2004-08-14 16:35:17.747778020 +0300
@@ -1,7 +1,9 @@
 # This file was created automatically by SWIG.
 # Don't modify this file, modify the SWIG interface instead.
 # This file is compatible with both classic and new-style classes.
+
 import _apt
+
 def _swig_setattr(self,class_type,name,value):
     if (name == "this"):
         if isinstance(value, class_type):
@@ -25,22 +27,25 @@
 except AttributeError:
     class _object : pass
     _newclass = 0
+del types
 
 
-pkgInit = _apt.pkgInit
 
+pkgInit = _apt.pkgInit
 APT_PKG_MAJOR = _apt.APT_PKG_MAJOR
 APT_PKG_MINOR = _apt.APT_PKG_MINOR
 APT_PKG_RELEASE = _apt.APT_PKG_RELEASE
+
 pkgInitConfig = _apt.pkgInitConfig
 
 pkgInitSystem = _apt.pkgInitSystem
-
 class pkgCache(_object):
     __swig_setmethods__ = {}
     __setattr__ = lambda self, name, value: _swig_setattr(self, pkgCache, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, pkgCache, name)
+    def __repr__(self):
+        return "<C pkgCache instance at %s>" % (self.this,)
     DepDepends = _apt.pkgCache_DepDepends
     DepPreDepends = _apt.pkgCache_DepPreDepends
     DepSuggests = _apt.pkgCache_DepSuggests
@@ -83,171 +88,172 @@
     FlagNotAutomatic = _apt.pkgCache_FlagNotAutomatic
     __swig_setmethods__["HeaderP"] = _apt.pkgCache_HeaderP_set
     __swig_getmethods__["HeaderP"] = _apt.pkgCache_HeaderP_get
-    if _newclass:HeaderP = property(_apt.pkgCache_HeaderP_get,_apt.pkgCache_HeaderP_set)
+    if _newclass:HeaderP = property(_apt.pkgCache_HeaderP_get, _apt.pkgCache_HeaderP_set)
     __swig_setmethods__["PkgP"] = _apt.pkgCache_PkgP_set
     __swig_getmethods__["PkgP"] = _apt.pkgCache_PkgP_get
-    if _newclass:PkgP = property(_apt.pkgCache_PkgP_get,_apt.pkgCache_PkgP_set)
+    if _newclass:PkgP = property(_apt.pkgCache_PkgP_get, _apt.pkgCache_PkgP_set)
     __swig_setmethods__["VerFileP"] = _apt.pkgCache_VerFileP_set
     __swig_getmethods__["VerFileP"] = _apt.pkgCache_VerFileP_get
-    if _newclass:VerFileP = property(_apt.pkgCache_VerFileP_get,_apt.pkgCache_VerFileP_set)
+    if _newclass:VerFileP = property(_apt.pkgCache_VerFileP_get, _apt.pkgCache_VerFileP_set)
     __swig_setmethods__["PkgFileP"] = _apt.pkgCache_PkgFileP_set
     __swig_getmethods__["PkgFileP"] = _apt.pkgCache_PkgFileP_get
-    if _newclass:PkgFileP = property(_apt.pkgCache_PkgFileP_get,_apt.pkgCache_PkgFileP_set)
+    if _newclass:PkgFileP = property(_apt.pkgCache_PkgFileP_get, _apt.pkgCache_PkgFileP_set)
     __swig_setmethods__["VerP"] = _apt.pkgCache_VerP_set
     __swig_getmethods__["VerP"] = _apt.pkgCache_VerP_get
-    if _newclass:VerP = property(_apt.pkgCache_VerP_get,_apt.pkgCache_VerP_set)
+    if _newclass:VerP = property(_apt.pkgCache_VerP_get, _apt.pkgCache_VerP_set)
     __swig_setmethods__["ProvideP"] = _apt.pkgCache_ProvideP_set
     __swig_getmethods__["ProvideP"] = _apt.pkgCache_ProvideP_get
-    if _newclass:ProvideP = property(_apt.pkgCache_ProvideP_get,_apt.pkgCache_ProvideP_set)
+    if _newclass:ProvideP = property(_apt.pkgCache_ProvideP_get, _apt.pkgCache_ProvideP_set)
     __swig_setmethods__["DepP"] = _apt.pkgCache_DepP_set
     __swig_getmethods__["DepP"] = _apt.pkgCache_DepP_get
-    if _newclass:DepP = property(_apt.pkgCache_DepP_get,_apt.pkgCache_DepP_set)
+    if _newclass:DepP = property(_apt.pkgCache_DepP_get, _apt.pkgCache_DepP_set)
     __swig_setmethods__["StringItemP"] = _apt.pkgCache_StringItemP_set
     __swig_getmethods__["StringItemP"] = _apt.pkgCache_StringItemP_get
-    if _newclass:StringItemP = property(_apt.pkgCache_StringItemP_get,_apt.pkgCache_StringItemP_set)
+    if _newclass:StringItemP = property(_apt.pkgCache_StringItemP_get, _apt.pkgCache_StringItemP_set)
     __swig_setmethods__["StrP"] = _apt.pkgCache_StrP_set
     __swig_getmethods__["StrP"] = _apt.pkgCache_StrP_get
-    if _newclass:StrP = property(_apt.pkgCache_StrP_get,_apt.pkgCache_StrP_set)
-    def ReMap(*args): return apply(_apt.pkgCache_ReMap,args)
-    def Sync(*args): return apply(_apt.pkgCache_Sync,args)
-    def GetMap(*args): return apply(_apt.pkgCache_GetMap,args)
-    def DataEnd(*args): return apply(_apt.pkgCache_DataEnd,args)
-    def Hash(*args): return apply(_apt.pkgCache_Hash,args)
-    def Priority(*args): return apply(_apt.pkgCache_Priority,args)
-    def FindPkg(*args): return apply(_apt.pkgCache_FindPkg,args)
-    def FindPackage(*args): return apply(_apt.pkgCache_FindPackage,args)
-    def Head(*args): return apply(_apt.pkgCache_Head,args)
-    def PkgIter(*args): return apply(_apt.pkgCache_PkgIter,args)
-    def FileIter(*args): return apply(_apt.pkgCache_FileIter,args)
+    if _newclass:StrP = property(_apt.pkgCache_StrP_get, _apt.pkgCache_StrP_set)
+    def ReMap(*args): return _apt.pkgCache_ReMap(*args)
+    def Sync(*args): return _apt.pkgCache_Sync(*args)
+    def GetMap(*args): return _apt.pkgCache_GetMap(*args)
+    def DataEnd(*args): return _apt.pkgCache_DataEnd(*args)
+    def Hash(*args): return _apt.pkgCache_Hash(*args)
+    def Priority(*args): return _apt.pkgCache_Priority(*args)
+    def FindPkg(*args): return _apt.pkgCache_FindPkg(*args)
+    def FindPackage(*args): return _apt.pkgCache_FindPackage(*args)
+    def Head(*args): return _apt.pkgCache_Head(*args)
+    def PkgIter(*args): return _apt.pkgCache_PkgIter(*args)
+    def FileIter(*args): return _apt.pkgCache_FileIter(*args)
     __swig_setmethods__["VS"] = _apt.pkgCache_VS_set
     __swig_getmethods__["VS"] = _apt.pkgCache_VS_get
-    if _newclass:VS = property(_apt.pkgCache_VS_get,_apt.pkgCache_VS_set)
+    if _newclass:VS = property(_apt.pkgCache_VS_get, _apt.pkgCache_VS_set)
     __swig_getmethods__["CompTypeDeb"] = lambda x: _apt.pkgCache_CompTypeDeb
     if _newclass:CompTypeDeb = staticmethod(_apt.pkgCache_CompTypeDeb)
     __swig_getmethods__["CompType"] = lambda x: _apt.pkgCache_CompType
     if _newclass:CompType = staticmethod(_apt.pkgCache_CompType)
     __swig_getmethods__["DepType"] = lambda x: _apt.pkgCache_DepType
     if _newclass:DepType = staticmethod(_apt.pkgCache_DepType)
-    def __init__(self,*args):
-        self.this = apply(_apt.new_pkgCache,args)
-        self.thisown = 1
-    def __del__(self, destroy= _apt.delete_pkgCache):
+    def __init__(self, *args):
+        _swig_setattr(self, pkgCache, 'this', _apt.new_pkgCache(*args))
+        _swig_setattr(self, pkgCache, 'thisown', 1)
+    def __del__(self, destroy=_apt.delete_pkgCache):
         try:
             if self.thisown: destroy(self)
         except: pass
-    def __repr__(self):
-        return "<C pkgCache instance at %s>" % (self.this,)
 
 class pkgCachePtr(pkgCache):
-    def __init__(self,this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = pkgCache
+    def __init__(self, this):
+        _swig_setattr(self, pkgCache, 'this', this)
+        if not hasattr(self,"thisown"): _swig_setattr(self, pkgCache, 'thisown', 0)
+        _swig_setattr(self, pkgCache,self.__class__,pkgCache)
 _apt.pkgCache_swigregister(pkgCachePtr)
 cvar = _apt.cvar
+
 pkgCache_CompTypeDeb = _apt.pkgCache_CompTypeDeb
 
 pkgCache_CompType = _apt.pkgCache_CompType
 
 pkgCache_DepType = _apt.pkgCache_DepType
 
-
 class pkgCacheHeader(_object):
     __swig_setmethods__ = {}
     __setattr__ = lambda self, name, value: _swig_setattr(self, pkgCacheHeader, name, value)
     __swig_getmethods__ = {}
     __getattr__ = lambda self, name: _swig_getattr(self, pkgCacheHeader, name)
+    def __repr__(self):
+        return "<C pkgCache::Header instance at %s>" % (self.this,)
     __swig_setmethods__["Signature"] = _apt.pkgCacheHeader_Signature_set
     __swig_getmethods__["Signature"] = _apt.pkgCacheHeader_Signature_get
-    if _newclass:Signature = property(_apt.pkgCacheHeader_Signature_get,_apt.pkgCacheHeader_Signature_set)
+    if _newclass:Signature = property(_apt.pkgCacheHeader_Signature_get, _apt.pkgCacheHeader_Signature_set)
     __swig_setmethods__["MajorVersion"] = _apt.pkgCacheHeader_MajorVersion_set
     __swig_getmethods__["MajorVersion"] = _apt.pkgCacheHeader_MajorVersion_get
-    if _newclass:MajorVersion = property(_apt.pkgCacheHeader_MajorVersion_get,_apt.pkgCacheHeader_MajorVersion_set)
+    if _newclass:MajorVersion = property(_apt.pkgCacheHeader_MajorVersion_get, _apt.pkgCacheHeader_MajorVersion_set)
     __swig_setmethods__["MinorVersion"] = _apt.pkgCacheHeader_MinorVersion_set
     __swig_getmethods__["MinorVersion"] = _apt.pkgCacheHeader_MinorVersion_get
-    if _newclass:MinorVersion = property(_apt.pkgCacheHeader_MinorVersion_get,_apt.pkgCacheHeader_MinorVersion_set)
+    if _newclass:MinorVersion = property(_apt.pkgCacheHeader_MinorVersion_get, _apt.pkgCacheHeader_MinorVersion_set)
     __swig_setmethods__["Dirty"] = _apt.pkgCacheHeader_Dirty_set
     __swig_getmethods__["Dirty"] = _apt.pkgCacheHeader_Dirty_get
-    if _newclass:Dirty = property(_apt.pkgCacheHeader_Dirty_get,_apt.pkgCacheHeader_Dirty_set)
+    if _newclass:Dirty = property(_apt.pkgCacheHeader_Dirty_get, _apt.pkgCacheHeader_Dirty_set)
     __swig_setmethods__["HasFileDeps"] = _apt.pkgCacheHeader_HasFileDeps_set
     __swig_getmethods__["HasFileDeps"] = _apt.pkgCacheHeader_HasFileDeps_get
-    if _newclass:HasFileDeps = property(_apt.pkgCacheHeader_HasFileDeps_get,_apt.pkgCacheHeader_HasFileDeps_set)
+    if _newclass:HasFileDeps = property(_apt.pkgCacheHeader_HasFileDeps_get, _apt.pkgCacheHeader_HasFileDeps_set)
+    __swig_setmethods__["OptionsHash"] = _apt.pkgCacheHeader_OptionsHash_set
+    __swig_getmethods__["OptionsHash"] = _apt.pkgCacheHeader_OptionsHash_get
+    if _newclass:OptionsHash = property(_apt.pkgCacheHeader_OptionsHash_get, _apt.pkgCacheHeader_OptionsHash_set)
     __swig_setmethods__["HeaderSz"] = _apt.pkgCacheHeader_HeaderSz_set
     __swig_getmethods__["HeaderSz"] = _apt.pkgCacheHeader_HeaderSz_get
-    if _newclass:HeaderSz = property(_apt.pkgCacheHeader_HeaderSz_get,_apt.pkgCacheHeader_HeaderSz_set)
+    if _newclass:HeaderSz = property(_apt.pkgCacheHeader_HeaderSz_get, _apt.pkgCacheHeader_HeaderSz_set)
     __swig_setmethods__["PackageSz"] = _apt.pkgCacheHeader_PackageSz_set
     __swig_getmethods__["PackageSz"] = _apt.pkgCacheHeader_PackageSz_get
-    if _newclass:PackageSz = property(_apt.pkgCacheHeader_PackageSz_get,_apt.pkgCacheHeader_PackageSz_set)
+    if _newclass:PackageSz = property(_apt.pkgCacheHeader_PackageSz_get, _apt.pkgCacheHeader_PackageSz_set)
     __swig_setmethods__["PackageFileSz"] = _apt.pkgCacheHeader_PackageFileSz_set
     __swig_getmethods__["PackageFileSz"] = _apt.pkgCacheHeader_PackageFileSz_get
-    if _newclass:PackageFileSz = property(_apt.pkgCacheHeader_PackageFileSz_get,_apt.pkgCacheHeader_PackageFileSz_set)
+    if _newclass:PackageFileSz = property(_apt.pkgCacheHeader_PackageFileSz_get, _apt.pkgCacheHeader_PackageFileSz_set)
     __swig_setmethods__["VersionSz"] = _apt.pkgCacheHeader_VersionSz_set
     __swig_getmethods__["VersionSz"] = _apt.pkgCacheHeader_VersionSz_get
-    if _newclass:VersionSz = property(_apt.pkgCacheHeader_VersionSz_get,_apt.pkgCacheHeader_VersionSz_set)
+    if _newclass:VersionSz = property(_apt.pkgCacheHeader_VersionSz_get, _apt.pkgCacheHeader_VersionSz_set)
     __swig_setmethods__["DependencySz"] = _apt.pkgCacheHeader_DependencySz_set
     __swig_getmethods__["DependencySz"] = _apt.pkgCacheHeader_DependencySz_get
-    if _newclass:DependencySz = property(_apt.pkgCacheHeader_DependencySz_get,_apt.pkgCacheHeader_DependencySz_set)
+    if _newclass:DependencySz = property(_apt.pkgCacheHeader_DependencySz_get, _apt.pkgCacheHeader_DependencySz_set)
     __swig_setmethods__["ProvidesSz"] = _apt.pkgCacheHeader_ProvidesSz_set
     __swig_getmethods__["ProvidesSz"] = _apt.pkgCacheHeader_ProvidesSz_get
-    if _newclass:ProvidesSz = property(_apt.pkgCacheHeader_ProvidesSz_get,_apt.pkgCacheHeader_ProvidesSz_set)
+    if _newclass:ProvidesSz = property(_apt.pkgCacheHeader_ProvidesSz_get, _apt.pkgCacheHeader_ProvidesSz_set)
     __swig_setmethods__["VerFileSz"] = _apt.pkgCacheHeader_VerFileSz_set
     __swig_getmethods__["VerFileSz"] = _apt.pkgCacheHeader_VerFileSz_get
[...15018 lines suppressed...]
 	 { (char *)"pkgCacheVerFileIterator_swigregister", pkgCacheVerFileIterator_swigregister, METH_VARARGS },
@@ -18577,11 +20061,13 @@
 	 { (char *)"pkgSystem_Initialize", _wrap_pkgSystem_Initialize, METH_VARARGS },
 	 { (char *)"pkgSystem_ArchiveSupported", _wrap_pkgSystem_ArchiveSupported, METH_VARARGS },
 	 { (char *)"pkgSystem_AddStatusFiles", _wrap_pkgSystem_AddStatusFiles, METH_VARARGS },
+	 { (char *)"pkgSystem_AddSourceFiles", _wrap_pkgSystem_AddSourceFiles, METH_VARARGS },
 	 { (char *)"pkgSystem_FindIndex", _wrap_pkgSystem_FindIndex, METH_VARARGS },
 	 { (char *)"pkgSystem_Score", _wrap_pkgSystem_Score, METH_VARARGS },
 	 { (char *)"pkgSystem_PreProcess", _wrap_pkgSystem_PreProcess, METH_VARARGS },
 	 { (char *)"pkgSystem_ProcessCache", _wrap_pkgSystem_ProcessCache, METH_VARARGS },
 	 { (char *)"pkgSystem_IgnoreDep", _wrap_pkgSystem_IgnoreDep, METH_VARARGS },
+	 { (char *)"pkgSystem_OptionsHash", _wrap_pkgSystem_OptionsHash, METH_VARARGS },
 	 { (char *)"delete_pkgSystem", _wrap_delete_pkgSystem, METH_VARARGS },
 	 { (char *)"pkgSystem_swigregister", pkgSystem_swigregister, METH_VARARGS },
 	 { (char *)"Configuration_Find", _wrap_Configuration_Find, METH_VARARGS },
@@ -18653,6 +20139,7 @@
 	 { (char *)"pkgRecordsParser_LongDesc", _wrap_pkgRecordsParser_LongDesc, METH_VARARGS },
 	 { (char *)"pkgRecordsParser_Name", _wrap_pkgRecordsParser_Name, METH_VARARGS },
 	 { (char *)"pkgRecordsParser_GetRec", _wrap_pkgRecordsParser_GetRec, METH_VARARGS },
+	 { (char *)"pkgRecordsParser_HasFile", _wrap_pkgRecordsParser_HasFile, METH_VARARGS },
 	 { (char *)"delete_pkgRecordsParser", _wrap_delete_pkgRecordsParser, METH_VARARGS },
 	 { (char *)"pkgRecordsParser_swigregister", pkgRecordsParser_swigregister, METH_VARARGS },
 	 { (char *)"pkgAcquireItem_DestFile_get", _wrap_pkgAcquireItem_DestFile_get, METH_VARARGS },
@@ -18779,6 +20266,39 @@
 	 { (char *)"delete_GlobalError", _wrap_delete_GlobalError, METH_VARARGS },
 	 { (char *)"GlobalError_swigregister", GlobalError_swigregister, METH_VARARGS },
 	 { (char *)"_GetErrorObj", _wrap__GetErrorObj, METH_VARARGS },
+	 { (char *)"LuaCacheControl_Open", _wrap_LuaCacheControl_Open, METH_VARARGS },
+	 { (char *)"LuaCacheControl_Close", _wrap_LuaCacheControl_Close, METH_VARARGS },
+	 { (char *)"delete_LuaCacheControl", _wrap_delete_LuaCacheControl, METH_VARARGS },
+	 { (char *)"LuaCacheControl_swigregister", LuaCacheControl_swigregister, METH_VARARGS },
+	 { (char *)"Lua_RunInteractive", _wrap_Lua_RunInteractive, METH_VARARGS },
+	 { (char *)"Lua_RunScript", _wrap_Lua_RunScript, METH_VARARGS },
+	 { (char *)"Lua_RunScripts", _wrap_Lua_RunScripts, METH_VARARGS },
+	 { (char *)"Lua_HasScripts", _wrap_Lua_HasScripts, METH_VARARGS },
+	 { (char *)"Lua_ResetScript", _wrap_Lua_ResetScript, METH_VARARGS },
+	 { (char *)"Lua_SetGlobal", _wrap_Lua_SetGlobal, METH_VARARGS },
+	 { (char *)"Lua_ResetGlobals", _wrap_Lua_ResetGlobals, METH_VARARGS },
+	 { (char *)"Lua_GetGlobalStr", _wrap_Lua_GetGlobalStr, METH_VARARGS },
+	 { (char *)"Lua_GetGlobalStrList", _wrap_Lua_GetGlobalStrList, METH_VARARGS },
+	 { (char *)"Lua_GetGlobalNum", _wrap_Lua_GetGlobalNum, METH_VARARGS },
+	 { (char *)"Lua_GetGlobalBool", _wrap_Lua_GetGlobalBool, METH_VARARGS },
+	 { (char *)"Lua_GetGlobalPtr", _wrap_Lua_GetGlobalPtr, METH_VARARGS },
+	 { (char *)"Lua_GetGlobalPkg", _wrap_Lua_GetGlobalPkg, METH_VARARGS },
+	 { (char *)"Lua_GetGlobalPkgList", _wrap_Lua_GetGlobalPkgList, METH_VARARGS },
+	 { (char *)"Lua_SetDepCache", _wrap_Lua_SetDepCache, METH_VARARGS },
+	 { (char *)"Lua_SetCache", _wrap_Lua_SetCache, METH_VARARGS },
+	 { (char *)"Lua_SetCacheControl", _wrap_Lua_SetCacheControl, METH_VARARGS },
+	 { (char *)"Lua_SetProblemResolver", _wrap_Lua_SetProblemResolver, METH_VARARGS },
+	 { (char *)"Lua_SetDontFix", _wrap_Lua_SetDontFix, METH_VARARGS },
+	 { (char *)"Lua_ResetCaches", _wrap_Lua_ResetCaches, METH_VARARGS },
+	 { (char *)"Lua_GetDepCache", _wrap_Lua_GetDepCache, METH_VARARGS },
+	 { (char *)"Lua_GetCache", _wrap_Lua_GetCache, METH_VARARGS },
+	 { (char *)"Lua_GetCacheControl", _wrap_Lua_GetCacheControl, METH_VARARGS },
+	 { (char *)"Lua_GetProblemResolver", _wrap_Lua_GetProblemResolver, METH_VARARGS },
+	 { (char *)"Lua_GetDontFix", _wrap_Lua_GetDontFix, METH_VARARGS },
+	 { (char *)"new_Lua", _wrap_new_Lua, METH_VARARGS },
+	 { (char *)"delete_Lua", _wrap_delete_Lua, METH_VARARGS },
+	 { (char *)"Lua_swigregister", Lua_swigregister, METH_VARARGS },
+	 { (char *)"_GetLuaObj", _wrap__GetLuaObj, METH_VARARGS },
 	 { (char *)"new_pkgAcquireStatusDumb", _wrap_new_pkgAcquireStatusDumb, METH_VARARGS },
 	 { (char *)"delete_pkgAcquireStatusDumb", _wrap_delete_pkgAcquireStatusDumb, METH_VARARGS },
 	 { (char *)"pkgAcquireStatusDumb_swigregister", pkgAcquireStatusDumb_swigregister, METH_VARARGS },
@@ -18828,20 +20348,21 @@
 static swig_type_info _swigt__p_PkgFileIterator[] = {{"_p_PkgFileIterator", 0, "PkgFileIterator *", 0},{"_p_PkgFileIterator"},{"_p_pkgCache__PkgFileIterator"},{0}};
 static swig_type_info _swigt__p_pkgCache__PrvIterator[] = {{"_p_pkgCache__PrvIterator", 0, "pkgCache::PrvIterator *", 0},{"_p_pkgCache__PrvIterator"},{"_p_PrvIterator"},{0}};
 static swig_type_info _swigt__p_pkgCache__DepIterator[] = {{"_p_pkgCache__DepIterator", 0, "pkgCache::DepIterator *", 0},{"_p_pkgCache__DepIterator"},{"_p_DepIterator"},{0}};
-static swig_type_info _swigt__p_VerFileIterator[] = {{"_p_VerFileIterator", 0, "VerFileIterator const &", 0},{"_p_VerFileIterator"},{"_p_pkgCache__VerFileIterator"},{0}};
+static swig_type_info _swigt__p_VerFileIterator[] = {{"_p_VerFileIterator", 0, "VerFileIterator const *", 0},{"_p_VerFileIterator"},{"_p_pkgCache__VerFileIterator"},{0}};
 static swig_type_info _swigt__p_pkgCache__VerIterator[] = {{"_p_pkgCache__VerIterator", 0, "pkgCache::VerIterator *", 0},{"_p_pkgCache__VerIterator"},{"_p_VerIterator"},{0}};
-static swig_type_info _swigt__p_PrvIterator[] = {{"_p_PrvIterator", 0, "PrvIterator const &", 0},{"_p_PrvIterator"},{"_p_pkgCache__PrvIterator"},{0}};
+static swig_type_info _swigt__p_PrvIterator[] = {{"_p_PrvIterator", 0, "PrvIterator const *", 0},{"_p_PrvIterator"},{"_p_pkgCache__PrvIterator"},{0}};
 static swig_type_info _swigt__p_pkgCache__PkgIterator[] = {{"_p_pkgCache__PkgIterator", 0, "pkgCache::PkgIterator *", 0},{"_p_pkgCache__PkgIterator"},{"_p_PkgIterator"},{0}};
 static swig_type_info _swigt__p_pkgCache__PkgFileIterator[] = {{"_p_pkgCache__PkgFileIterator", 0, "pkgCache::PkgFileIterator *", 0},{"_p_pkgCache__PkgFileIterator"},{"_p_PkgFileIterator"},{0}};
 static swig_type_info _swigt__p_VerIterator[] = {{"_p_VerIterator", 0, "VerIterator *", 0},{"_p_VerIterator"},{"_p_pkgCache__VerIterator"},{0}};
-static swig_type_info _swigt__p_PkgIterator[] = {{"_p_PkgIterator", 0, "PkgIterator const &", 0},{"_p_PkgIterator"},{"_p_pkgCache__PkgIterator"},{0}};
+static swig_type_info _swigt__p_PkgIterator[] = {{"_p_PkgIterator", 0, "PkgIterator const *", 0},{"_p_PkgIterator"},{"_p_pkgCache__PkgIterator"},{0}};
 static swig_type_info _swigt__p_DepIterator[] = {{"_p_DepIterator", 0, "DepIterator *", 0},{"_p_DepIterator"},{"_p_pkgCache__DepIterator"},{0}};
 static swig_type_info _swigt__p_pkgSourceList__const_iterator[] = {{"_p_pkgSourceList__const_iterator", 0, "pkgSourceList::const_iterator *", 0},{"_p_pkgSourceList__const_iterator"},{0}};
 static swig_type_info _swigt__p_Configuration__Item[] = {{"_p_Configuration__Item", 0, "Configuration::Item *", 0},{"_p_Configuration__Item"},{"_p_Item"},{0}};
 static swig_type_info _swigt__p_pkgCache__Header[] = {{"_p_pkgCache__Header", 0, "pkgCache::Header *", 0},{"_p_pkgCache__Header"},{"_p_Header"},{0}};
-static swig_type_info _swigt__p_Header[] = {{"_p_Header", 0, "Header &", 0},{"_p_Header"},{"_p_pkgCache__Header"},{0}};
+static swig_type_info _swigt__p_Header[] = {{"_p_Header", 0, "Header *", 0},{"_p_Header"},{"_p_pkgCache__Header"},{0}};
 static swig_type_info _swigt__p_pkgPolicy[] = {{"_p_pkgPolicy", 0, "pkgPolicy *", 0},{"_p_pkgPolicy"},{0}};
-static swig_type_info _swigt__p_Policy[] = {{"_p_Policy", 0, "Policy &", 0},{"_p_Policy"},{0}};
+static swig_type_info _swigt__p_Policy[] = {{"_p_Policy", 0, "Policy *", 0},{"_p_Policy"},{0}};
+static swig_type_info _swigt__p_Lua[] = {{"_p_Lua", 0, "Lua *", 0},{"_p_Lua"},{0}};
 static swig_type_info _swigt__p_Configuration[] = {{"_p_Configuration", 0, "Configuration *", 0},{"_p_Configuration"},{0}};
 static swig_type_info _swigt__p_pkgAcqIndexRel[] = {{"_p_pkgAcqIndexRel", 0, "pkgAcqIndexRel *", 0},{"_p_pkgAcqIndexRel"},{0}};
 static swig_type_info _swigt__p_pkgAcquire[] = {{"_p_pkgAcquire", 0, "pkgAcquire *", 0},{"_p_pkgAcquire"},{0}};
@@ -18850,13 +20371,16 @@
 static swig_type_info _swigt__p_pkgCache__Dependency[] = {{"_p_pkgCache__Dependency", 0, "pkgCache::Dependency *", 0},{"_p_pkgCache__Dependency"},{"_p_Dependency"},{0}};
 static swig_type_info _swigt__p_GlobalError[] = {{"_p_GlobalError", 0, "GlobalError *", 0},{"_p_GlobalError"},{0}};
 static swig_type_info _swigt__p_pkgAcqIndex[] = {{"_p_pkgAcqIndex", 0, "pkgAcqIndex *", 0},{"_p_pkgAcqIndex"},{0}};
-static swig_type_info _swigt__p_StateCache[] = {{"_p_StateCache", 0, "StateCache &", 0},{"_p_StateCache"},{"_p_pkgDepCache__StateCache"},{0}};
+static swig_type_info _swigt__p_LuaCacheControl[] = {{"_p_LuaCacheControl", 0, "LuaCacheControl *", 0},{"_p_LuaCacheControl"},{0}};
+static swig_type_info _swigt__p_std__vectorTpkgCache__Package_p_t[] = {{"_p_std__vectorTpkgCache__Package_p_t", 0, "std::vector<pkgCache::Package * > *", 0},{"_p_std__vectorTpkgCache__Package_p_t"},{0}};
+static swig_type_info _swigt__p_StateCache[] = {{"_p_StateCache", 0, "StateCache *", 0},{"_p_StateCache"},{"_p_pkgDepCache__StateCache"},{0}};
 static swig_type_info _swigt__p_pkgDepCache__StateCache[] = {{"_p_pkgDepCache__StateCache", 0, "pkgDepCache::StateCache *", 0},{"_p_pkgDepCache__StateCache"},{"_p_StateCache"},{0}};
 static swig_type_info _swigt__p_Item[] = {{"_p_Item", 0, "Item const *", 0},{"_p_Configuration__Item"},{"_p_Item"},{0}};
 static swig_type_info _swigt__p_void[] = {{"_p_void", 0, "void *", 0},{"_p_void"},{0}};
 static swig_type_info _swigt__p_pkgAcquire__Item[] = {{"_p_pkgAcquire__Item", 0, "pkgAcquire::Item *", 0},{"_p_pkgAcqArchive", _p_pkgAcqArchiveTo_p_pkgAcquire__Item},{"_p_pkgAcqFile", _p_pkgAcqFileTo_p_pkgAcquire__Item},{"_p_pkgAcqIndex", _p_pkgAcqIndexTo_p_pkgAcquire__Item},{"_p_pkgAcqIndexRel", _p_pkgAcqIndexRelTo_p_pkgAcquire__Item},{"_p_pkgAcquire__Item"},{0}};
 static swig_type_info _swigt__p_MMap[] = {{"_p_MMap", 0, "MMap *", 0},{"_p_MMap"},{0}};
-static swig_type_info _swigt__p_PyObject[] = {{"_p_PyObject", 0, "PyObject *", 0},{"_p_PyObject"},{0}};
+static swig_type_info _swigt__p_std__vectorTchar_const_p_t[] = {{"_p_std__vectorTchar_const_p_t", 0, "std::vector<char const * > *", 0},{"_p_std__vectorTchar_const_p_t"},{0}};
+static swig_type_info _swigt__p_lua_State[] = {{"_p_lua_State", 0, "lua_State *", 0},{"_p_lua_State"},{0}};
 static swig_type_info _swigt__p_pkgRecords__Parser[] = {{"_p_pkgRecords__Parser", 0, "pkgRecords::Parser *", 0},{"_p_pkgRecords__Parser"},{0}};
 static swig_type_info _swigt__p_p_pkgCache__Version[] = {{"_p_p_pkgCache__Version", 0, "pkgCache::Version **", 0},{"_p_p_pkgCache__Version"},{"_p_p_Version"},{0}};
 static swig_type_info _swigt__p_p_Version[] = {{"_p_p_Version", 0, "Version **", 0},{"_p_p_Version"},{"_p_p_pkgCache__Version"},{0}};
@@ -18867,11 +20391,13 @@
 static swig_type_info _swigt__p_p_pkgIndexFile[] = {{"_p_p_pkgIndexFile", 0, "pkgIndexFile **", 0},{"_p_p_pkgIndexFile"},{0}};
 static swig_type_info _swigt__p_pkgProblemResolver[] = {{"_p_pkgProblemResolver", 0, "pkgProblemResolver *", 0},{"_p_pkgProblemResolver"},{0}};
 static swig_type_info _swigt__p_pkgAcqArchive[] = {{"_p_pkgAcqArchive", 0, "pkgAcqArchive *", 0},{"_p_pkgAcqArchive"},{0}};
+static swig_type_info _swigt__p_std__vectorTstd__string_t[] = {{"_p_std__vectorTstd__string_t", 0, "std::vector<string > *", 0},{"_p_std__vectorTstd__string_t"},{0}};
 static swig_type_info _swigt__p_p_char[] = {{"_p_p_char", 0, "char **", 0},{"_p_p_char"},{0}};
 static swig_type_info _swigt__p_pkgAcquireStatusDumb[] = {{"_p_pkgAcquireStatusDumb", 0, "pkgAcquireStatusDumb *", 0},{"_p_pkgAcquireStatusDumb"},{0}};
 static swig_type_info _swigt__p_pkgCacheFile[] = {{"_p_pkgCacheFile", 0, "pkgCacheFile *", 0},{"_p_pkgCacheFile"},{0}};
 static swig_type_info _swigt__p_pkgAcquire__ItemDesc[] = {{"_p_pkgAcquire__ItemDesc", 0, "pkgAcquire::ItemDesc *", 0},{"_p_pkgAcquire__ItemDesc"},{0}};
 static swig_type_info _swigt__p_pkgAcquireStatus[] = {{"_p_pkgAcquireStatus", 0, "pkgAcquireStatus *", 0},{"_p_pkgAcquireStatus"},{"_p_pkgAcquireStatusDumb", _p_pkgAcquireStatusDumbTo_p_pkgAcquireStatus},{0}};
+static swig_type_info _swigt__lua_CFunction[] = {{"_lua_CFunction", 0, "lua_CFunction", 0},{"_lua_CFunction"},{0}};
 static swig_type_info _swigt__p_pkgDepCache[] = {{"_p_pkgDepCache", 0, "pkgDepCache *", 0},{"_p_pkgDepCache"},{0}};
 static swig_type_info _swigt__p_DynamicMMap__Pool[] = {{"_p_DynamicMMap__Pool", 0, "DynamicMMap::Pool *", 0},{"_p_DynamicMMap__Pool"},{0}};
 static swig_type_info _swigt__p_pkgPackageManager[] = {{"_p_pkgPackageManager", 0, "pkgPackageManager *", 0},{"_p_pkgPackageManager"},{0}};
@@ -18884,7 +20410,7 @@
 static swig_type_info _swigt__p_std__ostream[] = {{"_p_std__ostream", 0, "std::ostream *", 0},{"_p_std__ostream"},{0}};
 static swig_type_info _swigt__p_pkgAcqFile[] = {{"_p_pkgAcqFile", 0, "pkgAcqFile *", 0},{"_p_pkgAcqFile"},{0}};
 static swig_type_info _swigt__p_pkgSourceList[] = {{"_p_pkgSourceList", 0, "pkgSourceList *", 0},{"_p_pkgSourceList"},{0}};
-static swig_type_info _swigt__p_string[] = {{"_p_string", 0, "string &", 0},{"_p_string"},{0}};
+static swig_type_info _swigt__p_string[] = {{"_p_string", 0, "string *", 0},{"_p_string"},{0}};
 static swig_type_info _swigt__p_p_pkgVersioningSystem[] = {{"_p_p_pkgVersioningSystem", 0, "pkgVersioningSystem **", 0},{"_p_p_pkgVersioningSystem"},{0}};
 static swig_type_info _swigt__p_pkgSystem[] = {{"_p_pkgSystem", 0, "pkgSystem *", 0},{"_p_pkgSystem"},{0}};
 static swig_type_info _swigt__p_p_pkgSystem[] = {{"_p_p_pkgSystem", 0, "pkgSystem **", 0},{"_p_p_pkgSystem"},{0}};
@@ -18892,8 +20418,8 @@
 static swig_type_info _swigt__p_VerFile[] = {{"_p_VerFile", 0, "VerFile *", 0},{"_p_VerFile"},{"_p_pkgCache__VerFile"},{0}};
 static swig_type_info _swigt__p_pkgCache__VerFile[] = {{"_p_pkgCache__VerFile", 0, "pkgCache::VerFile *", 0},{"_p_pkgCache__VerFile"},{"_p_VerFile"},{0}};
 static swig_type_info _swigt__p_pkgAcquire__MethodConfig[] = {{"_p_pkgAcquire__MethodConfig", 0, "pkgAcquire::MethodConfig *", 0},{"_p_pkgAcquire__MethodConfig"},{0}};
-static swig_type_info _swigt__p_pkgCache__Package[] = {{"_p_pkgCache__Package", 0, "pkgCache::Package *", 0},{"_p_pkgCache__Package"},{"_p_Package"},{0}};
 static swig_type_info _swigt__p_Package[] = {{"_p_Package", 0, "Package *", 0},{"_p_Package"},{"_p_pkgCache__Package"},{0}};
+static swig_type_info _swigt__p_pkgCache__Package[] = {{"_p_pkgCache__Package", 0, "pkgCache::Package *", 0},{"_p_pkgCache__Package"},{"_p_Package"},{0}};
 static swig_type_info _swigt__p_unsigned_char[] = {{"_p_unsigned_char", 0, "unsigned char *", 0},{"_p_unsigned_char"},{0}};
 static swig_type_info _swigt__p_pkgRecords[] = {{"_p_pkgRecords", 0, "pkgRecords *", 0},{"_p_pkgRecords"},{0}};
 static swig_type_info _swigt__p_pkgAcquire__Worker[] = {{"_p_pkgAcquire__Worker", 0, "pkgAcquire::Worker *", 0},{"_p_pkgAcquire__Worker"},{0}};
@@ -18922,6 +20448,7 @@
 _swigt__p_Header, 
 _swigt__p_pkgPolicy, 
 _swigt__p_Policy, 
+_swigt__p_Lua, 
 _swigt__p_Configuration, 
 _swigt__p_pkgAcqIndexRel, 
 _swigt__p_pkgAcquire, 
@@ -18930,13 +20457,16 @@
 _swigt__p_pkgCache__Dependency, 
 _swigt__p_GlobalError, 
 _swigt__p_pkgAcqIndex, 
+_swigt__p_LuaCacheControl, 
+_swigt__p_std__vectorTpkgCache__Package_p_t, 
 _swigt__p_StateCache, 
 _swigt__p_pkgDepCache__StateCache, 
 _swigt__p_Item, 
 _swigt__p_void, 
 _swigt__p_pkgAcquire__Item, 
 _swigt__p_MMap, 
-_swigt__p_PyObject, 
+_swigt__p_std__vectorTchar_const_p_t, 
+_swigt__p_lua_State, 
 _swigt__p_pkgRecords__Parser, 
 _swigt__p_p_pkgCache__Version, 
 _swigt__p_p_Version, 
@@ -18947,11 +20477,13 @@
 _swigt__p_p_pkgIndexFile, 
 _swigt__p_pkgProblemResolver, 
 _swigt__p_pkgAcqArchive, 
+_swigt__p_std__vectorTstd__string_t, 
 _swigt__p_p_char, 
 _swigt__p_pkgAcquireStatusDumb, 
 _swigt__p_pkgCacheFile, 
 _swigt__p_pkgAcquire__ItemDesc, 
 _swigt__p_pkgAcquireStatus, 
+_swigt__lua_CFunction, 
 _swigt__p_pkgDepCache, 
 _swigt__p_DynamicMMap__Pool, 
 _swigt__p_pkgPackageManager, 
@@ -18972,8 +20504,8 @@
 _swigt__p_VerFile, 
 _swigt__p_pkgCache__VerFile, 
 _swigt__p_pkgAcquire__MethodConfig, 
-_swigt__p_pkgCache__Package, 
 _swigt__p_Package, 
+_swigt__p_pkgCache__Package, 
 _swigt__p_unsigned_char, 
 _swigt__p_pkgRecords, 
 _swigt__p_pkgAcquire__Worker, 
@@ -19091,6 +20623,7 @@
     
     PyDict_SetItemString(d,(char*)"cvar", SWIG_globals);
     SWIG_addvarlink(SWIG_globals,(char*)"_error",_wrap__error_get, _wrap__error_set);
+    SWIG_addvarlink(SWIG_globals,(char*)"_lua",_wrap__lua_get, _wrap__lua_set);
     SWIG_addvarlink(SWIG_globals,(char*)"pkgVersion",_wrap_pkgVersion_get, _wrap_pkgVersion_set);
     SWIG_addvarlink(SWIG_globals,(char*)"pkgLibVersion",_wrap_pkgLibVersion_get, _wrap_pkgLibVersion_set);
     SWIG_addvarlink(SWIG_globals,(char*)"pkgOS",_wrap_pkgOS_get, _wrap_pkgOS_set);

apt-0.5.15cnc6-r362.patch:

--- NEW FILE apt-0.5.15cnc6-r362.patch ---
Index: lua/Makefile.in
===================================================================
--- lua/Makefile.in	(revision 316)
+++ lua/Makefile.in	(revision 362)
@@ -1809,13 +1809,13 @@
 distclean-generic:
 	-rm -f $(CONFIG_CLEAN_FILES)
 	-rm -f luac/$(DEPDIR)/$(am__dirstamp)
+	-rm -f luac/$(am__dirstamp)
+	-rm -f lua/$(am__dirstamp)
+	-rm -f lua/$(DEPDIR)/$(am__dirstamp)
+	-rm -f local/$(am__dirstamp)
 	-rm -f local/$(DEPDIR)/$(am__dirstamp)
-	-rm -f local/$(am__dirstamp)
 	-rm -f lib/$(am__dirstamp)
 	-rm -f lib/$(DEPDIR)/$(am__dirstamp)
-	-rm -f luac/$(am__dirstamp)
-	-rm -f lua/$(am__dirstamp)
-	-rm -f lua/$(DEPDIR)/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
Index: contrib/log/log.lua
===================================================================
--- contrib/log/log.lua	(revision 0)
+++ contrib/log/log.lua	(revision 362)
@@ -0,0 +1,80 @@
+-- This script will log the changes being introduced by
+-- the transaction which is going to be run, and is based
+-- on an idea of Panu Matilainen. It must be plugged
+-- in the slots Scripts::PM::Pre/Post.
+--
+-- Author: Gustavo Niemeyer <niemeyer at conectiva.com>
+
+if confget("APT::Log::Enable/b", "false") == "false" then
+    return
+end
+
+confset("Dir::Log", "/var/log", true)
+confset("Dir::Log::transaction", "apt.log", true)
+filename = confget("Dir::Log::transaction/f", "/var/log/apt.log")
+
+if script_slot == "Scripts::PM::Pre" then
+    file = io.open(filename, "a+")
+    if not file then
+        print("error: can't open log file at "..filename)
+        return
+    end
+    local removing = {}
+    local installing = {}
+    local reinstalling = {}
+    local downgrading = {}
+    local upgrading = {}
+    for i, pkg in ipairs(pkglist()) do
+        if statkeep(pkg) then
+            -- Do nothing
+        elseif statreinstall(pkg) then
+            table.insert(reinstalling,
+                         string.format("ReInstalling %s %s\n",
+                                       pkgname(pkg),
+                                       verstr(pkgvercur(pkg))))
+        elseif statremove(pkg) then
+            table.insert(removing,
+                         string.format("Removing %s %s\n",
+                                       pkgname(pkg),
+                                       verstr(pkgvercur(pkg))))
+        elseif statnewinstall(pkg) then
+            table.insert(installing,
+                         string.format("Installing %s %s\n",
+                                       pkgname(pkg),
+                                       verstr(pkgverinst(pkg))))
+        elseif statdowngrade(pkg) then
+            table.insert(downgrading,
+                         string.format("Downgrading %s %s to %s\n",
+                                       pkgname(pkg),
+                                       verstr(pkgvercur(pkg)),
+                                       verstr(pkgverinst(pkg))))
+        elseif statupgrade(pkg) then
+            table.insert(upgrading,
+                         string.format("Upgrading %s %s to %s\n",
+                                       pkgname(pkg),
+                                       verstr(pkgvercur(pkg)),
+                                       verstr(pkgverinst(pkg))))
+        end
+    end
+    file:write("Transaction starting at ", os.date(), "\n")
+    local function write(index, str)
+        file:write(str)
+    end
+    table.foreach(removing, write)
+    table.foreach(installing, write)
+    table.foreach(reinstalling, write)
+    table.foreach(downgrading, write)
+    table.foreach(upgrading, write)
+    file:close()
+elseif script_slot == "Scripts::PM::Post" then
+    if transaction_success then
+        word = "succeeded"
+    else
+        word = "failed"
+    end
+    file = io.open(filename, "a+")
+    file:write("Transaction ", word, " at ", os.date(), "\n")
+    file:close()
+end
+
+-- vim:ts=4:sw=4:et
Index: contrib/log/log.conf
===================================================================
--- contrib/log/log.conf	(revision 0)
+++ contrib/log/log.conf	(revision 362)
@@ -0,0 +1,8 @@
+
+APT::Log::Enable "true";
+
+Dir::Log "/var/log";
+Dir::Log::transaction "apt.log";
+
+Scripts::PM::Pre::  "log.lua";
+Scripts::PM::Post:: "log.lua";
Index: contrib/log/README
===================================================================
--- contrib/log/README	(revision 0)
+++ contrib/log/README	(revision 362)
@@ -0,0 +1,11 @@
+This script will log the changes being introduced by
+the transaction which is going to be run, and is based
+on an idea of Panu Matilainen.
+
+This script must be plugged in the slots:
+
+    Scripts::PM::Pre
+    Scripts::PM::Post
+
+Then, when some transaction is run, it will dump information
+about it in /var/log/apt.log, or in the configured file.
Index: contrib/apt-wrapper/apt.1.xml
===================================================================
--- contrib/apt-wrapper/apt.1.xml	(revision 316)
+++ contrib/apt-wrapper/apt.1.xml	(revision 362)
@@ -3,20 +3,27 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 
 <!ENTITY % aptent SYSTEM "apt.ent">
+<!ENTITY rpm "<citerefentry>
+    <refentrytitle><command>rpm</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
 %aptent;
-
 ]>
 
 <refentry>
 
  <refentryinfo>
    <author>
-    <firstname>Richard</firstname>
-    <surname>Bos</surname>
+    <surname>Debian apt development team</surname>
    </author>
+   <author>
+    <surname>Conectiva apt-rpm development team</surname>
+   </author>
    &apt-product;
    <!-- The last update date -->
-   <date>20 February 2004</date>
+   <date>24 June 2004</date>
    <copyright>
     <year>2004</year>
     <holder>Richard Bos</holder>
@@ -64,7 +71,7 @@
  </refsect1>
 
  <refsect1><title>Actions</title>
-  <para>A full list of actions that are supported by <command>apt</command>:
+  <para>Actions supported by <command>apt</command>:
   <literal>add</literal>,
   <literal>autoclean</literal>,
   <literal>build-dep</literal>,
@@ -76,9 +83,13 @@
   <literal>dump</literal>,
   <literal>dumpavail</literal>,
   <literal>gencaches</literal>,
+  <literal>groupinstall</literal>,
+  <literal>groupnames</literal>,
+  <literal>groupremove</literal>,
   <literal>ident</literal>,
   <literal>install</literal>,
   <literal>list-extras</literal>,
+  <literal>list-nodeps</literal>,
   <literal>moo</literal>,
   <literal>pkgnames</literal>,
   <literal>policy</literal>,
@@ -90,6 +101,7 @@
   <literal>script</literal>,
   <literal>search</literal>,
   <literal>show</literal>,
[...8045 lines suppressed...]
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Unterprozesss %s gab Fehlercode zurÃ¼ck (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:376 apt-pkg/rpm/rpmpm.cc:621
+#: apt-pkg/contrib/fileutl.cc:376 apt-pkg/rpm/rpmpm.cc:626
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Unter-Prozess %s stieg unerwartet aus"
@@ -1671,7 +1672,7 @@
 msgstr "kÃ¶nnte RPMFileHandler nicht zurÃ¼ckspulen"
 
 #: apt-pkg/rpm/rpmhandler.cc:160 apt-pkg/rpm/rpmhandler.cc:167
-#: apt-pkg/rpm/rpmpm.cc:680 apt-pkg/rpm/rpmpm.cc:685
+#: apt-pkg/rpm/rpmpm.cc:685 apt-pkg/rpm/rpmpm.cc:690
 #, fuzzy, c-format
 msgid "Failed reading file %s"
 msgstr "Fehler beim AusfÃ¼hren von Script %s"
@@ -1743,7 +1744,7 @@
 "RPM::Allow-Duplicated-Warning \"false\";\n"
 msgstr ""
 
-#: apt-pkg/rpm/rpmlistparser.cc:685
+#: apt-pkg/rpm/rpmlistparser.cc:680
 msgid "Bad NotAutomatic flag"
 msgstr ""
 
@@ -1800,67 +1801,67 @@
 msgid "Failure running script %s"
 msgstr "Fehler beim AusfÃ¼hren von Script %s"
 
-#: apt-pkg/rpm/rpmpm.cc:309
+#: apt-pkg/rpm/rpmpm.cc:312
 msgid "Unknown pkgRPMPM operation."
 msgstr ""
 
-#: apt-pkg/rpm/rpmpm.cc:544
+#: apt-pkg/rpm/rpmpm.cc:549
 msgid "Executing RPM ("
 msgstr "FÃ¼hre RPM aus ("
 
-#: apt-pkg/rpm/rpmpm.cc:584
+#: apt-pkg/rpm/rpmpm.cc:589
 #, fuzzy
 msgid "Could not exec "
 msgstr "Konnte Lock %s nicht bekommen"
 
-#: apt-pkg/rpm/rpmpm.cc:599
+#: apt-pkg/rpm/rpmpm.cc:604
 #, fuzzy
 msgid "Couldn't wait for subprocess"
 msgstr "Konnte Pipe fÃ¼r %s nicht Ã¶ffnen"
 
-#: apt-pkg/rpm/rpmpm.cc:615
+#: apt-pkg/rpm/rpmpm.cc:620
 #, c-format
 msgid "Sub-process %s recieved a segmentation fault."
 msgstr "Unterprozess %s empfing Segmentation-Fault."
 
-#: apt-pkg/rpm/rpmpm.cc:625 apt-pkg/rpm/rpmpm.cc:873
+#: apt-pkg/rpm/rpmpm.cc:630 apt-pkg/rpm/rpmpm.cc:878
 #, fuzzy
 msgid "Done."
 msgstr "Fertig"
 
-#: apt-pkg/rpm/rpmpm.cc:676
+#: apt-pkg/rpm/rpmpm.cc:681
 #, fuzzy, c-format
 msgid "Failed opening %s"
 msgstr "Problem beim Ã–ffnen von %s"
 
-#: apt-pkg/rpm/rpmpm.cc:689 apt-pkg/rpm/rpmpm.cc:713
+#: apt-pkg/rpm/rpmpm.cc:694 apt-pkg/rpm/rpmpm.cc:718
 #, c-format
 msgid "Failed adding %s to transaction %s"
 msgstr ""
 
-#: apt-pkg/rpm/rpmpm.cc:765 apt-pkg/rpm/rpmpm.cc:775
+#: apt-pkg/rpm/rpmpm.cc:770 apt-pkg/rpm/rpmpm.cc:780
 #, fuzzy
 msgid "Could not open RPM database"
 msgstr "kÃ¶nnte RPM-Datenbank nicht Ã¶ffnen"
 
-#: apt-pkg/rpm/rpmpm.cc:812 apt-pkg/rpm/rpmpm.cc:825
+#: apt-pkg/rpm/rpmpm.cc:817 apt-pkg/rpm/rpmpm.cc:830
 msgid "Transaction set check failed"
 msgstr ""
 
-#: apt-pkg/rpm/rpmpm.cc:845
+#: apt-pkg/rpm/rpmpm.cc:850
 #, c-format
 msgid "Ordering failed for %d packages"
 msgstr ""
 
-#: apt-pkg/rpm/rpmpm.cc:849
+#: apt-pkg/rpm/rpmpm.cc:854
 msgid "Committing changes..."
 msgstr ""
 
-#: apt-pkg/rpm/rpmpm.cc:865
+#: apt-pkg/rpm/rpmpm.cc:870
 msgid "Error while running transaction"
 msgstr ""
 
-#: apt-pkg/rpm/rpmpm.cc:871
+#: apt-pkg/rpm/rpmpm.cc:876
 #, fuzzy
 msgid "Some errors occurred while running transaction"
 msgstr "Fehler wÃ¤hrend der Verarbeitung von %s (NewVersion1) aufgetreten"
@@ -1875,12 +1876,16 @@
 msgid "error parsing source list %s"
 msgstr "Fehler beim Parsen der Paketliste %s"
 
-#: apt-pkg/rpm/rpmsystem.cc:410 apt-pkg/pkgcachegen.cc:714
+#: apt-pkg/rpm/rpmsystem.cc:411 apt-pkg/pkgcachegen.cc:714
 #: apt-pkg/pkgcachegen.cc:741 apt-pkg/pkgcachegen.cc:783
 #: apt-pkg/pkgcachegen.cc:788 apt-pkg/pkgcachegen.cc:992
 msgid "Reading Package Lists"
 msgstr "Lese Paketlisten"
 
+#: apt-pkg/rpm/rpmshowprogress.h:121 apt-pkg/rpm/rpmshowprogress.h:123
+msgid "Preparing..."
+msgstr ""
+
 #: apt-pkg/acquire.cc:61
 #, c-format
 msgid "Lists directory %spartial is missing."
@@ -2246,37 +2251,37 @@
 msgid "Malformed line %lu in source list %s (Absolute dist)"
 msgstr "Misbildete Zeile %lu in Quellliste %s (Absolute dist)"
 
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:119
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Misbildete Zeile %lu in Quellliste %s (dist parse)"
 
-#: apt-pkg/sourcelist.cc:206 apt-pkg/sourcelist.cc:230
+#: apt-pkg/sourcelist.cc:209 apt-pkg/sourcelist.cc:233
 #, c-format
 msgid "Vendor block %s is invalid"
 msgstr "Vendor-Block %s ist ungÃ¼ltig"
 
-#: apt-pkg/sourcelist.cc:314
+#: apt-pkg/sourcelist.cc:317
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Zeile %u zu lang in Quellliste %s."
 
-#: apt-pkg/sourcelist.cc:334
+#: apt-pkg/sourcelist.cc:337
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Misbildete Zeile %u in Quellliste %s (type)"
 
-#: apt-pkg/sourcelist.cc:338
+#: apt-pkg/sourcelist.cc:341
 #, c-format
 msgid "Type '%s' is not known in on line %u in source list %s"
 msgstr "Unbekannter Typ '%s' in Zeile %u in Quellliste %s"
 
-#: apt-pkg/sourcelist.cc:347 apt-pkg/sourcelist.cc:350
+#: apt-pkg/sourcelist.cc:350 apt-pkg/sourcelist.cc:353
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Misbildete Zeile %u in Quellliste %s (vendor id)"
 
-#: apt-pkg/sourcelist.cc:364
+#: apt-pkg/sourcelist.cc:367
 #, c-format
 msgid "Unknown vendor ID '%s' in line %u of source list %s"
 msgstr "Unbekannte Vendor-ID '%s' in Zeile %u der Quellliste %s"
@@ -2295,7 +2300,7 @@
 msgid "Unable to parse package file %s (2)"
 msgstr "Ausserstande Paketdatei %s (2) zu parsen"
 
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:202
 msgid ""
 "Please use apt-cdrom to make this CD recognized by APT. apt-get update "
 "cannot be used to add new CDs"
@@ -2303,16 +2308,16 @@
 "Bitte verwenden Sie apt-cdrom um diese CD von APT erkennen zu lassen, apt-"
 "get update kann nicht dazu verwendet werden new CDs hinzuzufÃ¼gen"
 
-#: methods/cdrom.cc:177 methods/cdrom.cc:215
+#: methods/cdrom.cc:210 methods/cdrom.cc:248
 msgid "Wrong CD"
 msgstr "Falsche CD"
 
-#: methods/cdrom.cc:210
+#: methods/cdrom.cc:243
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 
-#: methods/cdrom.cc:233 methods/file.cc:82
+#: methods/cdrom.cc:266 methods/file.cc:82
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 

apt-0.5.15cnc6-scriptdir.patch:

--- NEW FILE apt-0.5.15cnc6-scriptdir.patch ---
--- apt-0.5.15cnc6/contrib/apt-groupinstall/apt-groupinstall.conf.scriptdir	2004-08-14 20:08:50.588071969 +0300
+++ apt-0.5.15cnc6/contrib/apt-groupinstall/apt-groupinstall.conf	2004-08-14 20:09:02.784455510 +0300
@@ -11,7 +11,7 @@
 // For RH-based systems
 Scripts::Groupinstall::Backend "groupinstall-backend-comps.py";
 // For Synaptic task-support
-Synaptic::taskHelperProg "/usr/lib/apt/scripts/groupinstall-backend-comps.py";
+Synaptic::taskHelperProg "/usr/share/apt/scripts/groupinstall-backend-comps.py";
 
 // For Suse systems
 //Scripts::Groupinstall::Backend "groupinstall-backend-suse";
--- apt-0.5.15cnc6/apt-pkg/luaiface.cc.scriptdir	2004-08-14 16:36:06.888236043 +0300
+++ apt-0.5.15cnc6/apt-pkg/luaiface.cc	2004-08-14 16:36:06.974217598 +0300
@@ -76,7 +76,7 @@
 Lua::Lua()
       : DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0)
 {
-   _config->CndSet("Dir::Bin::scripts", "/usr/lib/apt/scripts");
+   _config->CndSet("Dir::Bin::scripts", "/usr/share/apt/scripts");
 
    const luaL_reg lualibs[] = {
       {"base", luaopen_base},


--- NEW FILE apt.cron ---
#!/bin/sh

[ ! -f /var/lock/subsys/apt ] && exit 0

[ -f /etc/sysconfig/apt ] && . /etc/sysconfig/apt

[ $CHECK_ONLY == "yes" ] && OPTS="$OPTS --check-only"
[ $PRESERVE_CONFIG == "yes" ] && OPTS="$OPTS -o rpm::preserve-config=true"
OPTS="$OPTS $EXTRA_OPTIONS"

/usr/bin/apt-get -q update && /usr/bin/apt-get -q -y $OPTS dist-upgrade


--- NEW FILE apt.init ---
#!/bin/bash
#
# apt           This shell script enables the automatic updates by APT
#
# Author:       Seth Vidal <skvidal at phy.duke.edu>
# Modified for APT by Panu Matilainen <pmatilai at welho.com>
#
# chkconfig:	- 50 01
#
# description:  Enable daily run of apt, a program updater.
# processname:  apt-get
# config: /etc/apt/
#

# source function library
. /etc/rc.d/init.d/functions

lockfile=/var/lock/subsys/apt

RETVAL=0

start() {
	echo -n $"Enabling nightly apt update: "
	touch "$lockfile" && success || failure
	RETVAL=$?
	echo
}

stop() {
	echo -n $"Disabling nightly apt update: "
	rm -f "$lockfile" && success || failure
	RETVAL=$?
	echo
}

restart() {
	stop
	start
}

case "$1" in
  start)
	start
	;;
  stop) 
	stop
	;;
  restart|force-reload)
	restart
	;;
  reload)
	;;
  condrestart)
	[ -f "$lockfile" ] && restart
	;;
  status)
	if [ -f $lockfile ]; then
		echo $"Nightly apt update is enabled."
		RETVAL=0
	else
		echo $"Nightly apt update is disabled."
		RETVAL=3
	fi
	;;
  *)
	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
	exit 1
esac

exit $RETVAL


--- NEW FILE apt.sysconfig ---
# Actually perform updates or only check what's available [yes|no]
CHECK_ONLY=no

# Hold back packages with modified configuration files [yes|no]
PRESERVE_CONFIG=no

# Any extra parameters you want to pass to dist-upgrade
EXTRA_OPTIONS=


--- NEW FILE comps2prio.xsl ---
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">

  <xsl:output method="text" encoding="UTF-8" />

  <xsl:template match="comps">
    <xsl:text>Essential:&#xA;</xsl:text>
    <xsl:for-each
      select="group[id='core']/packagelist/packagereq[@type='mandatory']">
      <xsl:sort select="." />
      <xsl:text>  </xsl:text>
      <xsl:value-of select="." />
      <xsl:text>&#xA;</xsl:text>
    </xsl:for-each>
  </xsl:template>

</xsl:stylesheet>


Index: rpmpriorities.1
===================================================================
RCS file: rpmpriorities.1
diff -N rpmpriorities.1
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rpmpriorities.1	17 Jan 2005 22:01:26 -0000	1.3
@@ -0,0 +1,36 @@
+Essential:
+  grub
+  termcap
+  ed
+  kbd
+  iproute
+  libtermcap
+  libgcc
+  setserial
+  file
+  rpm
+  sysklogd
+  losetup
+  kudzu
+  glibc
+  shadow-utils
+  coreutils
+  bash
+  iputils
+  vim-minimal
+  passwd
+  cpio
+  raidtools
+  SysVinit
+  authconfig
+  hdparm
+  hotplug
+  readline
+  util-linux
+  basesystem
+  setup
+  e2fsprogs
+  procps
+  initscripts
+  filesystem
+  fedora-release


Index: rpmpriorities.2
===================================================================
RCS file: rpmpriorities.2
diff -N rpmpriorities.2
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rpmpriorities.2	17 Jan 2005 22:01:26 -0000	1.3
@@ -0,0 +1,36 @@
+Essential:
+  grub
+  termcap
+  ed
+  kbd
+  iproute
+  libtermcap
+  libgcc
+  setserial
+  file
+  rpm
+  sysklogd
+  losetup
+  kudzu
+  glibc
+  shadow-utils
+  coreutils
+  bash
+  iputils
+  vim-minimal
+  passwd
+  cpio
+  raidtools
+  SysVinit
+  authconfig
+  hdparm
+  hotplug
+  readline
+  util-linux
+  basesystem
+  setup
+  e2fsprogs
+  procps
+  initscripts
+  filesystem
+  fedora-release


--- NEW FILE rpmpriorities.3 ---
Essential:
  grub
  termcap
  ed
  kbd
  iproute
  libtermcap
  libgcc
  setserial
  file
  rpm
  sysklogd
  losetup
  kudzu
  glibc
  shadow-utils
  coreutils
  bash
  iputils
  vim-minimal
  passwd
  cpio
  raidtools
  SysVinit
  authconfig
  hdparm
  hotplug
  readline
  util-linux
  basesystem
  setup
  e2fsprogs
  procps
  initscripts
  filesystem
  fedora-release
  udev


--- NEW FILE rpmpriorities.Rawhide ---
Essential:
  grub
  termcap
  ed
  kbd
  iproute
  libtermcap
  libgcc
  setserial
  file
  rpm
  sysklogd
  losetup
  kudzu
  glibc
  shadow-utils
  coreutils
  bash
  iputils
  vim-minimal
  passwd
  cpio
  raidtools
  SysVinit
  authconfig
  hdparm
  hotplug
  readline
  util-linux
  basesystem
  setup
  e2fsprogs
  procps
  initscripts
  filesystem
  fedora-release

apt-0.5.15cnc6-pymake.patch:

Index: apt-0.5.15cnc6-pymake.patch
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt-0.5.15cnc6-pymake.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apt-0.5.15cnc6-pymake.patch	8 Nov 2004 04:04:37 -0000	1.1
+++ apt-0.5.15cnc6-pymake.patch	17 Jan 2005 22:01:26 -0000	1.2
@@ -14,7 +14,7 @@
  
  _%.so: %_wrap.cxx
 -	$(CC) -shared -I.. $(PYTHONFLAGS) $(LUAFLAGS) -L../bin -L../build/bin -lapt-pkg -o $@ $<
-+	$(CC) -shared -I.. -I../include $(PYTHONFLAGS) $(LUAFLAGS) -L../apt-pkg/.libs -lapt-pkg -o $@ $<
++	$(CC) -shared -fPIC -I.. -I../include $(PYTHONFLAGS) $(LUAFLAGS) -L../apt-pkg/.libs -lapt-pkg -o $@ $<
  
  apt_wrap.cxx: apt.i
 -	$(SWIG) $(SWIGFLAGS) -c++ -I.. $(LUAFLAGS) -python $<


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apt.spec	10 Nov 2004 03:05:28 -0000	1.4
+++ apt.spec	17 Jan 2005 22:01:26 -0000	1.5
@@ -1,16 +1,23 @@
 # needed for rpmpriorities and mirror-select.conf:
 %{!?fcrel:%define fcrel %(cut -d' ' -f4 /etc/fedora-release )}
 
-# the python bindings only work with python >= 2.something
-%define pythonver %(echo $(python2 -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v" 2>/dev/null))
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+%define scriptdir %{_datadir}/apt/scripts/
+
+%define generate_rpmpriorities 0
+%define comps %{_datadir}/comps/%{_build_arch}/comps.xml
+
+# subversion revision for svn snapshots
+%define svnver r362
 
 # we need to work around various missing builddeps in rpm :-/
-%{!?rpmver:%define rpmver %(rpm --version | cut -d' ' -f3)}
+%{!?rpmver:%define rpmver %(rpm --version | cut -d' ' -f3 | cut -d. -f1-2)}
 
 Summary: Debian's Advanced Packaging Tool with RPM support.
 Name: apt
 Version: 0.5.15cnc6
-Release: 11
+Release: 12.%{svnver}
 Epoch: 0
 Group: System Environment/Base
 URL: https://moin.conectiva.com.br/AptRpm
@@ -27,12 +34,21 @@
 Source3: vendors.list
 Source4: apt_preferences
 
-# rpmpriorities generated from comps.xml base group
-Source5: rpmpriorities
-
-# Sources 50-99 are for Lua-scripts
-Source50: gpg-checker.lua
-Source51: gpg-import.lua
+# rpmpriorities generated + manually tweaked from comps.xml core group
+Source5: rpmpriorities.1
+Source6: rpmpriorities.2
+Source6: rpmpriorities.3
+Source18: rpmpriorities.Rawhide
+Source19: comps2prio.xsl
+
+# nightly updater scripts & config
+Source20: apt.init
+Source21: apt.cron
+Source22: apt.sysconfig
+
+# Sources 50-99 are for Lua-scripts not in contrib/
+#Source50:
+#Source51:
 Source52: preserve-conf.lua
 Source53: mirror-select.lua
 Source54: upgradevirt.lua
@@ -61,35 +77,46 @@
 Source250: fedora-vendor.list
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Provides: apt-mirrorselect
+
 # Others deps are automatically picked up by rpm
 Requires: gnupg, bzip2
+Requires(post): chkconfig, ldconfig
+Requires(preun): chkconfig
 # Needed by the mirror-selector script
 Requires: wget
 
 BuildRequires: beecrypt-devel
 BuildRequires: elfutils-devel
-BuildRequires: python-devel >= 0:%{pythonver}
+# TODO: verify the required minimum version
+BuildRequires: python-devel >= 0:2.2
 BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext
 BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel
 # for version detection to work 
 BuildRequires: fedora-release
+%if %{generate_rpmpriorities}
+BuildRequires: %{_bindir}/xsltproc, %{comps}
+%endif
 
-%if "%{rpmver}" >= "4.3.1"
+%if "%{rpmver}" == "4.3"
 BuildRequires: libselinux-devel
 %endif
 
 # Fix some issues in python binding build
 Patch1: apt-0.5.15cnc6-pymake.patch
-# Fix segfault in rpm-dir with dangling symlinks 
-Patch2: apt-0.5.5-rpmdir-symlink.patch
+Patch5: apt-0.5.15cnc6-pymake2.patch
+# Update to current svn snapshot: svn diff -r316:%{svnver}
+Patch2: apt-0.5.15cnc6-%{svnver}.patch
 # Make rpm manifest usage configurable
 Patch3: apt-0.5.15cnc5-manifest-limit.patch
-# Docbook build fist, send upstream
+# Docbook build fixes, send upstream
 Patch4: apt-0.5.15cnc6-docbook.patch
-# Make build-dep check for broken dependencies
-Patch5: apt-0.5.15cnc6-build-dep-fixdeps.patch
 # Take read-only, not exclusive rpmdb lock for the initial dependency processing
 Patch6: apt-0.5.15cnc6-rdonly.patch
+# Move scripts from /usr/lib/apt to /usr/share/apt
+Patch7: apt-0.5.15cnc6-scriptdir.patch
+# Update python bindings
+Patch8: apt-0.5.15cnc6-python-update.patch
 
 %description
 A port of Debian's apt tools for RPM based distributions.
@@ -110,19 +137,39 @@
 Summary: Python bindings for libapt-pkg
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: %{_bindir}/python%{pythonver}
+Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 %description python
 The apt-python package contains a module which allows python programs
 to access the APT library interface.
 
+%package groupinstall
+Summary: Add commands to install and remove package groups.
+Group: System Environment/Base
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: rhpl, comps
+%description groupinstall
+This package adds four new commands to apt for installing, removing and viewing
+groups of packages:
+apt-cache groupnames
+apt-cache showgroup <groupname> [<groupname2> ..]
+apt-get groupinstall <groupname> [<groupname2> ..]
+apt-get groupremove <groupname> [<groupname2> ..]
+
+The group information is retrieved from comps.xml used by anaconda (the
+system installer) and other package management tools of RHL/RHEL/FC 
+distributions.
+
+
 %prep
 %setup -q
 %patch1 -p1 -b .pymake
-%patch2 -p1 -b .rpmdir
+%patch2 -p0 -b .svnsnap
 %patch3 -p1 -b .manifest
 %patch4 -p0 -b .docbook
-%patch5 -p0 -b .build-dep-fix
+%patch5 -p0 -b .pymake2
 %patch6 -p1 -b .rdonly
+%patch7 -p1 -b .scriptdir
+%patch8 -p1 -b .pyupdate
 
 # fix docs to reference correct paths
 perl -pi -e \
@@ -130,17 +177,28 @@
    s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
   doc/apt.ent doc/fr/apt.ent.fr
 
+install -pm 644 %{SOURCE19} comps2prio.xsl
+
 
 %build
-# disabling build dep tracking ought to make rpm-building a bit faster
 %configure --disable-dependency-tracking
 
 SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \
-make %{?_smp_mflags} NOISY=1
+make %{?_smp_mflags} 
+
+# prevent re-generation of the python wrapper, requires a patched swig :(
+#touch python/apt.py python/apt_wrap.cxx
+cp python/apt.py python/apt.py.pyupdate
+cp python/apt_wrap.cxx python/apt_wrap.cxx.pyupdate
+make -C python %{?_smp_mflags} PYTHON="%{__python}"
+%{__python} -c "import py_compile; py_compile.compile('python/apt.py')"
+
+%if %{generate_rpmpriorities}
+%{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
+%else
+cp -p $RPM_SOURCE_DIR/rpmpriorities.%{fcrel} rpmpriorities
+%endif
 
-touch python/apt.py python/apt_wrap.cxx
-make -C python %{?_smp_mflags}
-python -c "import py_compile; py_compile.compile('python/apt.py')"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -154,10 +212,8 @@
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/gensrclist
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/state/apt/lists/partial
 
-
 # The config files
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/scripts
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d
@@ -165,7 +221,7 @@
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
 install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
-install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/rpmpriorities
+install -p -m 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
 
 # install config parts
 for cnf in %{SOURCE150} %{SOURCE151}; do
@@ -183,15 +239,28 @@
 done
 
 # Lua scripts
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/apt/scripts
-for script in %{SOURCE50} %{SOURCE51} %{SOURCE52} %{SOURCE53} %{SOURCE54}; do
-	install -p -m 755 $script $RPM_BUILD_ROOT%{_libdir}/apt/scripts/
+mkdir -p $RPM_BUILD_ROOT%{scriptdir}
+for script in %{SOURCE52} %{SOURCE53} %{SOURCE54}; do
+	install -p -m 755 $script $RPM_BUILD_ROOT%{scriptdir}
 done
 
-
 # The python bindings
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/
-install -p -m 755 python/apt.py* python/_apt.so $RPM_BUILD_ROOT%{_libdir}/python%{pythonver}/site-packages/
+mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/
+install -p -m 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/
+install -p -m 644 python/apt.py{c,} $RPM_BUILD_ROOT%{python_sitearch}/
+touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo
+
+# Nightly updater scripts & default config
+install -D -p -m 755 %{SOURCE20} $RPM_BUILD_ROOT/%{_initrddir}/apt
+install -D -p -m 755 %{SOURCE21} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
+install -D -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
+
+# GPG checker from contrib
+install -p -m 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{scriptdir}/
+
+# apt-groupinstall from contrib
+install -p -m 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{scriptdir}
+install -p -m 755 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
 
 # nuke .la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -199,6 +268,7 @@
 # don't require python, lua etc because of stuff in doc/contrib
 find contrib/ -type f |xargs chmod 0644
 
+
 %pre
 if [ $1 -gt 1 ] && [ ! -f %{_sysconfdir}/apt/apt.conf.d/default.conf ]; then
 	mv -f %{_sysconfdir}/apt/apt.conf %{_sysconfdir}/apt/apt.conf.rpmsave
@@ -208,11 +278,19 @@
 	echo "to %{_sysconfdir}/apt/apt.conf"
 fi
 
+%preun
+if [ $1 = 0 ]; then
+ /sbin/service apt stop > /dev/null 2>&1
+ /sbin/chkconfig --del apt
+fi
+exit 0
+
 %post 
 /sbin/ldconfig
 if [ ! -f %{_sysconfdir}/apt/apt.conf ]; then
 	echo "// User customizable configuration goes here" > %{_sysconfdir}/apt/apt.conf
 fi
+/sbin/chkconfig --add apt
 
 %postun -p /sbin/ldconfig
 
@@ -222,13 +300,14 @@
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc AUTHORS* COPYING* ABOUT* TODO doc/examples/ contrib/
+%doc AUTHORS* COPYING* ABOUT* TODO comps2prio.xsl doc/examples/ contrib/
 %dir %{_sysconfdir}/apt
 %dir %{_sysconfdir}/apt/sources.list.d
 %dir %{_sysconfdir}/apt/vendors.list.d
 %dir %{_sysconfdir}/apt/apt.conf.d
 %dir %{_sysconfdir}/apt/gpg
 %{_sysconfdir}/apt/gpg/gpg-pubkey*
+%config(noreplace) %{_sysconfdir}/sysconfig/apt
 %config(noreplace) %{_sysconfdir}/apt/rpmpriorities
 %config(noreplace) %{_sysconfdir}/apt/preferences
 %config(noreplace) %{_sysconfdir}/apt/apt.conf 
@@ -237,8 +316,11 @@
 # NOTE: no noreplace on these because we WANT to be able to change the defaults
 # without user intervention!
 %config %{_sysconfdir}/apt/apt.conf.d/*
+%exclude %{_sysconfdir}/apt/apt.conf.d/apt-groupinstall.conf
 #%config %{_sysconfdir}/apt/sources.list.d/*.list
 %config %{_sysconfdir}/apt/vendors.list.d/*
+%config %{_initrddir}/apt
+%config %{_sysconfdir}/cron.daily/apt.cron
 
 %{_bindir}/apt-cache
 %{_bindir}/apt-cdrom
@@ -250,11 +332,13 @@
 %{_bindir}/genbasedir
 %{_libdir}/*.so.*
 %{_libdir}/apt
+%{_datadir}/apt
+%exclude %{scriptdir}/apt-groupinstall.lua
+%exclude %{scriptdir}/groupinstall-backend-comps.py
 %{_mandir}/man?/*
 %{_localstatedir}/cache/apt
 %{_localstatedir}/state/apt
 
-
 %files devel
 %defattr(-, root, root)
 %{_includedir}/apt-pkg/*
@@ -263,9 +347,26 @@
 
 %files python
 %defattr(-, root, root)
-%{_libdir}/python%{pythonver}/site-packages/*
+%{python_sitearch}/_apt.so
+%{python_sitearch}/apt.py
+%{python_sitearch}/apt.pyc
+%ghost %{python_sitearch}/apt.pyo
+
+%files groupinstall
+%defattr(-, root, root)
+%{_sysconfdir}/apt/apt.conf.d/apt-groupinstall.conf
+%{scriptdir}/apt-groupinstall.lua
+%{scriptdir}/groupinstall-backend-comps.py
+
 
 %changelog
+* Mon Jan 17 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:0.5.15cnc6-12.r362
+- Clean up -python packaging, make everything honor %%{__python}.
+- Build with dependency tracking disabled.
+- "Revert" rpmpriorities and libselinux build-dep stuff to Panu's version.
+- Add experimental auto-generation of rpmpriorities, but don't use it yet.
+- Fix up mirror-select.conf creation.
+
 * Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0.5.15cnc6-11
 - TODO: Somebody with access to www.fedora.us would need to update
   Source151 (mirror-select.conf) and update it for FC3.
@@ -273,6 +374,78 @@
   and fixed the inaccurate conditional BR libselinux-devel which could
   be made unconditional).
 
+* Tue Nov 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.19.r362
+- add rpmpriorities for fc3
+
+* Tue Sep 14 2004 Panu Matilainen <pmatilai at welho.com>
+- don't check rpm's sublevel for selinux-devel requirement
+
+* Wed Aug 18 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r362
+- revision r362
+- add rpmprioties file for rawhide 
+
+* Sat Aug 14 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r361
+- update to revision r361
+- automated updates from cron are now configurable through /etc/sysconfig/apt
+- provide apt-mirrorselect so repo-configs can depend on it
+- preliminary fixes for x86_64:
+  - put scripts to /usr/share/apt/scripts instead of /usr/lib
+  - build python bindings with -fPIC 
+
+* Thu Aug 12 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r360
+- update to revision r360
+- revert back to print() in upgradevirt kernel-module-warning (see #1524/c18)
+
+* Wed Aug 11 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r358
+- update to revision r358
+
+* Tue Jul 13 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r355
+- update to revision r355 for native SELinux support
+
+* Fri Jul 9 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.16.r354
+- fix a typo in apt.cron
+
+* Fri Jul 9 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.15.r354
+- don't run kernel-module magic if no kernel was installed in (dist-)upgrade
+- improve description a bit
+- update to svn r354 (improved virtual package handling in apt-cache)
+
+* Mon Jul 5 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.14.r353
+- add optional script to automatically update from cron
+- use updated gpg checker (with progress reporting) from contrib
+- add new subpackage for groupinstall (to avoid dependening on comps and rhpl
+  for core apt)
+- update to revision 353 from upstream for various bugfixes and enhancements,
+  drop merged patches 
+- remove NOISY=1 from make, hasn't done anything in ages..
+
+* Thu Jun 17 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.13
+- fix grubby handling wrt non-UP kernels
+- never change default kernel if the current default is non-linux system
+- include upstream patch to allow setting custom md5cache path for genbasedir
+
+* Tue Jun 15 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.12
+- don't fiddle with grubby unless a new kernel was actually installed
+- include kernel-sourcecode in allow-duplicated
+- include rpmpriorities for fc2 final
+
+* Fri May 14 2004 Panu Matilainen <pmatilai at welho.com>
+- use rpm's ordering algorithm, not apt's internal
+
+* Mon May 10 2004 Panu Matilainen <pmatilai at welho.com>
+- remove ash from rpmpriorities (#1562)
+- updated version of upgradevirt.lua (#1514)
+
+* Tue May 04 2004 Panu Matilainen <pmatilai at welho.com>
+- set APT::Cache::AllNames to false to make "apt-cache pkgnames" less scary
+
+* Thu Apr 29 2004 Panu Matilainen <pmatilai at welho.com>
+- check for rpm 4.3.1
+
+* Fri Apr 09 2004 Panu Matilainen <pmatilai at welho.com>
+- remove kernel from rpmpriorities, allow-duplicated packages don't work
+  nicely with any higher than standard priority which is the default anyway
+
 * Fri Apr 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.11
 - revert the ctrl-c workaroound, the "cure" is worse than the disease
 


Index: default.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/default.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.conf	8 Nov 2004 04:04:37 -0000	1.1
+++ default.conf	17 Jan 2005 22:01:26 -0000	1.2
@@ -13,15 +13,20 @@
     Show-Upgraded "true";
     Show-Versions "true";
   };
-  
+  Cache
+  {
+    AllNames "false";
+  }  
 };
 
 RPM
 {
+  // Use rpm's ordering, not apt's (which is incorrect for FHL/FC upgrades)
+  Order "true";
   // Completely ignore GnuPG signature packages (introduced in rpm 4.1)
   Ignore { "gpg-pubkey"; };
   // Allow multiple kernel and kernel-related packages to be installed
-  Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; };
+  Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source|sourcecode))?(-(unsupported-modules))?$"; "^gpg-pubkey$"; };
   // XXX: not used currently
   //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|source))?(-(unsupported-modules))?$"; };
   // "Upgrade" allow-duplicated packages as well
@@ -47,7 +52,7 @@
   Init { "gpg-import.lua"; };
   PM
   {
-    Pre { "gpg-checker.lua"; };
+    Pre { "gpg-check.lua"; };
     Post { "upgradevirt.lua"; };
   };
   AptGet
@@ -56,6 +61,7 @@
     DistUpgrade {"upgradevirt.lua"; };
     Install::SelectPackage { "upgradevirt.lua"; };
     Install::PreResolve { "upgradevirt.lua"; };
+    Install::TranslateArg { "upgradevirt.lua"; };
   };
   Synaptic
   {


Index: mirror-select.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/mirror-select.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mirror-select.conf	8 Nov 2004 04:04:43 -0000	1.2
+++ mirror-select.conf	17 Jan 2005 22:01:26 -0000	1.3
@@ -3,5 +3,5 @@
 Scripts::AptGet::Help::Command:: "mirror-select.lua";
 Dir::Etc::sourceparts::mirrorsource "mirror-select.list";
 Dir::State::mirrors "mirrors.list";
-Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fc2-mirrors.list";
-Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fc2-mirrors.list";
+Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fcFCREL-mirrors.list";
+Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fcFCREL-mirrors.list";


Index: upgradevirt.lua
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/upgradevirt.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upgradevirt.lua	8 Nov 2004 04:04:37 -0000	1.1
+++ upgradevirt.lua	17 Jan 2005 22:01:26 -0000	1.2
@@ -1,6 +1,5 @@
 
--- rpm::upgrade-kernel only for backwards compatibility
-if confget("RPM::Upgrade-Virtual/b", "false") == "false" and confget("RPM::Upgrade-Kernel/b", "false") == "false" then
+if confget("RPM::Upgrade-Virtual/b", "false") == "false" then
     return
 end
 
@@ -10,18 +9,41 @@
 function get_kerneltype()
 	for i, ktype in ipairs(knames) do
 		if string.find(posix.uname("%r"), ktype) then
-			return "kernel-"..ktype
+			return ktype
 		end
 	end
 	-- it's either unknown type or normal UP system
-	return "kernel"
+	return ""
+end
+
+-- get package name
+function get_kernelname()
+	suffix = get_kerneltype()
+	if suffix == "" then
+		return "kernel"
+	else
+		return "kernel-"..suffix
+	end
 end
 
 -- if grubby is available set default kernel to version
 function set_default(version)
-	vmlinuz = '/boot/vmlinuz-'..version
-	if posix.access('/sbin/grubby', 'x') and posix.access(vmlinuz, 'f') then
-		os.execute('/sbin/grubby --set-default='..vmlinuz)
+	if not posix.access('/sbin/grubby', 'x') then
+		return
+	end
+	grubby = io.popen("LANG=C /sbin/grubby --default-kernel")
+	for line in grubby.lines(grubby) do
+		-- don't touch the default if it's not a linux system
+		if string.find(line, "vmlinuz") then
+			ktype = get_kerneltype()
+			vmlinuz = '/boot/vmlinuz-'..version..ktype
+			if posix.access(vmlinuz, 'f') then
+				print(_("Setting "..vmlinuz.." as new default kernel."))
+				os.execute('/sbin/grubby --set-default='..vmlinuz)
+			else
+				aptwarning(_("Unable to set new default kernel "..vmlinuz))
+			end
+		end
 	end
 end
 
@@ -33,6 +55,7 @@
 		return
 	end
 
+	seenpkgs = {}
 	pkgs = pkglist()
 	for i, pkg in ipairs(pkgs) do
 		-- oh fun.. loop through all installed packages and see there are
@@ -46,9 +69,10 @@
 						inst = pkgfind(prov.name.."-"..new_version)
 						if inst then
 							markinstall(inst)
-						else
-							print("WARNING: "..prov.name.." not available for kernel "..new_version.."!")
+						elseif not seenpkgs[prov.name] == true then
+							print(_("WARNING: "..prov.name.." not available for kernel "..new_version.."!"))
                     	end                                         
+						seenpkgs[prov.name] = true
 					end
             	end
         	end
@@ -91,10 +115,10 @@
 
 -- mark installed virtualized packages for "upgrade"
 function mark_upgrade(name, pkg)
-	ktype = get_kerneltype()
-	if pkg.inst then
+	kname = get_kernelname()
+	if pkg.inst and not pkgvercur(pkg.pkg) then
 		markinstall(pkg.pkg)
-		if name == ktype then
+		if name == kname and not pkgvercur(pkg.pkg) then
 			confset('Kernel::New-Version', verstr(pkg.ver))
 		end
 	end
@@ -102,14 +126,14 @@
 
 -- find the latest version of given virtual pkg for installation
 function mark_install(virtualpkg)
-	ktype = get_kerneltype()
+	kname = get_kernelname()
 	pkgs = find_instonly_pkgs()
 	for name in pkgs do
 		if name == virtualpkg then
 			selected = pkgs[name].pkg
 		end
 	end
-	if virtualpkg == ktype then
+	if virtualpkg == kname and not pkgvercur(pkgs[virtualpkg].pkg) then
 		confset('Kernel::New-Version', verstr(pkgs[virtualpkg].ver))
 	end
 end
@@ -132,13 +156,13 @@
 	mark_install(virtualname)
 	return
 elseif script_slot == 'Scripts::AptGet::Install::PreResolve' then
-	ktype = get_kerneltype()
+	kname = get_kernelname()
 	if not confexists('Kernel::New-Version') then
 		for i, pkg in ipairs(pkglist()) do
 			idx = string.find(pkgname(pkg), "#")
 			if statinstall(pkg) and idx then
 				name = string.sub(pkgname(pkg), 1, idx-1)
-				if ktype == name then
+				if kname == name and not pkgvercur(pkg) then
 					confset('Kernel::New-Version', verstr(pkgvercand(pkg)))
 				end
 			end
@@ -147,15 +171,28 @@
 	if confexists('Kernel::New-Version') then
 		upgrade_kernel_modules(confget('Kernel::New-Version'))
 	end
+-- if there's no virtual provide without the version in the name
+-- we need to match it here instead of selectpackage
+elseif script_slot == 'Scripts::AptGet::Install::TranslateArg' then
+    modprefix = confgetlist('Kernel::Module-Prefix')
+    for i, prefix in ipairs(modprefix) do
+		if string.find(argument, prefix, 1, true) then
+			translated = argument.."-"..posix.uname("%r")
+		end
+	end
+	return
 elseif script_slot == 'Scripts::AptGet::Upgrade' or 
    script_slot == 'Scripts::AptGet::DistUpgrade' then
 	pkgs = find_instonly_pkgs()
 	table.foreach(pkgs, mark_upgrade)
-	upgrade_kernel_modules(confget('Kernel::New-Version'))
+	if confexists('Kernel::New-Version') then
+		upgrade_kernel_modules(confget('Kernel::New-Version'))
+	end
 elseif script_slot == 'Scripts::PM::Post' then
-	if confget('Kernel::Set-Default/b', "false") == "true" then
+	if confget('Kernel::Set-Default/b', "false") == "true" and 
+       confexists('Kernel::New-Version') then
 		set_default(confget('Kernel::New-Version'))
 	end
 end
 		
--- vim:ts=4
+-- vim:ts=4:sw=4


--- apt-0.5.15cnc6-build-dep-fixdeps.patch DELETED ---


--- apt-0.5.5-rpmdir-symlink.patch DELETED ---


--- rpmpriorities DELETED ---


