8 files changed, 23 insertions, 23 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 7694330f9..72b654b01 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: configuration.cc,v 1.2 1998/07/09 05:12:33 jgg Exp $
+// $Id: configuration.cc,v 1.3 1998/07/12 23:58:44 jgg Exp $
 /* ######################################################################
 
    Configuration Class
@@ -13,9 +13,9 @@
 									/*}}}*/
 // Include files							/*{{{*/
 #ifdef __GNUG__
-#pragma implementation "pkglib/configuration.h"
+#pragma implementation "apt-pkg/configuration.h"
 #endif
-#include <pkglib/configuration.h>
+#include <apt-pkg/configuration.h>
 #include <strutl.h>
 
 #include <stdio.h>
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index bd06f5e37..9229a0f66 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: configuration.h,v 1.2 1998/07/09 05:12:34 jgg Exp $
+// $Id: configuration.h,v 1.3 1998/07/12 23:58:45 jgg Exp $
 /* ######################################################################
 
    Configuration Class
@@ -25,7 +25,7 @@
 #define PKGLIB_CONFIGURATION_H
 
 #ifdef __GNUG__
-#pragma interface "pkglib/configuration.h"
+#pragma interface "apt-pkg/configuration.h"
 #endif 
 
 #include <string>
diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index d1ea1b87b..d31aaf1b1 100644
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: error.cc,v 1.2 1998/07/07 04:17:10 jgg Exp $
+// $Id: error.cc,v 1.3 1998/07/12 23:58:46 jgg Exp $
 /* ######################################################################
    
    Global Erorr Class - Global error mechanism
@@ -15,7 +15,7 @@
 									/*}}}*/
 // Include Files							/*{{{*/
 #ifdef __GNUG__
-#pragma implementation "pkglib/error.h"
+#pragma implementation "apt-pkg/error.h"
 #endif 
 
 #include <errno.h>
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include <pkglib/error.h>
+#include <apt-pkg/error.h>
    									/*}}}*/
 
 GlobalError *_error = new GlobalError;
diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h
index 06367592b..5d015c417 100644
--- a/apt-pkg/contrib/error.h
+++ b/apt-pkg/contrib/error.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: error.h,v 1.2 1998/07/07 04:17:11 jgg Exp $
+// $Id: error.h,v 1.3 1998/07/12 23:58:47 jgg Exp $
 /* ######################################################################
    
    Global Erorr Class - Global error mechanism
@@ -42,7 +42,7 @@
 #define PKGLIB_ERROR_H
 
 #ifdef __GNUG__
-#pragma interface "pkglib/error.h"
+#pragma interface "apt-pkg/error.h"
 #endif 
 
 #include <string>
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 29b12bef1..1b087696d 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: fileutl.cc,v 1.3 1998/07/07 04:17:12 jgg Exp $
+// $Id: fileutl.cc,v 1.4 1998/07/12 23:58:48 jgg Exp $
 /* ######################################################################
    
    File Utilities
@@ -15,10 +15,10 @@
 									/*}}}*/
 // Include Files							/*{{{*/
 #ifdef __GNUG__
-#pragma implementation "pkglib/fileutl.h"
+#pragma implementation "apt-pkg/fileutl.h"
 #endif 
-#include <pkglib/fileutl.h>
-#include <pkglib/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/error.h>
 
 #include <unistd.h>
 #include <sys/stat.h>
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index aa2d2ee2e..3328ce2b4 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: fileutl.h,v 1.2 1998/07/07 04:17:13 jgg Exp $
+// $Id: fileutl.h,v 1.3 1998/07/12 23:58:49 jgg Exp $
 /* ######################################################################
    
    File Utilities
@@ -23,7 +23,7 @@
 #define PKGLIB_FILEUTL_H
 
 #ifdef __GNUG__
-#pragma interface "pkglib/fileutl.h"
+#pragma interface "apt-pkg/fileutl.h"
 #endif 
 
 #include <string>
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index c0cc13f00..ccb706eab 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: mmap.cc,v 1.4 1998/07/07 04:17:14 jgg Exp $
+// $Id: mmap.cc,v 1.5 1998/07/12 23:58:50 jgg Exp $
 /* ######################################################################
    
    MMap Class - Provides 'real' mmap or a faked mmap using read().
@@ -22,12 +22,12 @@
 									/*}}}*/
 // Include Files							/*{{{*/
 #ifdef __GNUG__
-#pragma implementation "pkglib/mmap.h"
+#pragma implementation "apt-pkg/mmap.h"
 #endif 
 
 #define _BSD_SOURCE
-#include <pkglib/mmap.h>
-#include <pkglib/error.h>
+#include <apt-pkg/mmap.h>
+#include <apt-pkg/error.h>
 
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index 55feda741..0e80c15d2 100644
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: mmap.h,v 1.3 1998/07/07 04:17:15 jgg Exp $
+// $Id: mmap.h,v 1.4 1998/07/12 23:58:51 jgg Exp $
 /* ######################################################################
    
    MMap Class - Provides 'real' mmap or a faked mmap using read().
@@ -27,11 +27,11 @@
 #define PKGLIB_MMAP_H
 
 #ifdef __GNUG__
-#pragma interface "pkglib/mmap.h"
+#pragma interface "apt-pkg/mmap.h"
 #endif
 
 #include <string>
-#include <pkglib/fileutl.h>
+#include <apt-pkg/fileutl.h>
 
 class MMap
 {