The following commit has been merged in the master branch:
commit 8b73de55151677444cfc4745e501b8dd0992374d
Author: Guillem Jover <[email protected]>
Date: Sat Sep 5 05:26:58 2009 +0200
Move pkg-array to libdpkg
diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am
index 428c95f..a1eedd6 100644
--- a/lib/dpkg/Makefile.am
+++ b/lib/dpkg/Makefile.am
@@ -40,6 +40,7 @@ libdpkg_a_SOURCES = \
parsehelp.c \
parsedump.h \
path.c path.h \
+ pkg-array.c pkg-array.h \
progress.c progress.h \
showpkg.c \
string.c string.h \
diff --git a/src/pkg-array.c b/lib/dpkg/pkg-array.c
similarity index 98%
rename from src/pkg-array.c
rename to lib/dpkg/pkg-array.c
index faa4f0b..ddebb0a 100644
--- a/src/pkg-array.c
+++ b/lib/dpkg/pkg-array.c
@@ -29,8 +29,7 @@
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
-
-#include "pkg-array.h"
+#include <dpkg/pkg-array.h>
int
pkglistqsortcmp(const void *a, const void *b)
diff --git a/src/pkg-array.h b/lib/dpkg/pkg-array.h
similarity index 93%
rename from src/pkg-array.h
rename to lib/dpkg/pkg-array.h
index 6d0c1be..939b386 100644
--- a/src/pkg-array.h
+++ b/lib/dpkg/pkg-array.h
@@ -19,6 +19,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifndef DPKG_PKG_ARRAY_H
+#define DPKG_PKG_ARRAY_H
+
#include <config.h>
#include <compat.h>
@@ -39,3 +42,4 @@ void pkg_array_free(struct pkg_array *a);
DPKG_END_DECLS
+#endif /* DPKG_PKG_ARRAY_H */
diff --git a/src/Makefile.am b/src/Makefile.am
index 0270f3d..820cf1c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,6 @@ dpkg_SOURCES = \
help.c \
main.c main.h \
packages.c \
- pkg-array.c pkg-array.h \
pkg-show.c \
processarc.c \
remove.c \
@@ -45,7 +44,6 @@ dpkg_LDADD = \
dpkg_query_SOURCES = \
filesdb.c filesdb.h \
divertdb.c \
- pkg-array.c pkg-array.h \
pkg-show.c \
query.c
diff --git a/src/query.c b/src/query.c
index 68244ac..997aacb 100644
--- a/src/query.c
+++ b/src/query.c
@@ -43,10 +43,10 @@
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
+#include <dpkg/pkg-array.h>
#include <dpkg/path.h>
#include <dpkg/myopt.h>
-#include "pkg-array.h"
#include "filesdb.h"
#include "main.h"
diff --git a/src/select.c b/src/select.c
index 1cd1060..27df49e 100644
--- a/src/select.c
+++ b/src/select.c
@@ -31,9 +31,9 @@
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
+#include <dpkg/pkg-array.h>
#include <dpkg/myopt.h>
-#include "pkg-array.h"
#include "filesdb.h"
#include "main.h"
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
