The following commit has been merged in the master branch:
commit 499088b2a6e94991d516cb7ee851698ccea5192b
Author: Guillem Jover <guil...@debian.org>
Date: Tue Aug 3 03:10:01 2010 +0200
Move glob module to libdpkg
diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am
index 7d4b26a..c366251 100644
--- a/lib/dpkg/Makefile.am
+++ b/lib/dpkg/Makefile.am
@@ -35,6 +35,7 @@ libdpkg_a_SOURCES = \
ehandle.c \
file.c \
fields.c \
+ glob.c \
i18n.h \
log.c \
md5.c md5.h \
@@ -70,6 +71,7 @@ pkginclude_HEADERS = \
dpkg.h \
dpkg-db.h \
file.h \
+ glob.h \
macros.h \
myopt.h \
parsedump.h \
diff --git a/src/glob.c b/lib/dpkg/glob.c
similarity index 98%
rename from src/glob.c
rename to lib/dpkg/glob.c
index 475e7da..f2a6e50 100644
--- a/src/glob.c
+++ b/lib/dpkg/glob.c
@@ -24,8 +24,7 @@
#include <stdlib.h>
#include <dpkg/dpkg.h>
-
-#include "glob.h"
+#include <dpkg/glob.h>
void
glob_list_prepend(struct glob_node **list, char *pattern)
diff --git a/src/glob.h b/lib/dpkg/glob.h
similarity index 93%
rename from src/glob.h
rename to lib/dpkg/glob.h
index fbab69a..5cd44f2 100644
--- a/src/glob.h
+++ b/lib/dpkg/glob.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef DPKG_GLOB_H
-#define DPKG_GLOB_H
+#ifndef LIBDPKG_GLOB_H
+#define LIBDPKG_GLOB_H
#include <dpkg/macros.h>
@@ -35,4 +35,4 @@ void glob_list_free(struct glob_node *head);
DPKG_END_DECLS
-#endif /* DPKG_GLOB_H */
+#endif /* LIBDPKG_GLOB_H */
diff --git a/lib/dpkg/libdpkg.Versions b/lib/dpkg/libdpkg.Versions
index fc34370..b3b5706 100644
--- a/lib/dpkg/libdpkg.Versions
+++ b/lib/dpkg/libdpkg.Versions
@@ -72,6 +72,9 @@ LIBDPKG_PRIVATE {
file_copy_perms;
+ glob_list_prepend;
+ glob_list_free;
+
# Buffer I/O functions
buffer_init;
buffer_read;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9291570..92d71a5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,6 +11,7 @@ lib/dpkg/dump.c
lib/dpkg/ehandle.c
lib/dpkg/fields.c
lib/dpkg/file.c
+lib/dpkg/glob.c
lib/dpkg/log.c
lib/dpkg/md5.c
lib/dpkg/mlib.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 7656d45..063ab05 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,7 +48,6 @@ dpkg_LDADD = \
$(SELINUX_LIBS)
dpkg_divert_SOURCES = \
- glob.c glob.h \
filesdb.c filesdb.h \
divertdb.c \
divertcmd.c
@@ -69,7 +68,6 @@ dpkg_query_LDADD = \
$(LIBINTL)
dpkg_statoverride_SOURCES = \
- glob.c glob.h \
filesdb.c filesdb.h \
statdb.c \
statcmd.c
diff --git a/src/divertcmd.c b/src/divertcmd.c
index 1e7614f..ca17939 100644
--- a/src/divertcmd.c
+++ b/src/divertcmd.c
@@ -39,10 +39,10 @@
#include <dpkg/dpkg.h>
#include <dpkg/dpkg-db.h>
#include <dpkg/file.h>
+#include <dpkg/glob.h>
#include <dpkg/buffer.h>
#include <dpkg/myopt.h>
-#include "glob.h"
#include "filesdb.h"
diff --git a/src/statcmd.c b/src/statcmd.c
index b398650..ce70433 100644
--- a/src/statcmd.c
+++ b/src/statcmd.c
@@ -42,10 +42,10 @@
#include <dpkg/dpkg-db.h>
#include <dpkg/path.h>
#include <dpkg/dir.h>
+#include <dpkg/glob.h>
#include <dpkg/myopt.h>
#include "main.h"
-#include "glob.h"
#include "filesdb.h"
const char thisname[] = "dpkg-statoverrides";
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
