merged rpmlib.h and package.h

CVS patchset: 641
CVS date: 1996/06/17 19:43:55

install.c

@@ -8,7 +8,6 @@
 #include "ftp.h"
 #include "install.h"
 #include "lib/rpmlib.h"
-#include "lib/package.h"
 #include "messages.h"
 #include "query.h"
 

lib/install.c

@@ -17,7 +17,6 @@
 #include "install.h"
 #include "md5.h"
 #include "misc.h"
-#include "package.h"
 #include "rpmerr.h"
 #include "rpmlib.h"
 

lib/package.c

@@ -7,7 +7,6 @@
 #include "header.h"
 #include "misc.h"
 #include "oldheader.h"
-#include "package.h"
 #include "rpmerr.h"
 #include "rpmlead.h"
 #include "rpmlib.h"

lib/rpmlib.h

@@ -15,6 +15,11 @@ struct rpmTagTableEntry {
     int val;
 };
 
+int pkgReadHeader(int fd, Header * hdr, int * isSource);
+   /* 0 = success */
+   /* 1 = bad magic */
+   /* 2 = error */
+
 extern const struct rpmTagTableEntry rpmTagTable[];
 extern const int rpmTagTableSize;
 

query.c

@@ -11,7 +11,6 @@
 #include <unistd.h>
 
 #include "lib/messages.h"
-#include "lib/package.h"
 #include "rpmlib.h"
 #include "query.h"
 

rpm2cpio.c

@@ -5,7 +5,6 @@
 #include <fcntl.h>
 #include <zlib.h>
 
-#include "lib/package.h"
 #include "rpmlib.h"
 
 char *zlib_err [] = {

verify.c

@@ -5,7 +5,6 @@
 #include <unistd.h>
 
 #include "lib/messages.h"
-#include "lib/package.h"
 #include "query.h"
 #include "rpmlib.h"
 #include "verify.h"