summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2008-08-26 19:39:53 +0300
committerGuillem Jover <guillem@debian.org>2008-09-14 04:23:20 +0300
commitdf834c918b565efd02562024ac2060858577a21c (patch)
tree26929dfe592d374f9eeec2daff9662e3876ff8c2
parentae5152d3b002f178394244fb8a8534cdc5a045cf (diff)
downloaddpkg-df834c918b565efd02562024ac2060858577a21c.tar.gz
libdpkg: Move gettext related definitions to a new dpkg-i18n.h
-rw-r--r--ChangeLog66
-rw-r--r--dpkg-deb/build.c2
-rw-r--r--dpkg-deb/extract.c2
-rw-r--r--dpkg-deb/info.c2
-rw-r--r--dpkg-deb/main.c2
-rw-r--r--dpkg-split/info.c2
-rw-r--r--dpkg-split/join.c2
-rw-r--r--dpkg-split/main.c2
-rw-r--r--dpkg-split/queue.c2
-rw-r--r--dpkg-split/split.c2
-rw-r--r--dselect/basecmds.cc2
-rw-r--r--dselect/baselist.cc2
-rw-r--r--dselect/bindings.cc2
-rw-r--r--dselect/helpmsgs.cc2
-rw-r--r--dselect/main.cc2
-rw-r--r--dselect/methlist.cc2
-rw-r--r--dselect/method.cc2
-rw-r--r--dselect/methparse.cc2
-rw-r--r--dselect/pkgdisplay.cc2
-rw-r--r--dselect/pkginfo.cc2
-rw-r--r--dselect/pkglist.cc2
-rw-r--r--dselect/pkgsublist.cc2
-rw-r--r--dselect/pkgtop.cc2
-rw-r--r--lib/Makefile.am1
-rw-r--r--lib/compat.c3
-rw-r--r--lib/compression.c2
-rw-r--r--lib/database.c2
-rw-r--r--lib/dbmodify.c2
-rw-r--r--lib/dpkg-i18n.h36
-rw-r--r--lib/dpkg.h5
-rw-r--r--lib/dump.c2
-rw-r--r--lib/ehandle.c2
-rw-r--r--lib/fields.c2
-rw-r--r--lib/lock.c2
-rw-r--r--lib/log.c2
-rw-r--r--lib/mlib.c2
-rw-r--r--lib/myopt-util.c2
-rw-r--r--lib/myopt.c2
-rw-r--r--lib/nfmalloc.c2
-rw-r--r--lib/parse.c2
-rw-r--r--lib/parsehelp.c2
-rw-r--r--lib/showpkg.c2
-rw-r--r--lib/subproc.c2
-rw-r--r--lib/trigdeferred.l2
-rw-r--r--lib/triglib.c2
-rw-r--r--lib/utils.c2
-rw-r--r--src/archives.c2
-rw-r--r--src/cleanup.c2
-rw-r--r--src/configure.c2
-rw-r--r--src/depcon.c2
-rw-r--r--src/enquiry.c2
-rw-r--r--src/errors.c2
-rw-r--r--src/filesdb.c2
-rw-r--r--src/help.c2
-rw-r--r--src/main.c2
-rw-r--r--src/packages.c2
-rw-r--r--src/pkg-show.c2
-rw-r--r--src/processarc.c2
-rw-r--r--src/query.c2
-rw-r--r--src/remove.c2
-rw-r--r--src/select.c2
-rw-r--r--src/trigcmd.c2
-rw-r--r--src/trigproc.c2
-rw-r--r--src/update.c2
64 files changed, 224 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 687a03545..d7042d0d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,71 @@
2008-09-14 Guillem Jover <guillem@debian.org>
+ * lib/Makefile.am (libdpkg_a_SOURCES): Add 'dpkg-i18n.h'.
+ * lib/dpkg.h: Move <gettext.h> inclusion and ...
+ (_, N_): ... macros to ...
+ * lib/dpkg-i18n.h: ... here. New file.
+ * dpkg-deb/build.c: Include <dpkg-i18n.h>.
+ * dpkg-deb/extract.c: Likewise.
+ * dpkg-deb/info.c: Likewise.
+ * dpkg-deb/main.c: Likewise.
+ * dpkg-split/info.c: Likewise.
+ * dpkg-split/join.c: Likewise.
+ * dpkg-split/main.c: Likewise.
+ * dpkg-split/queue.c: Likewise.
+ * dpkg-split/split.c: Likewise.
+ * dselect/basecmds.cc: Likewise.
+ * dselect/baselist.cc: Likewise.
+ * dselect/bindings.cc: Likewise.
+ * dselect/helpmsgs.cc: Likewise.
+ * dselect/main.cc: Likewise.
+ * dselect/methlist.cc: Likewise.
+ * dselect/method.cc: Likewise.
+ * dselect/methparse.cc: Likewise.
+ * dselect/pkgdisplay.cc: Likewise.
+ * dselect/pkginfo.cc: Likewise.
+ * dselect/pkglist.cc: Likewise.
+ * dselect/pkgsublist.cc: Likewise.
+ * dselect/pkgtop.cc: Likewise.
+ * lib/compression.c: Likewise.
+ * lib/database.c: Likewise.
+ * lib/dbmodify.c: Likewise.
+ * lib/dump.c: Likewise.
+ * lib/ehandle.c: Likewise.
+ * lib/fields.c: Likewise.
+ * lib/lock.c: Likewise.
+ * lib/log.c: Likewise.
+ * lib/mlib.c: Likewise.
+ * lib/myopt-util.c: Likewise.
+ * lib/myopt.c: Likewise.
+ * lib/nfmalloc.c: Likewise.
+ * lib/parse.c: Likewise.
+ * lib/parsehelp.c: Likewise.
+ * lib/showpkg.c: Likewise.
+ * lib/subproc.c: Likewise.
+ * lib/trigdeferred.l: Likewise.
+ * lib/triglib.c: Likewise.
+ * lib/utils.c: Likewise.
+ * src/archives.c: Likewise.
+ * src/cleanup.c: Likewise.
+ * src/configure.c: Likewise.
+ * src/depcon.c: Likewise.
+ * src/enquiry.c: Likewise.
+ * src/errors.c: Likewise.
+ * src/filesdb.c: Likewise.
+ * src/help.c: Likewise.
+ * src/main.c: Likewise.
+ * src/packages.c: Likewise.
+ * src/pkg-show.c: Likewise.
+ * src/processarc.c: Likewise.
+ * src/query.c: Likewise.
+ * src/remove.c: Likewise.
+ * src/select.c: Likewise.
+ * src/trigcmd.c: Likewise.
+ * src/trigproc.c: Likewise.
+ * src/update.c: Likewise
+
+2008-09-14 Guillem Jover <guillem@debian.org>
+
* dselect/baselist.cc (baselist::startdisplay): Unmark debug message
for translation.
* dselect/methlist.cc (methodlist::display): Likewise.
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index b3575dd7b..100458f7b 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -22,6 +22,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index f75225f2d..b7f67adbb 100644
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c
index 05d293cf4..9e7bb72d2 100644
--- a/dpkg-deb/info.c
+++ b/dpkg-deb/info.c
@@ -21,6 +21,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index 64ad82854..9f2cd3eb9 100644
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/dpkg-split/info.c b/dpkg-split/info.c
index 57ee70788..d3130bd5c 100644
--- a/dpkg-split/info.c
+++ b/dpkg-split/info.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
diff --git a/dpkg-split/join.c b/dpkg-split/join.c
index 3736df625..0a6b798d7 100644
--- a/dpkg-split/join.c
+++ b/dpkg-split/join.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
diff --git a/dpkg-split/main.c b/dpkg-split/main.c
index 6e746d303..3a8ed0efa 100644
--- a/dpkg-split/main.c
+++ b/dpkg-split/main.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/dpkg-split/queue.c b/dpkg-split/queue.c
index 199b7812f..2559ab8ed 100644
--- a/dpkg-split/queue.c
+++ b/dpkg-split/queue.c
@@ -29,6 +29,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
diff --git a/dpkg-split/split.c b/dpkg-split/split.c
index 69cc9b3af..2b49424e0 100644
--- a/dpkg-split/split.c
+++ b/dpkg-split/split.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>
diff --git a/dselect/basecmds.cc b/dselect/basecmds.cc
index 6b03fec50..771069cd3 100644
--- a/dselect/basecmds.cc
+++ b/dselect/basecmds.cc
@@ -22,6 +22,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <assert.h>
diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index 9e64a590f..d65770e68 100644
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -22,6 +22,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <assert.h>
diff --git a/dselect/bindings.cc b/dselect/bindings.cc
index 8780eaa17..dcac3b4ae 100644
--- a/dselect/bindings.cc
+++ b/dselect/bindings.cc
@@ -21,6 +21,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <assert.h>
diff --git a/dselect/helpmsgs.cc b/dselect/helpmsgs.cc
index 3cacba29c..f9291ff5b 100644
--- a/dselect/helpmsgs.cc
+++ b/dselect/helpmsgs.cc
@@ -21,6 +21,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include "helpmsgs.h"
const struct helpmessage hlp_listkeys = {
diff --git a/dselect/main.cc b/dselect/main.cc
index 81bb5207c..66d6d853a 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -22,6 +22,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/dselect/methlist.cc b/dselect/methlist.cc
index b133aa663..cd5668b4d 100644
--- a/dselect/methlist.cc
+++ b/dselect/methlist.cc
@@ -22,6 +22,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <assert.h>
diff --git a/dselect/method.cc b/dselect/method.cc
index a4f813429..a5d6aa1ea 100644
--- a/dselect/method.cc
+++ b/dselect/method.cc
@@ -22,6 +22,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/dselect/methparse.cc b/dselect/methparse.cc
index 8be4430bf..875fdce7b 100644
--- a/dselect/methparse.cc
+++ b/dselect/methparse.cc
@@ -21,6 +21,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index 62663b85f..0d60ca3e5 100644
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -21,6 +21,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <assert.h>
diff --git a/dselect/pkginfo.cc b/dselect/pkginfo.cc
index 622290c5c..44e63dbf7 100644
--- a/dselect/pkginfo.cc
+++ b/dselect/pkginfo.cc
@@ -21,6 +21,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <assert.h>
diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index 3557a901c..baf7c934f 100644
--- a/dselect/pkglist.cc
+++ b/dselect/pkglist.cc
@@ -22,6 +22,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <assert.h>
diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc
index f5d2225a0..ad602776d 100644
--- a/dselect/pkgsublist.cc
+++ b/dselect/pkgsublist.cc
@@ -21,6 +21,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <assert.h>
diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc
index 8a0a547ed..c2dda3b2c 100644
--- a/dselect/pkgtop.cc
+++ b/dselect/pkgtop.cc
@@ -21,6 +21,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <assert.h>
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a552ae68a..2557d8a24 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,6 +14,7 @@ noinst_LIBRARIES = libdpkg.a
libdpkg_a_SOURCES = \
dpkg-def.h \
dpkg.h \
+ dpkg-i18n.h \
dpkg-db.h \
dpkg-priv.h \
dlist.h \
diff --git a/lib/compat.c b/lib/compat.c
index d769fd108..1c66379c1 100644
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -32,6 +32,9 @@
#include <unistd.h>
#include <dpkg.h>
+#include <gettext.h>
+
+#define _(str) gettext(str)
#ifndef HAVE_VSNPRINTF
int vsnprintf (char *buf, size_t maxsize, const char *fmt, va_list al) {
diff --git a/lib/compression.c b/lib/compression.c
index df2d251a9..81ac49960 100644
--- a/lib/compression.c
+++ b/lib/compression.c
@@ -1,5 +1,7 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/lib/database.c b/lib/database.c
index 65b26bbc5..97424ce05 100644
--- a/lib/database.c
+++ b/lib/database.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <ctype.h>
#include <string.h>
diff --git a/lib/dbmodify.c b/lib/dbmodify.c
index 7a36a2302..430a0167f 100644
--- a/lib/dbmodify.c
+++ b/lib/dbmodify.c
@@ -21,6 +21,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/lib/dpkg-i18n.h b/lib/dpkg-i18n.h
new file mode 100644
index 000000000..d89667f75
--- /dev/null
+++ b/lib/dpkg-i18n.h
@@ -0,0 +1,36 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * dpkg-i18n.h - private i18n support
+ *
+ * Copyright © 2008 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with dpkg; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef DPKG_I18N_H
+#define DPKG_I18N_H
+
+#include <dpkg-def.h>
+
+DPKG_BEGIN_DECLS
+
+#include <gettext.h>
+
+#define _(str) gettext(str)
+#define N_(str) gettext_noop(str)
+
+DPKG_END_DECLS
+
+#endif /* DPKG_I18N_H */
diff --git a/lib/dpkg.h b/lib/dpkg.h
index 71b92aed1..693b05b32 100644
--- a/lib/dpkg.h
+++ b/lib/dpkg.h
@@ -453,15 +453,10 @@ void unsetenv(const char *x);
/* Take care of NLS matters. */
-#include <gettext.h>
#if HAVE_LOCALE_H
# include <locale.h>
#endif
-/* Make gettext a little friendlier */
-#define _(String) gettext (String)
-#define N_(String) gettext_noop (String)
-
DPKG_END_DECLS
#endif /* DPKG_H */
diff --git a/lib/dump.c b/lib/dump.c
index ec61440cf..353238eca 100644
--- a/lib/dump.c
+++ b/lib/dump.c
@@ -23,6 +23,8 @@
/* FIXME: don't write uninteresting packages */
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <errno.h>
diff --git a/lib/ehandle.c b/lib/ehandle.c
index 883f325e6..bb056fbf0 100644
--- a/lib/ehandle.c
+++ b/lib/ehandle.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/lib/fields.c b/lib/fields.c
index 030671903..42a7062ea 100644
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -21,6 +21,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <ctype.h>
#include <string.h>
diff --git a/lib/lock.c b/lib/lock.c
index 48605f523..0148bd07a 100644
--- a/lib/lock.c
+++ b/lib/lock.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/log.c b/lib/log.c
index 3c4fb1245..bd08ba619 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -21,6 +21,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
diff --git a/lib/mlib.c b/lib/mlib.c
index 1dd8187b5..c13819125 100644
--- a/lib/mlib.c
+++ b/lib/mlib.c
@@ -21,6 +21,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/lib/myopt-util.c b/lib/myopt-util.c
index 3fda46277..4f494558c 100644
--- a/lib/myopt-util.c
+++ b/lib/myopt-util.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
diff --git a/lib/myopt.c b/lib/myopt.c
index 2f3697c88..fd4c14ea0 100644
--- a/lib/myopt.c
+++ b/lib/myopt.c
@@ -21,6 +21,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <string.h>
#include <errno.h>
#include <ctype.h>
diff --git a/lib/nfmalloc.c b/lib/nfmalloc.c
index cbe6f50a3..b9ebdd21c 100644
--- a/lib/nfmalloc.c
+++ b/lib/nfmalloc.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdlib.h>
#include <string.h>
diff --git a/lib/parse.c b/lib/parse.c
index 9978ca49e..b66975539 100644
--- a/lib/parse.c
+++ b/lib/parse.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <ctype.h>
diff --git a/lib/parsehelp.c b/lib/parsehelp.c
index 5902f3155..9d376359e 100644
--- a/lib/parsehelp.c
+++ b/lib/parsehelp.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <ctype.h>
#include <string.h>
diff --git a/lib/showpkg.c b/lib/showpkg.c
index a2555318d..e924951ec 100644
--- a/lib/showpkg.c
+++ b/lib/showpkg.c
@@ -19,6 +19,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/subproc.c b/lib/subproc.c
index 864000d17..ec3b0db22 100644
--- a/lib/subproc.c
+++ b/lib/subproc.c
@@ -21,6 +21,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <errno.h>
#include <stdio.h>
#include <string.h>
diff --git a/lib/trigdeferred.l b/lib/trigdeferred.l
index ef9ee0f7e..40924935b 100644
--- a/lib/trigdeferred.l
+++ b/lib/trigdeferred.l
@@ -37,6 +37,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <sys/stat.h>
#include <sys/fcntl.h>
diff --git a/lib/triglib.c b/lib/triglib.c
index 8662a30c8..8581ac46c 100644
--- a/lib/triglib.c
+++ b/lib/triglib.c
@@ -22,6 +22,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <assert.h>
#include <unistd.h>
#include <errno.h>
diff --git a/lib/utils.c b/lib/utils.c
index 060cff221..5d7728902 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -19,6 +19,8 @@
*/
#include <config.h>
+
+#include <dpkg-i18n.h>
#include <dpkg.h>
#include <string.h>
diff --git a/src/archives.c b/src/archives.c
index 52153f119..3e01f1c1e 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -21,6 +21,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <errno.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/cleanup.c b/src/cleanup.c
index 49423b8ae..0892a5bce 100644
--- a/src/cleanup.c
+++ b/src/cleanup.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <errno.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/configure.c b/src/configure.c
index 9414c9f21..244fe71d2 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -21,6 +21,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <errno.h>
#include <signal.h>
#include <stdio.h>
diff --git a/src/depcon.c b/src/depcon.c
index c145501a8..b206698d2 100644
--- a/src/depcon.c
+++ b/src/depcon.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <errno.h>
#include <unistd.h>
#include <sys/stat.h>
diff --git a/src/enquiry.c b/src/enquiry.c
index 70057473f..334f45276 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -22,6 +22,8 @@
/* FIXME: per-package audit */
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/errors.c b/src/errors.c
index 2e04ba1b0..c90c159db 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/filesdb.c b/src/filesdb.c
index b060e1ecf..4c06e5271 100644
--- a/src/filesdb.c
+++ b/src/filesdb.c
@@ -21,6 +21,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <assert.h>
#include <unistd.h>
#include <fcntl.h>
diff --git a/src/help.c b/src/help.c
index 9857fe5a3..a486c470b 100644
--- a/src/help.c
+++ b/src/help.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <errno.h>
#include <unistd.h>
#include <dirent.h>
diff --git a/src/main.c b/src/main.c
index c51cfa876..35d6e5581 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/packages.c b/src/packages.c
index 36154551f..ba54071d3 100644
--- a/src/packages.c
+++ b/src/packages.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/pkg-show.c b/src/pkg-show.c
index c3397c5bb..fdf0ed4fb 100644
--- a/src/pkg-show.c
+++ b/src/pkg-show.c
@@ -21,6 +21,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <string.h>
#include <dpkg.h>
diff --git a/src/processarc.c b/src/processarc.c
index 42e40032f..f8f9f4a99 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <errno.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/query.c b/src/query.c
index e43e5494c..8d8b648a8 100644
--- a/src/query.c
+++ b/src/query.c
@@ -21,6 +21,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/remove.c b/src/remove.c
index f43a8724c..2f70727a5 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <errno.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/select.c b/src/select.c
index 12a720123..637533050 100644
--- a/src/select.c
+++ b/src/select.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <assert.h>
diff --git a/src/trigcmd.c b/src/trigcmd.c
index a97c61c10..ff8dcf313 100644
--- a/src/trigcmd.c
+++ b/src/trigcmd.c
@@ -21,6 +21,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/trigproc.c b/src/trigproc.c
index e952a0560..e9072e952 100644
--- a/src/trigproc.c
+++ b/src/trigproc.c
@@ -22,6 +22,8 @@
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <assert.h>
#include <sys/stat.h>
#include <sys/fcntl.h>
diff --git a/src/update.c b/src/update.c
index a9be505ad..ab289d4d0 100644
--- a/src/update.c
+++ b/src/update.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <dpkg-i18n.h>
+
#include <errno.h>
#include <stdio.h>
#include <string.h>