libdpkg: Move gettext related definitions to a new dpkg-i18n.h

ChangeLog

@@ -1,3 +1,69 @@
+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

dpkg-deb/build.c

@@ -22,6 +22,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

dpkg-deb/extract.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

dpkg-deb/info.c

@@ -21,6 +21,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

dpkg-deb/main.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

dpkg-split/info.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>

dpkg-split/join.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>

dpkg-split/main.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>

dpkg-split/queue.c

@@ -29,6 +29,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>

dpkg-split/split.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>

dselect/basecmds.cc

@@ -22,6 +22,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>

dselect/baselist.cc

@@ -22,6 +22,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>

dselect/bindings.cc

@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>

dselect/helpmsgs.cc

@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include "helpmsgs.h"
 
 const struct helpmessage hlp_listkeys = {

dselect/main.cc

@@ -22,6 +22,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

dselect/methlist.cc

@@ -22,6 +22,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>

dselect/method.cc

@@ -22,6 +22,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

dselect/methparse.cc

@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

dselect/pkgdisplay.cc

@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>

dselect/pkginfo.cc

@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>

dselect/pkglist.cc

@@ -22,6 +22,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>

dselect/pkgsublist.cc

@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>

dselect/pkgtop.cc

@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>

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 \

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) {

lib/compression.c

@@ -1,5 +1,7 @@
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>

lib/database.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <ctype.h>
 #include <string.h>
 

lib/dbmodify.c

@@ -21,6 +21,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

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 */

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 */

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>

lib/ehandle.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

lib/fields.c

@@ -21,6 +21,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>

lib/lock.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

lib/log.c

@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>

lib/mlib.c

@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>

lib/myopt-util.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>

lib/myopt.c

@@ -21,6 +21,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>

lib/nfmalloc.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdlib.h>
 #include <string.h>
 

lib/parse.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>

lib/parsehelp.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>

lib/showpkg.c

@@ -19,6 +19,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

lib/subproc.c

@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>

lib/trigdeferred.l

@@ -37,6 +37,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <sys/stat.h>
 #include <sys/fcntl.h>
 

lib/triglib.c

@@ -22,6 +22,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <assert.h>
 #include <unistd.h>
 #include <errno.h>

lib/utils.c

@@ -19,6 +19,8 @@
  */
 
 #include <config.h>
+
+#include <dpkg-i18n.h>
 #include <dpkg.h>
 #include <string.h>
 

src/archives.c

@@ -21,6 +21,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>

src/cleanup.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>

src/configure.c

@@ -21,6 +21,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>

src/depcon.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <errno.h>
 #include <unistd.h>
 #include <sys/stat.h>

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>

src/errors.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

src/filesdb.c

@@ -21,6 +21,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <assert.h>
 #include <unistd.h>
 #include <fcntl.h>

src/help.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <errno.h>
 #include <unistd.h>
 #include <dirent.h>

src/main.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

src/packages.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

src/pkg-show.c

@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <string.h>
 
 #include <dpkg.h>

src/processarc.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>

src/query.c

@@ -21,6 +21,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

src/remove.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>

src/select.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>

src/trigcmd.c

@@ -21,6 +21,8 @@
 
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

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>

src/update.c

@@ -20,6 +20,8 @@
  */
 #include <config.h>
 
+#include <dpkg-i18n.h>
+
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>