r685 - in trunk: . dselect
Author: guillem
Date: 2007-03-21 04:22:15 + (Wed, 21 Mar 2007)
New Revision: 685
Modified:
trunk/ChangeLog
trunk/dselect/main.cc
Log:
* dselect/main.cc: Remove duplicated included files and
. Move to the system block.
Modified: trunk/ChangeLog
===
--- trunk/ChangeLog 2007-03-21 04:19:34 UTC (rev 684)
+++ trunk/ChangeLog 2007-03-21 04:22:15 UTC (rev 685)
@@ -1,5 +1,10 @@
2007-03-21 Guillem Jover <[EMAIL PROTECTED]>
+ * dselect/main.cc: Remove duplicated included files and
+ . Move to the system block.
+
+2007-03-21 Guillem Jover <[EMAIL PROTECTED]>
+
* dselect/method.h: Fix typo in copyright year ('20001'-> '2001').
2007-03-21 Guillem Jover <[EMAIL PROTECTED]>
Modified: trunk/dselect/main.cc
===
--- trunk/dselect/main.cc 2007-03-21 04:19:34 UTC (rev 684)
+++ trunk/dselect/main.cc 2007-03-21 04:22:15 UTC (rev 685)
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -47,10 +48,6 @@
#include "bindings.h"
#include "pkglist.h"
-#include
-#include
-#include
-
const char thisname[]= DSELECT;
const char printforhelp[]= N_("Type dselect --help for help.");
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
r684 - in trunk: . dselect
Author: guillem
Date: 2007-03-21 04:19:34 + (Wed, 21 Mar 2007)
New Revision: 684
Modified:
trunk/ChangeLog
trunk/dselect/method.h
Log:
* dselect/method.h: Fix typo in copyright year ('20001'-> '2001').
Modified: trunk/ChangeLog
===
--- trunk/ChangeLog 2007-03-21 04:18:29 UTC (rev 683)
+++ trunk/ChangeLog 2007-03-21 04:19:34 UTC (rev 684)
@@ -1,5 +1,9 @@
2007-03-21 Guillem Jover <[EMAIL PROTECTED]>
+ * dselect/method.h: Fix typo in copyright year ('20001'-> '2001').
+
+2007-03-21 Guillem Jover <[EMAIL PROTECTED]>
+
* configure.ac (AM_GNU_GETTEXT_VERSION): Quote the argument.
(AC_CHECK_HEADERS): Check for 'locale.h'.
* lib/gettext.h: Updated file from gettext 0.16.1.
Modified: trunk/dselect/method.h
===
--- trunk/dselect/method.h 2007-03-21 04:18:29 UTC (rev 683)
+++ trunk/dselect/method.h 2007-03-21 04:19:34 UTC (rev 684)
@@ -3,7 +3,7 @@
* method.h - access method handling declarations
*
* Copyright (C) 1995 Ian Jackson <[EMAIL PROTECTED]>
- * Copyright (C) 20001 Wichert Akkerman <[EMAIL PROTECTED]>
+ * Copyright (C) 2001 Wichert Akkerman <[EMAIL PROTECTED]>
*
* This is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
r683 - in trunk: . lib
Author: guillem Date: 2007-03-21 04:18:29 + (Wed, 21 Mar 2007) New Revision: 683 Modified: trunk/ChangeLog trunk/configure.ac trunk/lib/gettext.h Log: * configure.ac (AM_GNU_GETTEXT_VERSION): Quote the argument. (AC_CHECK_HEADERS): Check for 'locale.h'. * lib/gettext.h: Updated file from gettext 0.16.1. Modified: trunk/ChangeLog === --- trunk/ChangeLog 2007-03-20 23:28:29 UTC (rev 682) +++ trunk/ChangeLog 2007-03-21 04:18:29 UTC (rev 683) @@ -1,5 +1,11 @@ 2007-03-21 Guillem Jover <[EMAIL PROTECTED]> + * configure.ac (AM_GNU_GETTEXT_VERSION): Quote the argument. + (AC_CHECK_HEADERS): Check for 'locale.h'. + * lib/gettext.h: Updated file from gettext 0.16.1. + +2007-03-21 Guillem Jover <[EMAIL PROTECTED]> + * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.16.1. 2007-03-20 Guillem Jover <[EMAIL PROTECTED]> Modified: trunk/configure.ac === --- trunk/configure.ac 2007-03-20 23:28:29 UTC (rev 682) +++ trunk/configure.ac 2007-03-21 04:18:29 UTC (rev 683) @@ -12,7 +12,7 @@ AM_INIT_AUTOMAKE([1.8 gnu]) -AM_GNU_GETTEXT_VERSION(0.16.1) +AM_GNU_GETTEXT_VERSION([0.16.1]) AM_GNU_GETTEXT() # Allow compilation without dselect @@ -72,7 +72,7 @@ # Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS([error.h sys/cdefs.h kvm.h]) +AC_CHECK_HEADERS([error.h locale.h sys/cdefs.h kvm.h]) DPKG_CHECK_DEFINE(TIOCNOTTY, [sys/ioctl.h]) # Checks for typedefs, structures, and compiler characteristics. Modified: trunk/lib/gettext.h === --- trunk/lib/gettext.h 2007-03-20 23:28:29 UTC (rev 682) +++ trunk/lib/gettext.h 2007-03-21 04:18:29 UTC (rev 683) @@ -1,5 +1,5 @@ /* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -13,7 +13,7 @@ You should have received a copy of the GNU Library General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _LIBGETTEXT_H @@ -25,6 +25,18 @@ /* Get declarations of GNU message catalog functions. */ # include +/* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by + the gettext() and ngettext() macros. This is an alternative to calling + textdomain(), and is useful for libraries. */ +# ifdef DEFAULT_TEXT_DOMAIN +# undef gettext +# define gettext(Msgid) \ + dgettext (DEFAULT_TEXT_DOMAIN, Msgid) +# undef ngettext +# define ngettext(Msgid1, Msgid2, N) \ + dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N) +# endif + #else /* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which @@ -37,6 +49,16 @@ # include #endif +/* Many header files from the libstdc++ coming with g++ 3.3 or newer include + , which chokes if dcgettext is defined as a macro. So include + it now, to make later inclusions of a NOP. */ +#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) +# include +# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H +# include +# endif +#endif + /* Disabled NLS. The casts to 'const char *' serve the purpose of producing warnings for invalid uses of the value returned from these functions. @@ -66,4 +88,178 @@ initializer for static 'char[]' or 'const char[]' variables. */ #define gettext_noop(String) String +/* The separator between msgctxt and msgid in a .mo file. */ +#define GETTEXT_CONTEXT_GLUE "\004" + +/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a + MSGID. MSGCTXT and MSGID must be string literals. MSGCTXT should be + short and rarely need to change. + The letter 'p' stands for 'particular' or 'special'. */ +#ifdef DEFAULT_TEXT_DOMAIN +# define pgettext(Msgctxt, Msgid) \ + pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) +#else +# define pgettext(Msgctxt, Msgid) \ + pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) +#endif +#define dpgettext(Domainname, Msgctxt, Msgid) \ + pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) +#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \ + pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category) +#ifdef DEFAULT_TEXT_DOMAIN +# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \ + npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) +#else
r682 - in trunk: . dpkg-deb dpkg-split dselect dselect/methods dselect/po getopt lib m4 man origins po scripts scripts/po src utils
Author: guillem Date: 2007-03-20 23:28:29 + (Tue, 20 Mar 2007) New Revision: 682 Modified: trunk/ trunk/dpkg-deb/ trunk/dpkg-split/ trunk/dselect/ trunk/dselect/methods/ trunk/dselect/po/ trunk/getopt/ trunk/lib/ trunk/m4/ trunk/man/ trunk/origins/ trunk/po/ trunk/scripts/ trunk/scripts/po/ trunk/src/ trunk/utils/ Log: Update svn:ignore attributes. Property changes on: trunk ___ Name: svn:ignore - build-tree config intl ABOUT-NLS INSTALL Makefile.in configure config.h.in aclocal.m4 + build-tree config intl ABOUT-NLS INSTALL Makefile Makefile.in configure config.* aclocal.m4 stamp-h1 Property changes on: trunk/dpkg-deb ___ Name: svn:ignore - Makefile.in + .deps Makefile Makefile.in Property changes on: trunk/dpkg-split ___ Name: svn:ignore - Makefile.in + .deps Makefile Makefile.in Property changes on: trunk/dselect ___ Name: svn:ignore - Makefile.in + .deps Makefile Makefile.in Property changes on: trunk/dselect/methods ___ Name: svn:ignore - Makefile.in + Makefile Makefile.in Property changes on: trunk/dselect/po ___ Name: svn:ignore - *.gmo + *.gmo *.sed Makefile Makefile.in POTFILES Property changes on: trunk/getopt ___ Name: svn:ignore - Makefile.in + .deps Makefile Makefile.in Property changes on: trunk/lib ___ Name: svn:ignore - Makefile.in + .deps Makefile Makefile.in Property changes on: trunk/m4 ___ Name: svn:ignore - codeset.m4 gettext.m4 glibc21.m4 glibc2.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes_h.m4 inttypes.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 + codeset.m4 gettext.m4 glibc21.m4 glibc2.m4 iconv.m4 intdiv0.m4 intl.m4 intldir.m4 intmax.m4 inttypes_h.m4 inttypes.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 Property changes on: trunk/man ___ Name: svn:ignore - Makefile.in + de es fr hu ja pl pt_BR ru sv Makefile Makefile.in Property changes on: trunk/origins ___ Name: svn:ignore - Makefile.in + Makefile Makefile.in Property changes on: trunk/po ___ Name: svn:ignore - *.gmo *.sin *.sed *.header Makefile.in.in Makevars.template Rules-quot + *.gmo *.sin *.sed *.header Makefile Makefile.in Makefile.in.in Makevars.template POTFILES Rules-quot Property changes on: trunk/scripts ___ Name: svn:ignore - Makefile.in + Makefile Makefile.in Property changes on: trunk/scripts/po ___ Name: svn:ignore - *.gmo + *.gmo *.sed Makefile Makefile.in POTFILES Property changes on: trunk/src ___ Name: svn:ignore - Makefile.in + .deps Makefile Makefile.in Property changes on: trunk/utils ___ Name: svn:ignore - Makefile.in + .deps Makefile Makefile.in -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
r681 - in trunk: . debian dselect/po scripts/po
Author: guillem
Date: 2007-03-20 23:15:18 + (Tue, 20 Mar 2007)
New Revision: 681
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/debian/changelog
trunk/dselect/po/ChangeLog
trunk/dselect/po/Makefile.in.in
trunk/scripts/po/ChangeLog
trunk/scripts/po/Makefile.in.in
Log:
Require gettext 0.16.1.
Modified: trunk/ChangeLog
===
--- trunk/ChangeLog 2007-03-20 22:23:47 UTC (rev 680)
+++ trunk/ChangeLog 2007-03-20 23:15:18 UTC (rev 681)
@@ -1,3 +1,7 @@
+2007-03-21 Guillem Jover <[EMAIL PROTECTED]>
+
+ * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.16.1.
+
2007-03-20 Guillem Jover <[EMAIL PROTECTED]>
* scripts/dpkg-source.pl ($diff_ignore_default_regexp): Add '.hg'.
Modified: trunk/configure.ac
===
--- trunk/configure.ac 2007-03-20 22:23:47 UTC (rev 680)
+++ trunk/configure.ac 2007-03-20 23:15:18 UTC (rev 681)
@@ -12,7 +12,7 @@
AM_INIT_AUTOMAKE([1.8 gnu])
-AM_GNU_GETTEXT_VERSION(0.14.5)
+AM_GNU_GETTEXT_VERSION(0.16.1)
AM_GNU_GETTEXT()
# Allow compilation without dselect
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2007-03-20 22:23:47 UTC (rev 680)
+++ trunk/debian/changelog 2007-03-20 23:15:18 UTC (rev 681)
@@ -53,6 +53,7 @@
deb-shlibs(5) and deb-substvars(5).
* Support building binary packages with the member data.tar.lzma compressed
with lzma.
+ * Require gettext 0.16.1.
[ Updated dpkg translations ]
* Romanian (Eddy Petrișor).
Modified: trunk/dselect/po/ChangeLog
===
--- trunk/dselect/po/ChangeLog 2007-03-20 22:23:47 UTC (rev 680)
+++ trunk/dselect/po/ChangeLog 2007-03-20 23:15:18 UTC (rev 681)
@@ -1,5 +1,9 @@
2007-03-21 Guillem Jover <[EMAIL PROTECTED]>
+ * Makefile.in.in: Updated from gettext 0.16.1.
+
+2007-03-21 Guillem Jover <[EMAIL PROTECTED]>
+
* dselect.pot: Regenerated.
* *.po: Merged with dselect.pot. Formerly completed translations
become 276t8f1u.
Modified: trunk/dselect/po/Makefile.in.in
===
--- trunk/dselect/po/Makefile.in.in 2007-03-20 22:23:47 UTC (rev 680)
+++ trunk/dselect/po/Makefile.in.in 2007-03-20 23:15:18 UTC (rev 681)
@@ -1,5 +1,5 @@
# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <[EMAIL PROTECTED]>
+# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <[EMAIL PROTECTED]>
#
# This file can be copied and used freely without restrictions. It can
# be used in projects which are not available under the GNU General Public
@@ -8,7 +8,7 @@
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
#
-# Origin: gettext-0.14.4
+# Origin: gettext-0.16
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -23,18 +23,38 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
datadir = @datadir@
-localedir = $(datadir)/locale
+localedir = @localedir@
gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# @install_sh@ does not start with $(SHELL), so we add it.
+# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) @install_sh@ -d
+install_sh = $(SHELL) @install_sh@
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
+
+GMSGFMT_ = @GMSGFMT@
+GMSGFMT_no = @GMSGFMT@
+GMSGFMT_yes = @GMSGFMT_015@
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = @MSGFMT@
+MSGFMT_no = @MSGFMT@
+MSGFMT_yes = @MSGFMT_015@
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = @XGETTEXT@
+XGETTEXT_no = @XGETTEXT@
+XGETTEXT_yes = @XGETTEXT_015@
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
MSGMERGE = msgmerge
MSGMERGE_UPDATE = @MSGMERGE@ --update
MSGINIT = msginit
@@ -158,7 +178,7 @@
install-exec:
install-data: [EMAIL PROTECTED]@
if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
for file in $(DISTFILES.common) Makevars.template; do \
$(INSTALL_DATA) $(srcdir)/$$file \
$(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -171,13 +191,13 @@
fi
install-data-no: all
install-data-yes: all
- $(mkins
