[ABI break] use int for the package IDs (thanks to Steve Cotton)

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 59d5003bba4f7ecc0f151b1c8e82ba94639d13eb..759e9a2251fdf8d706c91ee9adf67123c545b201 100644 (file)
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -214,7 +214,7 @@ struct pkgCache::Package
    unsigned char InstState;         // Flags
    unsigned char CurrentState;      // State
    
    unsigned char InstState;         // Flags
    unsigned char CurrentState;      // State
    

-   unsigned short ID;
+   unsigned int ID;

    unsigned long Flags;
 };
 
    unsigned long Flags;
 };
 


@@ -235,7 +235,7 @@ struct pkgCache::PackageFile
    
    // Linked list
    map_ptrloc NextFile;        // PackageFile
    
    // Linked list
    map_ptrloc NextFile;        // PackageFile

-   unsigned short ID;
+   unsigned int ID;

    time_t mtime;                  // Modification time for the file
 };
 
    time_t mtime;                  // Modification time for the file
 };
 


@@ -272,7 +272,7 @@ struct pkgCache::Version
    map_ptrloc Size;              // These are the .deb size
    map_ptrloc InstalledSize;
    unsigned short Hash;
    map_ptrloc Size;              // These are the .deb size
    map_ptrloc InstalledSize;
    unsigned short Hash;

-   unsigned short ID;
+   unsigned int ID;

    unsigned char Priority;
 };
 
    unsigned char Priority;
 };
 


@@ -289,7 +289,7 @@ struct pkgCache::Description
    map_ptrloc NextDesc;          // Description
    map_ptrloc ParentPkg;         // Package
 
    map_ptrloc NextDesc;          // Description
    map_ptrloc ParentPkg;         // Package
 

-   unsigned short ID;
+   unsigned int ID;

 };
 
 struct pkgCache::Dependency
 };
 
 struct pkgCache::Dependency

diff --git a/debian/changelog b/debian/changelog
index caef53bafc80f07b156896e47c4d5ffee175e291..f778fbe1d1379b3d2274f20c4e17279e53d5082b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ apt (0.7.21) UNRELEASED; urgency=low
     - fix TimeToStr i18n (LP: #289807)
   * [ABI break] merge support for http redirects, thanks to
     Jeff Licquia and Anthony Towns
     - fix TimeToStr i18n (LP: #289807)
   * [ABI break] merge support for http redirects, thanks to
     Jeff Licquia and Anthony Towns

+  * [ABI break] use int for the package IDs (thanks to Steve Cotton)

 
   [ Dereck Wonnacott ]
   * apt-ftparchive might write corrupt Release files (LP: #46439)
 
   [ Dereck Wonnacott ]
   * apt-ftparchive might write corrupt Release files (LP: #46439)