dpkg (1.10.28) unstable; urgency=low

  The "Awh, yeah?  Ripper!" Release.

  * New Translations (Christian Perrier):
    - Romanian (Eddy Petrisor).  Closes: #309714.
    - Tagalog (Eric Pareja).  Closes: #296407.
  * Updated Translations (Christian Perrier):
    - French (Christian Perrier).
    - Greek (Konstantinos Margaritis).  Closes: #295922
    - Indonesian (Arief S Fitrianto).  Closes: #296733
  * Updated Manpage Translations (Christian Perrier):
    - French (Philippe Batailler).
    - Syntax error corrected in Brazilian Portuguese man page for
      update-alternatives.  Closes: #300646

 -- Scott James Remnant <scott@netsplit.com>  Thu, 26 May 2005 18:18:10 +0100

ChangeLog

@@ -1,6 +1,48 @@
-2005-02-10  gettextize  <bug-gnu-gettext@gnu.org>
+Thu May 26 18:18:10 BST 2005 Scott James Remnant <scott@netsplit.com>
 
-	* configure.in (AC_OUTPUT): Add po/Makefile.in.
+  * version-nr, debian/changelog: Release 1.10.28.
+	
+Thu May 25 14:05:20 CEST 2005 Eddy Petrisor <eddy.petrisor@gmail.com>
+
+  * po/ro.po: Complete translation..:-)
+
+Thu May 22 09:43:20 CEST 2005 Eddy Petrisor <eddy.petrisor@gmail.com>
+
+  * po/ro.po: Better translation
+
+Thu May 19 07:38:20 CEST 2005 Eddy Petrisor <eddy.petrisor@gmail.com>
+
+  * po/ro.po: Added though incomplete
+  * configure.in: Added Romanian to the languages list.
+
+Sun Apr 24 07:38:20 CEST 2005 Philippe Batailler <philippe.batailler@free.fr>
+
+  * man/fr/: all man pages updated
+
+Wed Mar 30 14:30:20 CEST 2005 Christian Perrier <bubulle@debian.org>
+
+  * man/pt_BR/update-alternatives.8: Syntax error corrected
+
+Wed Mar 30 13:30:20 CEST 2005 eric pareja <xenos@upm.edu.ph>
+
+  * po/tl.po: Added Tagalog translation
+  * configure.in: Added Tagalog to the languages list
+
+Tue Mar 08 06:30:20 CEST 2005 Christian Perrier <bubulle@debian.org>
+
+  * po/fr.po: Missing space added in one string
+
+Mon Mar 07 17:32:20 CEST 2005 Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>
+
+  * po/id.po: Completed
+
+Sat Feb 19 07:53:20 CEST 2005 Konstantinos Margaritis <markos@debian.org>
+
+  * po/el.po: Completed
+
+Thu Feb 10 15:40:04 GMT 2005 Scott James Remnant <scott@netsplit.com>
+
+  * version-nr, debian/changelog: Bump version to 1.10.28~.
 
 Thu Feb 10 15:20:27 GMT 2005 Scott James Remnant <scott@netsplit.com>
 

aclocal.m4

@@ -11,13 +11,11 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# gettext.m4 serial 28 (gettext-0.13)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# gettext.m4 serial 34 (gettext-0.14.2)
+dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -105,6 +103,9 @@ AC_DEFUN([AM_GNU_GETTEXT],
     AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
   ])
 
+  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+  gt_INTL_MACOSX
+
   dnl Set USE_NLS.
   AM_NLS
 
@@ -185,9 +186,9 @@ extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();],
+const char *_nl_expand_alias (const char *);],
               [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
               gt_cv_func_gnugettext_libintl=yes,
               gt_cv_func_gnugettext_libintl=no)
             dnl Now see whether libintl exists and depends on libiconv.
@@ -206,9 +207,9 @@ extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias ();],
+const char *_nl_expand_alias (const char *);],
                 [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
                [LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                 gt_cv_func_gnugettext_libintl=yes
@@ -258,6 +259,15 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
       fi
     ])
 
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Some extra flags are needed during linking.
+        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
       AC_DEFINE(ENABLE_NLS, 1,
@@ -363,6 +373,7 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([AM_MKINSTALLDIRS])dnl
   AC_REQUIRE([AC_PROG_CC])dnl
   AC_REQUIRE([AC_CANONICAL_HOST])dnl
+  AC_REQUIRE([gt_GLIBC2])dnl
   AC_REQUIRE([AC_PROG_RANLIB])dnl
   AC_REQUIRE([AC_ISC_POSIX])dnl
   AC_REQUIRE([AC_HEADER_STDC])dnl
@@ -371,22 +382,23 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([AC_C_INLINE])dnl
   AC_REQUIRE([AC_TYPE_OFF_T])dnl
   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
+  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
   AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
   AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
   AC_REQUIRE([gt_TYPE_WINT_T])dnl
-  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
   AC_REQUIRE([gt_TYPE_INTMAX_T])
   AC_REQUIRE([gt_PRINTF_POSIX])
   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
   AC_REQUIRE([AC_FUNC_MMAP])dnl
-  AC_REQUIRE([jm_GLIBC21])dnl
+  AC_REQUIRE([gl_GLIBC21])dnl
   AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
   AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
   AC_REQUIRE([gt_INTTYPES_PRI])dnl
   AC_REQUIRE([gl_XSIZE])dnl
+  AC_REQUIRE([gt_INTL_MACOSX])dnl
 
   AC_CHECK_TYPE([ptrdiff_t], ,
     [AC_DEFINE([ptrdiff_t], [long],
@@ -440,7 +452,11 @@ __fsetlocking])
   AM_ICONV
   AM_LANGINFO_CODESET
   if test $ac_cv_header_locale_h = yes; then
-    AM_LC_MESSAGES
+    gt_LC_MESSAGES
+  fi
+
+  if test -n "$INTL_MACOSX_LIBS"; then
+    CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
   fi
 
   dnl intl/plural.c is generated from intl/plural.y. It requires bison,
@@ -476,6 +492,50 @@ changequote([,])dnl
 ])
 
 
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in MacOS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    gt_cv_func_CFPreferencesCopyAppValue,
+    [gt_save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+     gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -framework CoreFoundation"
+     AC_TRY_LINK([#include <CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     CPPFLAGS="$gt_save_CPPFLAGS"
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
+      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in MacOS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
+    [gt_save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+     gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -framework CoreFoundation"
+     AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     CPPFLAGS="$gt_save_CPPFLAGS"
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
+      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
+
+
 dnl gt_CHECK_DECL(FUNC, INCLUDES)
 dnl Check whether a function is declared.
 AC_DEFUN([gt_CHECK_DECL],
@@ -501,11 +561,9 @@ AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
 
 # iconv.m4 serial AM4 (gettext-0.11.3)
 dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
@@ -605,11 +663,9 @@ size_t iconv();
 
 # lib-ld.m4 serial 3 (gettext-0.13)
 dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl Subroutines of libtool.m4,
 dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
@@ -716,13 +772,11 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 AC_LIB_PROG_LD_GNU
 ])
 
-# lib-link.m4 serial 4 (gettext-0.12)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-link.m4 serial 5 (gettext-0.14.2)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
@@ -1068,7 +1122,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                 if test "X$additional_includedir" = "X/usr/local/include"; then
                   if test -n "$GCC"; then
                     case $host_os in
-                      linux*) haveit=yes;;
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                     esac
                   fi
                 fi
@@ -1117,7 +1171,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                       if test "X$additional_libdir" = "X/usr/local/lib"; then
                         if test -n "$GCC"; then
                           case $host_os in
-                            linux*) haveit=yes;;
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
                           esac
                         fi
                       fi
@@ -1268,13 +1322,11 @@ AC_DEFUN([AC_LIB_APPENDTOVAR],
   done
 ])
 
-# lib-prefix.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-prefix.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
@@ -1341,7 +1393,7 @@ AC_DEFUN([AC_LIB_PREFIX],
         if test "X$additional_includedir" = "X/usr/local/include"; then
           if test -n "$GCC"; then
             case $host_os in
-              linux*) haveit=yes;;
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
             esac
           fi
         fi
@@ -1426,11 +1478,9 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
 
 # nls.m4 serial 1 (gettext-0.12)
 dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -1474,13 +1524,11 @@ AC_DEFUN([AM_MKINSTALLDIRS],
   AC_SUBST(MKINSTALLDIRS)
 ])
 
-# po.m4 serial 3 (gettext-0.14)
-dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# po.m4 serial 5 (gettext-0.14.2)
+dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -1495,6 +1543,8 @@ dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
 
+AC_PREREQ(2.50)
+
 dnl Checks for all prerequisites of the po subdirectory.
 AC_DEFUN([AM_PO_SUBDIRS],
 [
@@ -1510,7 +1560,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
   dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
   dnl The second test excludes FreeBSD msgfmt.
   AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
      (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
     :)
   AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
@@ -1519,7 +1569,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
   dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
   dnl The second test excludes FreeBSD xgettext.
   AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
      (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
     :)
   dnl Remove leftover from FreeBSD xgettext call.
@@ -1527,7 +1577,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
 
   dnl Search for GNU msgmerge 0.11 or newer in the PATH.
   AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
 
   dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
   dnl Test whether we really found GNU msgfmt.
@@ -1824,7 +1874,7 @@ changequote([,])dnl
     QMFILES="$QMFILES $srcdirpre$lang.qm"
     frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
     MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-    frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
     RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
   done
   # CATALOGS depends on both $ac_dir and the user's LINGUAS
@@ -1865,7 +1915,7 @@ changequote([,])dnl
       QTCATALOGS="$QTCATALOGS $lang.qm"
       frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
       TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-      frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
       CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
     done
   fi
@@ -1885,7 +1935,7 @@ EOF
   if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
     # Add dependencies that cannot be formulated as a simple suffix rule.
     for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
       cat >> "$ac_file.tmp" <<EOF
 $frobbedlang/\$(DOMAIN).resources.dll: $lang.po
 	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
@@ -1901,13 +1951,11 @@ EOF
   mv "$ac_file.tmp" "$ac_file"
 ])
 
-# progtest.m4 serial 3 (gettext-0.12)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# progtest.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -1921,6 +1969,8 @@ dnl They are *not* in the public domain.
 dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
 
+AC_PREREQ(2.50)
+
 # Search path for a program which passes the given test.
 
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
@@ -1970,6 +2020,7 @@ AC_CACHE_VAL(ac_cv_path_$1,
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
           if [$3]; then
             ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
             break 2

config.guess

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2003-07-02'
+timestamp='2004-11-12'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -197,15 +197,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    luna88k:OpenBSD:*:*)
+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -221,25 +227,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	echo mips64-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     sun3:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
+	case $UNAME_RELEASE in
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
 	# covers most systems running today.  This code pipes the CPU
@@ -277,14 +291,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    "EV7.9 (21364A)")
 		UNAME_MACHINE="alphaev79" ;;
 	esac
+	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -307,6 +319,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -327,7 +345,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
 	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
 	esac ;;
@@ -399,6 +417,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -734,7 +755,7 @@ EOF
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -742,6 +763,11 @@ EOF
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -751,22 +777,8 @@ EOF
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
-	# FreeBSD's kernel, but not the complete OS.
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+    *:FreeBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -799,8 +811,13 @@ EOF
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
@@ -810,9 +827,18 @@ EOF
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit 0 ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit 0 ;;
+    frv:Linux:*:*)
+    	echo frv-unknown-linux-gnu
+	exit 0 ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -948,6 +974,9 @@ EOF
 	LIBC=gnuaout
 	#endif
 	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
@@ -978,6 +1007,9 @@ EOF
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
 	exit 0 ;;
+	i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1047,9 +1079,9 @@ EOF
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
 	exit 0 ;;
-    M68*:*:R3V[567]*:*)
+    M68*:*:R3V[5678]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1147,9 +1179,10 @@ EOF
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
     *:Darwin:*:*)
-	case `uname -p` in
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
 	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
@@ -1164,7 +1197,7 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1208,6 +1241,19 @@ EOF
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
 	exit 0 ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit 0 ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms && exit 0 ;;
+	    I*) echo ia64-dec-vms && exit 0 ;;
+	    V*) echo vax-dec-vms && exit 0 ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2

config.h.in

@@ -13,6 +13,14 @@
 /* Define if alphasort is declared. */
 #undef HAVE_ALPHASORT_DECLARATION
 
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
 /* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 #undef HAVE_DCGETTEXT

config.rpath

@@ -2,28 +2,13 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2003 Free Software Foundation, Inc.
+#   Copyright 1996-2005 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
-#   This program 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 of the License, or
-#   (at your option) any later version.
-#
-#   This program 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 this program; if not, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-#   As a special exception to the GNU General Public License, if you
-#   distribute this file as part of a program that contains a
-#   configuration script generated by Autoconf, you may include it under
-#   the same distribution terms that you use for the rest of that program.
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
 #
 # The first argument passed to this file is the canonical host specification,
 #    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
@@ -50,6 +35,8 @@ host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
+cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
+
 # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
 
 wl=
@@ -60,6 +47,13 @@ else
     aix*)
       wl='-Wl,'
       ;;
+    darwin*)
+      case "$cc_basename" in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
     mingw* | pw32* | os2*)
       ;;
     hpux9* | hpux10* | hpux11*)
@@ -71,13 +65,19 @@ else
     newsos6)
       ;;
     linux*)
-      case $CC in
-        icc|ecc)
+      case $cc_basename in
+        icc* | ecc*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
           wl='-Wl,'
           ;;
-        ccc)
+        ccc*)
           wl='-Wl,'
           ;;
+        como)
+          wl='-lopt='
+          ;;
       esac
       ;;
     osf3* | osf4* | osf5*)
@@ -96,6 +96,9 @@ else
       ;;
     sysv4*MP*)
       ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
     uts4*)
       ;;
   esac
@@ -138,7 +141,7 @@ if test "$with_gnu_ld" = yes; then
       # that the semantics of dynamic libraries on AmigaOS, at least up
       # to version 4, is to share data among multiple programs linked
       # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can use
+      # behavior of shared libraries on other platforms, we cannot use
       # them.
       ld_shlibs=no
       ;;
@@ -173,6 +176,13 @@ if test "$with_gnu_ld" = yes; then
     sunos4*)
       hardcode_direct=yes
       ;;
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
         :
@@ -266,7 +276,7 @@ else
       # see comment about different semantics on the GNU ld section
       ld_shlibs=no
       ;;
-    bsdi4*)
+    bsdi[45]*)
       ;;
     cygwin* | mingw* | pw32*)
       # When not using gcc, we currently assume that we are using
@@ -277,8 +287,17 @@ else
       libext=lib
       ;;
     darwin* | rhapsody*)
-      if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
-        hardcode_direct=no
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case "$cc_basename" in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
       fi
       ;;
     dgux*)
@@ -295,7 +314,7 @@ else
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
-    freebsd*)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
@@ -438,7 +457,7 @@ case "$host_os" in
     ;;
   beos*)
     ;;
-  bsdi4*)
+  bsdi[45]*)
     ;;
   cygwin* | mingw* | pw32*)
     shrext=.dll
@@ -450,6 +469,8 @@ case "$host_os" in
     ;;
   freebsd1*)
     ;;
+  kfreebsd*-gnu)
+    ;;
   freebsd*)
     ;;
   gnu*)
@@ -486,11 +507,13 @@ case "$host_os" in
     ;;
   linux*)
     ;;
+  knetbsd*-gnu)
+    ;;
   netbsd*)
     ;;
   newsos6)
     ;;
-  nto-qnx)
+  nto-qnx*)
     ;;
   openbsd*)
     ;;
@@ -519,7 +542,7 @@ escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
 shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
 escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
 
-sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
 
 # How to pass a linker flag through the compiler.
 wl="$escaped_wl"

config.sub

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-timestamp='2003-07-17'
+timestamp='2004-11-30'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -118,7 +118,8 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -144,7 +145,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
@@ -236,7 +237,7 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -248,6 +249,7 @@ case $basic_machine in
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
@@ -260,12 +262,12 @@ case $basic_machine in
 	| pyramid \
 	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -298,7 +300,7 @@ case $basic_machine in
 	| avr-* \
 	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
@@ -306,7 +308,7 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* \
+	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -320,11 +322,13 @@ case $basic_machine in
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
 	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
@@ -333,14 +337,14 @@ case $basic_machine in
 	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -360,6 +364,9 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -377,6 +384,9 @@ case $basic_machine in
 	amd64)
 		basic_machine=x86_64-pc
 		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -436,12 +446,27 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -464,6 +489,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -642,10 +671,6 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -726,10 +751,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -741,6 +762,10 @@ case $basic_machine in
 		basic_machine=or32-unknown
 		os=-coff
 		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -961,6 +986,10 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1004,6 +1033,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1034,6 +1067,9 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1056,7 +1092,7 @@ case $basic_machine in
 	sh64)
 		basic_machine=sh64-unknown
 		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1129,19 +1165,20 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1165,6 +1202,9 @@ case $os in
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1177,6 +1217,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1198,6 +1241,9 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1220,6 +1266,9 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1256,6 +1305,9 @@ case $os in
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
 	-none)
 		;;
 	*)
@@ -1336,6 +1388,9 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
+    	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1468,9 +1523,15 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
+			-tpf*)
+				vendor=ibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;

configure.in

@@ -136,7 +136,7 @@ AC_DEFINE_UNQUOTED(ARCHITECTURE, "${dpkg_archset}", [Set this to the canonical D
 
 dnl gettext
 
-ALL_LINGUAS="bs ca cs da de el es eu fr gl he id it ja ko nb nl nn pl pt pt_BR ru sk sv zh_CN zh_TW"
+ALL_LINGUAS="bs ca cs da de el es eu fr gl he id it ja ko nb nl nn pl pt pt_BR ro ru sk sv tl zh_CN zh_TW"
 AM_GNU_GETTEXT([external])
 AM_PO_SUBDIRS
 if test "x$HAVE_LOCALE_H" = "x"; then

debian/changelog

@@ -1,3 +1,21 @@
+dpkg (1.10.28) unstable; urgency=low
+  
+  The "Awh, yeah?  Ripper!" Release.
+
+  * New Translations (Christian Perrier):
+    - Romanian (Eddy Petrisor).  Closes: #309714.
+    - Tagalog (Eric Pareja).  Closes: #296407.
+  * Updated Translations (Christian Perrier):
+    - French (Christian Perrier).
+    - Greek (Konstantinos Margaritis).  Closes: #295922
+    - Indonesian (Arief S Fitrianto).  Closes: #296733
+  * Updated Manpage Translations (Christian Perrier):
+    - French (Philippe Batailler).
+    - Syntax error corrected in Brazilian Portuguese man page for
+      update-alternatives.  Closes: #300646
+
+ -- Scott James Remnant <scott@netsplit.com>  Thu, 26 May 2005 18:18:10 +0100
+
 dpkg (1.10.27) unstable; urgency=low
 
   The "Grab your gun and bring in the cat" Release.

debian/dselect.substvars

@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.2.ds1-4), libgcc1 (>= 1:3.4.1-3), libncurses5 (>= 5.4-1), libstdc++5 (>= 1:3.3.4-1)

dpkg-deb/Makefile

@@ -0,0 +1,56 @@
+
+
+srcdir		= .
+top_srcdir	= ..
+top_builddir	= ..
+
+
+default: all
+
+include ../Makefile.conf
+
+
+SOURCES		= build.c extract.c info.c main.c
+
+OBJECTS		= $(patsubst %.c, %.o, $(SOURCES))
+GENFILES	= $(OBJECTS) dpkg-deb dpkg-deb-static
+
+.PHONY: all
+all:: dpkg-deb
+ifdef ALSO_STATIC
+all:: dpkg-deb-static
+endif
+
+.PHONY: install
+install:: all
+
+.PHONY: clean
+clean::
+	-$(RM) $(GENFILES)
+
+.PHONY: distclean
+cvslean:: clean
+	$(RM) Makefile
+
+.PHONY: install
+install:: install-program install-doc
+
+.PHONY: install-program
+install-program:
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(INSTALL) dpkg-deb $(DESTDIR)$(bindir)
+ifdef ALSO_STATIC
+	$(INSTALL) dpkg-deb-static $(DESTDIR)$(bindir)
+endif
+
+.PHONY: install-doc
+install-doc:
+	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+	$(INSTALL_DATA) $(srcdir)/dpkg-deb.1 $(DESTDIR)$(man1dir)
+
+dpkg-deb-static: LDFLAGS += -static
+dpkg-deb-static: ZLIB_LIBS = $(ZLIB_LIBS_ALSO_STATIC)
+dpkg-deb-static: BZ2LIB_LIBS = $(BZ2LIB_LIBS_ALSO_STATIC)
+dpkg-deb dpkg-deb-static: $(OBJECTS) ../lib/libdpkg.a
+	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS)
+

dselect/Makefile

@@ -0,0 +1,60 @@
+
+srcdir		= .
+top_srcdir	= ..
+top_builddir	= ..
+
+default: all
+include ../Makefile.conf
+
+CXX_SOURCES	= basecmds.cc baselist.cc basetop.cc bindings.cc curkeys.cc \
+		  main.cc methkeys.cc methlist.cc method.cc methparse.cc \
+		  pkgcmds.cc pkgdepcon.cc pkgdisplay.cc pkginfo.cc pkgkeys.cc \
+		  pkglist.cc pkgsublist.cc pkgtop.cc helpmsgs.cc
+
+MAN8PAGES	= dselect.8
+
+OBJECTS		= $(patsubst %.cc, %.o, $(CXX_SOURCES))
+GENFILES	= $(OBJECTS) dselect curkeys.h
+
+.PHONY: all
+all:: dselect
+
+.PHONY: install
+install:: all
+
+.PHONY: clean
+clean::
+	$(RM) $(GENFILES)
+
+.PHONY: distclean
+cvslean:: clean
+	$(RM) Makefile
+
+.PHONY: install
+install:: install-program install-doc
+
+.PHONY: install-program
+install-program:
+	$(mkinstalldirs) $(DESTDIR)/$(bindir)
+	$(INSTALL_PROGRAM) dselect $(DESTDIR)/$(bindir)
+
+.PHONY: install-doc
+install-doc:
+	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
+	set -e ; for i in $(MAN8PAGES) ; do \
+	    if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+	    $(INSTALL_DATA) $$d$$i $(DESTDIR)/$(man8dir) ; \
+	done
+
+dselect: $(OBJECTS) ../lib/libdpkg.a
+	$(CXX) $(LDFLAGS) -o $@ $(OBJECTS) $(CURSES_LIBS) $(LIBS) $(NLS_LIBS)
+
+basecmds.o: helpmsgs.h
+curkeys.o: curkeys.h
+
+curkeys.h: keyoverride $(srcdir)/mkcurkeys.pl
+	cursesfile=`echo '#include <curses.h>' | \
+		 $(CC) -E - | grep 'curses.h' | head -n 1 | \
+		 $(SED) -e 's/^[^"]*"//; s/".*$$//'`; \
+	if [ "$$cursesfile" = "" ]; then echo "can't find curses file"; exit 1; fi; \
+	perl $(srcdir)/mkcurkeys.pl $< $$cursesfile > $@

include/Makefile

@@ -0,0 +1,25 @@
+
+
+srcdir		= .
+
+GENFILES	= dpkg.h
+
+default: all
+include ../Makefile.conf
+
+all:: $(GENFILES)
+	
+install:: all
+
+clean::
+	rm -f $(GENFILES) 
+
+cvslean:: clean
+	rm -f Makefile
+
+dpkg.h: dpkg.h.in
+	sed -e 's,#CONFIGDIR#,$(dpkgconfdir),' \
+		-e 's,#ADMINDIR#,$(admindir),' \
+		-e 's,#LIBDIR#,$(dpkglibdir),' $< > $@
+
+.PHONY: all install clean distclean

lib/Makefile

@@ -0,0 +1,37 @@
+
+
+srcdir		= .
+top_srcdir	= ..
+
+default: all
+include ../Makefile.conf
+
+SOURCES		= compat.c compression.c database.c dbmodify.c dump.c \
+		    ehandle.c fields.c lock.c mlib.c myopt.c nfmalloc.c \
+		    parse.c parsehelp.c showcright.c showpkg.c tarfn.c \
+		    varbuf.c vercmp.c md5.c utils.c
+
+OBJECTS		= $(patsubst %.c, %.o, $(SOURCES))
+GENFILES	= $(OBJECTS) libdpkg.a
+
+ALL_CFLAGS	+= -DCOPYINGFILE=\"$(copyingfile)\"
+
+.PHONY: all
+all:: libdpkg.a
+
+libdpkg.a: $(OBJECTS) 
+	$(AR) r $@ $^
+	$(RANLIB) $@
+
+.PHONY: install
+install:: all
+
+.PHONY: clean
+clean::
+	$(RM) $(GENFILES)
+
+
+.PHONY: distclean
+cvslean:: clean
+	$(RM) Makefile
+

main/Makefile

@@ -0,0 +1,77 @@
+
+srcdir		= .
+top_srcdir	= ..
+top_builddir	= ..
+
+default: all
+include ../Makefile.conf
+
+SOURCES		= main.c enquiry.c filesdb.c archives.c processarc.c \
+		  cleanup.c select.c packages.c configure.c remove.c \
+		  help.c depcon.c errors.c update.c 
+
+MAN8PAGES	= dpkg.8 dpkg-query.8
+
+OBJECTS		= $(patsubst %.c, %.o, $(SOURCES))
+GENFILES	= $(OBJECTS) archtable.h dpkg dpkg-static
+
+QUERY_SOURCES	= query.c filesdb.c errors.c 
+QUERY_OBJECTS	= $(patsubst %.c, %.o, $(QUERY_SOURCES))
+QUERY_GENFILES	= $(QUERY_OBJECTS) dpkg-query
+
+.PHONY: all
+all:: dpkg dpkg-query
+
+ifdef ALSO_STATIC
+all:: dpkg-static
+endif
+
+.PHONY: install
+install:: all
+
+.PHONY: clean
+clean::
+	$(RM) $(GENFILES) $(QUERY_GENFILES)
+
+.PHONY: distclean
+cvslean:: clean
+	$(RM) Makefile
+
+.PHONY: install
+install:: install-program install-doc
+
+.PHONY: install-program
+install-program:
+	$(mkinstalldirs) $(DESTDIR)/$(bindir)
+	$(INSTALL_PROGRAM) dpkg $(DESTDIR)/$(bindir)
+ifdef ALSO_STATIC
+	$(INSTALL_PROGRAM) dpkg-static $(DESTDIR)/$(bindir)
+endif
+	$(INSTALL_PROGRAM) dpkg-query $(DESTDIR)/$(bindir)
+	$(mkinstalldirs) $(DESTDIR)/$(admindir)/alternatives
+	$(mkinstalldirs) $(DESTDIR)/$(admindir)/info
+	$(mkinstalldirs) $(DESTDIR)/$(admindir)/updates
+
+.PHONY: install-doc
+install-doc:
+	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
+	set -e ; for i in $(MAN8PAGES) ; do \
+	    if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+	    $(INSTALL_DATA) $$d$$i $(DESTDIR)/$(man8dir) ; \
+	done
+
+dpkg-static: LDFLAGS += -static
+dpkg-static: ZLIB_LIBS = $(ZLIBS_LIBS_ALSO_STATIC)
+dpkg dpkg-static: $(OBJECTS) ../lib/libdpkg.a
+	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) $(NLS_LIBS)
+
+dpkg-query: $(QUERY_OBJECTS) ../lib/libdpkg.a
+	$(CC) $(LDFLAGS) -o $@ $(QUERY_OBJECTS) $(LIBS) $(NLS_LIBS)
+
+enquiry.o: archtable.h
+
+archtable.h: $(top_srcdir)/archtable
+	expand $< | \
+	 perl -ne 'print "  { \"$$1\",$$2\"$$3\",$$4\"$$5\" },\n" \
+		   if m/^(?!\s*#)\s*(\S+)(\s+)(\S+)(\s+)(\S+)\s*$$/' \
+		>$@

man/fr/cleanup-info.8

@@ -52,6 +52,6 @@ Copyright (C) 1996 Kim-Minh Kaplan.
 C'est un logiciel libre ; voyez la «\ GNU General Public Licence\ » version 
 2 ou supérieure pour le copyright. Il n'y a PAS de garantie.
 .SH TRADUCTION
-Philippe Batailler, 2004.
+Philippe Batailler, 2005.
 Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.
-dpkg, version 1.10.23.
+

man/fr/deb-control.5

@@ -217,4 +217,6 @@ Description: GNU grep, egrep and fgrep.
 .BR dpkg (8),
 .BR dpkg-deb (1).
 .SH TRADUCTION
-Philippe Batailler, Octobre 2003.
+Philippe Batailler, 2005.
+Veuillez signaler toute erreur à <debian-l10n-french@lists.debian.org>.
+

man/fr/dpkg-checkbuilddeps.1

@@ -0,0 +1,32 @@
+.\" This file was generated with po4a. Translate the source file.
+.\" 
+.TH DPKG\-CHECKBUILDDEPS 1 "Février 2001" "Projet debian" "Utilitaires de dpkg"
+.SH NOM
+dpkg\-checkbuilddeps \- vérifier les dépendances et les conflits de 
+construction
+.SH SYNOPSIS
+\fBdpkg\-checkbuilddeps\fP \-B [\fIfichier\-control\fP]
+.SH DESCRIPTION
+Ce programme vérifie si les dépendances et les conflits de construction 
+listés dans le fichier control existent dans les paquets installés sur le 
+système. S'il en existe, il les affiche et se termine avec un code de retour 
+différent de 0.
+.P
+Normalement, le fichier \fBdebian/control\fP est lu, mais un autre fichier peut 
+être indiqué sur la ligne de commande.
+.SH OPTIONS
+.TP
+\fI\-B\fP
+Ignore les lignes Build\-Depends\-Indep. À utiliser quand aucun paquet 
+indépendant d'une architecture ne sera construit.
+.SH AUTEUR
+Copyright 2001 Joey Hess
+.UR mailto:joeyh@debian.org
+<joeyh@debian.org>
+.UE
+.sp
+C'est un logiciel libre. Voyez la «\ GNU General Public Licence\ » version 2 
+ou supérieure pour le copyright. Il n'y a pas de garantie.
+.SH TRADUCTION
+Philippe Batailler, 2005.
+Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.

man/fr/dpkg-deb.1

@@ -169,6 +169,5 @@ General Public Licence\
 \fB/usr/share/doc/dpkg/copyright\fR et \fB/usr/share/common\-licenses/GPL\fR pour 
 des précisions.
 .SH TRADUCTION
-Philippe Batailler, 2004.
+Philippe Batailler, 2005.
 Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.
-dpkg, version 1.10.23.

man/fr/dpkg-divert.8

@@ -90,6 +90,5 @@ Copyright (C) 1995 Ian Jackson.
 C'est un logiciel libre ; voyez la « GNU General Public Licence » version 2 
 ou supérieure pour le copyright. Il n'y a PAS de garantie.
 .SH TRADUCTION
-Philippe Batailler, 2004.
+Philippe Batailler, 2005.
 Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.
-dpkg, version 1.10.23.

man/fr/dpkg-name.1

@@ -94,6 +94,5 @@ Copyright 1995,1996 Erick Branderhorst. \fBdpkg\-name\fR est un logiciel libre\
 ; voyez la «\ GNU General Public Licence\ » version 2 ou supérieure pour le 
 copyright. Il n'y a \fBpas\fR de garantie.
 .SH TRADUCTION
-Philippe Batailler, 2004.
+Philippe Batailler, 2005.
 Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.
-dpkg, version 1.10.23.

man/fr/dpkg-query.8

@@ -89,12 +89,9 @@ Copyright 2001 Wichert Akkerman
 C'est un logiciel libre ; voyez la licence publique générale du projet GNU 
 version 2 ou supérieure pour les droits de copie. Il n'y a PAS de garantie.
 
-
-
 .SH "Voir aussi"
 \fBdpkg\fR(8)
 
 .SH TRADUCTION
-Philippe Batailler, 2004.
+Philippe Batailler, 2005.
 Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.
-dpkg, version 1.10.23.

man/fr/dpkg-scanpackages.1

@@ -14,22 +14,22 @@
 .\" License along with dpkg; if not, write to the Free Software
 .\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 .\" Traduction de la version cvs 1.4
-.TH DPKG-SCANPACKAGES 1 "1996-07-08" "Projet Debian" "Utilitaires de Dpkg"
+.TH DPKG\-SCANPACKAGES 1 "1996-07-08" "Projet Debian" "Utilitaires de Dpkg"
 .SH NOM
-dpkg-scanpackages \- créer des fichiers «\ Packages\ »
+dpkg\-scanpackages - créer des fichiers «\ Packages\ »
 .
 .SH SYNOPSIS
-.B dpkg-scanpackages
-.RI [ -u ]
-.RI [ -a<arch> ]
-.I rep-de-binaires
-.I fichier-d'-override
-.RI [ chemin-à-préfixer ]
+.B dpkg\-scanpackages
+.RI [ \-u ]
+.RI [ \-a<arch> ]
+.I rep\-de\-binaires
+.I fichier\-d'\-override
+.RI [ chemin\-à\-préfixer ]
 .B >
 .I Packages
 .
 .SH DESCRIPTION
-.B dpkg-scanpackages
+.B dpkg\-scanpackages
 trie une arborescence contenant des paquets binaires Debian et crée un fichier
 «\ Packages\ » qui permettra à
 .BR dselect (8),
@@ -38,29 +38,29 @@ qu'il peut installer.
 Ces fichiers «\ Packages\ » sont semblables à ceux qu'on peut trouver sur les 
 sites d'archives Debian ou sur des cédéroms.
 Quand on crée un répertoire contenant des paquets qu'on veut installer sur
-un ensemble de machines, on peut se servir soi-même de
-.B dpkg-scanpackages.
+un ensemble de machines, on peut se servir soi\-même de
+.B dpkg\-scanpackages.
 .PP
-.I rep-de-binaires
+.I rep\-de\-binaires
 est le nom de l'arborescence binaire (par exemple
-.BR contrib/binary-i386)
+.BR contrib/binary\-i386)
 que l'on veut traiter.
 Il vaut mieux qu'elle soit relative à la racine de l'archive Debian\ ;
 ainsi chaque champ «\ Filename\ » dans le nouveau fichier «\ Packages\ »
 commencera par cette chaîne.
 .PP
-.I fichier-d'-override
+.I fichier\-d'\-override
 est le nom du fichier qui contient les renseignements sur la manière dont le
-paquet s'insère dans la distribution\ ; voir ci-dessous.
+paquet s'insère dans la distribution\ ; voir ci\-dessous.
 .PP
-.I chemin-à-préfixer
+.I chemin\-à\-préfixer
 est une chaîne facultative qui préfixera les champs «\ Filename\ ».
 .PP
 Si l'option
-.I -u
+.I \-u
 est spécifiée, la commande recherche des *.udeb au lieu de *.deb.
 .PP
-Quand -a\fI<arch>\fP est spécifiée, la commande ne recherche pas tous les
+Quand \-a\fI<arch>\fP est spécifiée, la commande ne recherche pas tous les
 fichiers debs\ ; elle utilise un motif équivalent à *_all.deb et à *_arch.deb.
 
 .SH LE FICHIER « OVERRIDE »
@@ -81,7 +81,7 @@ Les commentaires commencent par un caract
 .I priorité
 .I section
 .RI [ responsable ]
-.in -5
+.in \-5
 .PP
 .I paquet
 est le nom du paquet.  Les entrées du fichier «\ override\ » concernant des
@@ -93,8 +93,8 @@ et
 .I section
 placent le paquet dans l'arborescence\ ; on ne devrait pas les trouver
 dans le  fichier «\ control\ ». Quand le paquet se trouve dans un 
-sous-répertoire de  
-.IR rep-de-binaires,
+sous\-répertoire de  
+.IR rep\-de\-binaires,
 on le compare avec le contenu de
 .IR section .
 .PP
@@ -113,16 +113,16 @@ fichiers officiels
 des miroirs Debian.
 .
 .SH DIAGNOSTICS
-.B dpkg-scanpackages
-affiche les erreurs habituelles qui se comprennent d'elles-mêmes. Il
+.B dpkg\-scanpackages
+affiche les erreurs habituelles qui se comprennent d'elles\-mêmes. Il
 affiche aussi des avertissements quand des paquets sont dans un mauvais
-sous-répertoire, existent en double exemplaire, ont des champs 
+sous\-répertoire, existent en double exemplaire, ont des champs 
 «\ Filename\ » dans leur fichier «\ control\ », sont absents du fichier
 «\ override\ » ou bien dont les substitutions de responsable ne peuvent
 pas s'appliquer.
 .SH VOIR AUSSI
 .BR dpkg (8),
 .BR dselect (8),
-.BR dpkg-scansources (1).
+.BR dpkg\-scansources (1).
 .SH TRADUCTION
-Philippe Batailler <pbatailler@teaser.fr>, Octobre 2003.
+Philippe Batailler <pbatailler@teaser.fr>, Avril 2005.

man/fr/dpkg-scansources.1

@@ -217,7 +217,7 @@ priorit
 les champs «\ maintainer\ » donnés dans les fichiers \fI.dsc\fR. Voyez la 
 page de manuel \fIdpkg-scanpackages\fR pour connaître le format de ce fichier.
 NB : le fichier \fIfichier-d'-override\fR étant indexé par paquets binaires 
-et non par paquets sources, il y a un petit problème ! Parmi tous les paquets 
+et non par paquets source, il y a un petit problème ! Parmi tous les paquets 
 binaires produits par un fichier \fI.dsc\fR, l'implémentation actuelle 
 affecte la priorité la plus élevée au paquet source ; et elle se sert de 
 l'entrée « override » du premier paquet binaire listé dans 
@@ -252,7 +252,7 @@ dpkg-\fIscanpackages\fR\|(8)
 .SH "AUTEUR"
 Roderick Schertler <roderick@argon.org>
 .SH "TRADUCTION"
-Philippe Batailler, Janvier 2001.
+Philippe Batailler, 2005.
 .rn }` ''
 .IX Title "DPKG-SCANSOURCES 1"
 .IX Name "dpkg-scansources - prog"

man/fr/dpkg-source.1

@@ -596,6 +596,5 @@ C'est un logiciel libre\ ; voyez la
 \fB/usr/share/doc/dpkg/copyright\fR et \fB/usr/share/common-licenses/GPL\fR pour 
 des précisions.
 .SH TRADUCTION
-Philippe Batailler, 2004.
-Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.
-dpkg, version 1.10.23.
+Philippe Batailler, 2005.
+Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.

man/fr/dpkg-split.8

@@ -125,11 +125,11 @@ Indique un r
 attente d'une recomposition automatique. Par défaut, c'est le répertoire 
 \fB/var/lib/dpkg\fR.
 .TP
-.BI \-\-partsize|-S " kbytes"
+.BI \-\-partsize\fR|\fB\-S " kbytes"
 Indique, en kilooctets (1024 octets), la taille maximum d'une partie lors 
 d'une décomposition. Par défaut, la taille maximum est de 450 ko.
 .TP
-.BI \-\-output|\-O " fichier\-complet"
+.BI \-\-output\fR|\fB\-O " fichier\-complet"
 Indique le nom du fichier à produire pour une recomposition.
 
 Cela annule le fichier par défaut lors d'une recomposition «\ à la main\ » 
@@ -198,6 +198,5 @@ Copyright (C) 1995-1996 Ils ont
 Licence\ »\ ; il n'y a PAS de GARANTIE. Voyez \fB/usr/share/dpkg/copyright\fR 
 et \fB/usr/share/common\-licenses/GPL\fR pour des précisions.
 .SH TRADUCTION
-Philippe Batailler, 2004.
-Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.
-dpkg, version 1.10.23.
+Philippe Batailler, 2005.
+Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.

man/fr/dpkg-statoverride.8

@@ -84,6 +84,5 @@ Ce programme est un logiciel libre\ ; voyez la licence publique g
 projet GNU version 2 ou supérieure pour les droits de copie. Il n'y a PAS de 
 garantie.
 .SH TRADUCTION
-Philippe Batailler, 2004.
+Philippe Batailler, 2005.
 Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.
-dpkg, version 1.10.23.

man/fr/dpkg.8

@@ -629,6 +629,5 @@ Voyez le fichier \fB/usr/share/doc/dpkg/THANKS.gz\fR pour la
 liste des personnes qui ont contribué à \fBdpkg\fR.
 .fi
 .SH TRADUCTION
-Philippe Batailler, 2004.
+Philippe Batailler, 2005.
 Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.
-dpkg, version 1.10.23.

man/fr/install-info.8

@@ -205,6 +205,5 @@ Copyright 1994, Ian Jackson. \fBinstall\-info\fR est un logiciel libre\ ; voyez
 la «\ GNU General Public Licence\ » version 2 ou supérieure pour le 
 copyright. Il \fIn'y a pas\fR de garantie.
 .SH TRADUCTION
-Philippe Batailler, 2004.
+Philippe Batailler, 2005.
 Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.
-dpkg, version 1.10.23.

man/fr/start-stop-daemon.8

@@ -51,7 +51,7 @@ doivent survivre
 .TP
 .B \-x\fR|\fB\-\-exec\fR \fIexécutable
 Cherche les processus qui sont des exemplaires de cet exécutable (selon 
-.B /proc/\fR\fIpid\fR\fB/exe\fR).
+.B /proc/\fIpid\fB/exe\fP ).
 .TP
 .B \-p\fR|\fB\-\-pidfile\fR \fIpid\-file
 Cherche les processus dont les identifiants sont précisés dans \fIpid\-file.\fR
@@ -65,7 +65,7 @@ Modifie le \fIgroup\fR ou le \fIgid\fR au d
 .TP
 .B \-n\fR|\fB\-\-name\fR \fInomdeprocessus
 Cherche les processus dont le nom est \fInomdeprocessus\fR (selon 
-.B /proc/\fR\fIpid\fR\fB/stat\fR).
+.B /proc/\fIpid\fB/stat\fP ).
 .TP
 .B \-s\fR|\fB\-\-signal\fR \fIsignal
 Avec l'action \fB\-\-stop,\fR on définit le signal à envoyer au processus qui 
@@ -171,6 +171,5 @@ d'une version faite par Ian Jackson <ian@chiark.greenend.org.uk>.
 Page de manuel par Klee Dienes <klee@mit.edu>, partiellement 
 reformattée par Ian Jackson.
 .SH TRADUCTION
-Philippe Batailler, 2004.
-Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.
-dpkg, version 1.10.23.
+Philippe Batailler, 2005.
+Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.

man/fr/update-alternatives.8

@@ -316,6 +316,5 @@ tous les syst
 .SH "VOIR AUSSI"
 \fBln\fR(1), FHS, le standard pour l'organisation des systèmes de fichiers.
 .SH TRADUCTION
-Philippe Batailler, 2004.
+Philippe Batailler, 2005.
 Veuillez signaler toute erreur à <debian-l10-french@lists.debian.org>.
-dpkg, version 1.10.23.

man/paths.ent

@@ -0,0 +1,15 @@
+<!-- Configurable paths
+  -->
+<!ENTITY docdir			"/usr/doc/dpkg">
+<!ENTITY infodir		"/usr/info">
+<!ENTITY datadir		"/usr/share">
+<!ENTITY bindir			"/usr/bin">
+<!ENTITY sbintdir		"/usr/sbin">
+<!ENTITY libdir			"/usr/lib">
+<!ENTITY dpkglibdir		"/usr/lib/dpkg">
+<!ENTITY methodsdir		"/usr/lib/dpkg/methods">
+<!ENTITY parsechangelogdir	"/usr/lib/dpkg/parsechangelog">
+<!ENTITY mandir			"/usr/man">
+<!ENTITY sysconfdir		"/usr/etc">
+<!ENTITY dpkgconfdir		"/usr/etc/dpkg">
+<!ENTITY alternativesdir	"/usr/etc/alternatives">

man/pt_BR/update-alternatives.8

@@ -152,7 +152,7 @@ Lhe ser
 em grupo. Uma vez que você faça uma mudança, a ligação em grupo não estará
 mais no modo
 .I auto
-. Você precisará usar a opção
+Você precisará usar a opção
 .I --auto
 para poder retornar ao estado automático.
 .SH TERMINOLOGIA

methods/Makefile

@@ -0,0 +1,45 @@
+
+srcdir		= .
+top_srcdir	= ..
+
+default: all
+include ../Makefile.conf
+
+# Available methods
+METHODS			= disk floppy
+# Scripts each method must have
+METHOD_SCRIPTS		= setup update install
+
+.PHONY: all
+all:: 
+
+.PHONY: install
+install:: all install-program install-doc
+
+.PHONY: clean
+clean::
+
+.PHONY: distclean
+cvslean:: clean
+	$(RM) Makefile
+
+.PHONY: install-program
+install-program:
+	$(mkinstalldirs) $(DESTDIR)$(methodsdir)
+	$(mkinstalldirs) $(DESTDIR)$(admindir)/methods/mnt
+	set -e ; for m in $(METHODS) ; do \
+		$(mkinstalldirs) $(DESTDIR)$(admindir)/methods/$$m ; \
+		$(mkinstalldirs) $(DESTDIR)$(methodsdir)/$$m ; \
+		for s in $(METHOD_SCRIPTS) ; do \
+		    	$(INSTALL_SCRIPT) $(srcdir)/$$m.$$s $(DESTDIR)$(methodsdir)/$$m/$$s ; \
+		done ; \
+		$(INSTALL_DATA) $(srcdir)/$$m.names $(DESTDIR)$(methodsdir)/$$m/names ; \
+		for n in `cut -d ' ' -f 2 $(srcdir)/$$m.names` ; do \
+			rn=`echo $$n | $(SED) -e 's,\.,/,'` ; \
+			$(INSTALL_DATA) $(srcdir)/$$m.desc.$$n $(DESTDIR)$(methodsdir)/$$m/desc.$$n ; \
+		done ; \
+	done
+
+.PHONY: install-doc
+install-doc:
+

mkinstalldirs

@@ -1,20 +1,32 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+
+scriptversion=2004-02-15.20
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
-# Public domain
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
 
 errstatus=0
 dirmode=""
 
 usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake@gnu.org>."
 
 # process command line arguments
 while test $# -gt 0 ; do
   case $1 in
     -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
+      echo "$usage"
       exit 0
       ;;
     -m)                         # -m PERM arg
@@ -23,6 +35,10 @@ while test $# -gt 0 ; do
       dirmode=$1
       shift
       ;;
+    --version)
+      echo "$0 $scriptversion"
+      exit 0
+      ;;
     --)                         # stop option processing
       shift
       break
@@ -50,17 +66,37 @@ case $# in
   0) exit 0 ;;
 esac
 
+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error.  This is a problem when calling mkinstalldirs
+# from a parallel make.  We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
 case $dirmode in
   '')
-    if mkdir -p -- . 2>/dev/null; then
+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
       echo "mkdir -p -- $*"
       exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the `mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because `.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./--version && rmdir ./--version
     fi
     ;;
   *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+       test ! -d ./--version; then
       echo "mkdir -m $dirmode -p -- $*"
       exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./--version "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
     fi
     ;;
 esac
@@ -84,17 +120,17 @@ do
       mkdir "$pathcomp" || lasterr=$?
 
       if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
+	errstatus=$lasterr
       else
-  	if test ! -z "$dirmode"; then
+	if test ! -z "$dirmode"; then
 	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+	  lasterr=""
+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
 
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
+	  if test ! -z "$lasterr"; then
+	    errstatus=$lasterr
+	  fi
+	fi
       fi
     fi
 
@@ -107,5 +143,8 @@ exit $errstatus
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
 # End:
-# mkinstalldirs ends here

optlib/Makefile

@@ -0,0 +1,31 @@
+
+srcdir		= .
+top_srcdir	= ..
+
+default: all
+include ../Makefile.conf
+
+SOURCES		= getopt.c getopt1.c long-options.c closeout.c obstack.c
+
+OBJECTS		= $(patsubst %.c, %.o, $(SOURCES))
+GENFILES	= $(OBJECTS) libopt.a
+
+.PHONY: all
+all:: libopt.a
+	
+libopt.a: $(OBJECTS)
+	$(AR) r $@ $^
+	$(RANLIB) $@
+
+.PHONY: install
+install:: all
+
+.PHONY: clean
+clean::
+	$(RM) $(GENFILES)
+
+
+.PHONY: distclean
+cvslean:: clean
+	$(RM) Makefile
+

po/ChangeLog

@@ -1,4 +1,8 @@
-2005-02-10  gettextize  <bug-gnu-gettext@gnu.org>
+2005-05-26  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.14.2.
+
+2005-05-26  gettextize  <bug-gnu-gettext@gnu.org>
 
 	* Makefile.in.in: New file, from gettext-0.14.1.
 	* Rules-quot: New file, from gettext-0.14.1.

po/Makefile.in.in

@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # 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,10 +8,11 @@
 # 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
+# Origin: gettext-0.14.2
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
 SHELL = /bin/sh
 @SET_MAKE@
@@ -100,11 +101,16 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
 $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
 	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
 	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
 	  --files-from=$(srcdir)/POTFILES.in \
 	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	  --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)'
+	  --msgid-bugs-address="$$msgid_bugs_address"
 	test ! -f $(DOMAIN).po || { \
 	  if test -f $(srcdir)/$(DOMAIN).pot; then \
 	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \

po/bs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2004-11-27 01:29+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"

po/ca.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.25\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-09 19:53+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"

po/cs.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-01 16:47+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <provoz@debian.cz>\n"

po/da.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_1.10.19_da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-01 22:10+0100\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"

po/de.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.10.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-03 11:24 +0100\n"
 "Last-Translator: Michael Piefel <piefel@debian.org>\n"
 "Language-Team: German <de@debian-l10n-german@lists.debian.org>\n"

po/dpkg.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

po/es.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.10.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2004-12-31 12:07+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"

po/eu.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-09 20:49+0100\n"
 "Last-Translator: Piarres Beobide  <pi@beobide.net>\n"
 "Language-Team: Librezale.org <librezale@librezale.org>\n"

po/fr.po

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Debian dpkg 1.6.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2004-12-31 07:30+0100\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1676,7 +1676,7 @@ msgstr " entre en conflit avec "
 
 #: main/depcon.c:157
 msgid " suggests "
-msgstr "suggère "
+msgstr " suggère "
 
 #: main/depcon.c:158
 msgid " enhances "

po/gl.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-02-05 13:10+0100\n"
 "Last-Translator: Héctor Fernández López <trorrr@yahoo.es>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"

po/he.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2004-10-07 03:01+0200\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: English <en@li.org>\n"

po/it.po

@@ -41,7 +41,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-06 17:59+0100\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: italian <debian-l10n-italian@debian.org>\n"

po/ja.po

@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.10.23\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2004-12-31 16:22+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanease List <debian-japanese@lists.debian.org>\n"

po/ko.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.10.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2004-11-21 03:52+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <cwryu@debian.org>\n"

po/nb.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-25 11:14+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"

po/nl.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-06 23:41+0100\n"
 "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
 "Language-Team: Dutch <debian-l10n-dutch@debian.org>\n"

po/nn.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg_nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-08 16:16+0100\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian (Nynorsk) <i18n-nn@lister.ping.uio.no>\n"

po/pl.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.9.20\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-05 19:50+0100\n"
 "Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"

po/pt.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-09 09:20+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"

po/pt_BR.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-06 16:42-0200\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"

po/ru.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-01 11:38+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@id.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"

po/sk.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-08 17:21-0500\n"
 "Last-Translator: Roman Benko <benco@acid.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"

po/sv.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-01-01 23:52+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Peter Karlsson <peterk@debian.org>\n"

po/zh_CN.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-02-07 05:27+1300\n"
 "Last-Translator: Tchaikov <chaisave@263.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"

po/zh_TW.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 15:25+0000\n"
+"POT-Creation-Date: 2005-05-26 17:21+0000\n"
 "PO-Revision-Date: 2005-02-05 19:54+0800\n"
 "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"

scripts/Makefile

@@ -0,0 +1,105 @@
+
+srcdir		= .
+top_srcdir	= ..
+
+default: all
+include ../Makefile.conf
+
+BIN_SCRIPTS		= dpkg-name dpkg-source dpkg-genchanges \
+			  dpkg-gencontrol dpkg-shlibdeps dpkg-buildpackage \
+			  dpkg-parsechangelog dpkg-distaddfile 822-date \
+			  dpkg-scanpackages dpkg-scansources \
+			  dpkg-architecture dpkg-checkbuilddeps
+
+SBIN_SCRIPTS		= update-alternatives install-info \
+			  dpkg-divert dpkg-statoverride cleanup-info
+
+MAN1PAGES		= dpkg-name.1 dpkg-source.1 822-date.1 \
+			  dpkg-checkbuilddeps.1 dpkg-scanpackages.1 \
+			  dpkg-scansources.1
+MAN8PAGES		= update-alternatives.8 install-info.8  \
+			  cleanup-info.8 dpkg-divert.8 dpkg-statoverride.8
+
+CHANGELOG_PARSERS	= cl-debian
+
+SCRIPTLIBS		= controllib.pl
+
+GEN_MAN1PAGES		= dpkg-architecture.1 dpkg-scansources.1
+
+MAN_SOURCE_ALIASES	= dpkg-gencontrol.1 dpkg-genchanges.1 dpkg-buildpackage.1 \
+			  dpkg-distaddfile.1 dpkg-parsechangelog.1 dpkg-shlibdeps.1
+
+GENFILES		= $(CHANGELOG_PARSERS) $(BIN_SCRIPTS) $(SBIN_SCRIPTS) $(GEN_MAN1PAGES)
+
+.PHONY: all
+all:: $(GENFILES)
+
+.PHONY: install
+install:: all install-program install-doc
+
+.PHONY: clean
+clean::
+	$(RM) $(GENFILES)
+
+.PHONY: distclean
+cvslean:: clean
+	$(RM) Makefile
+
+.PHONY: install-program
+install-program:
+	$(mkinstalldirs) $(DESTDIR)/$(bindir)
+	set -e ; for i in $(BIN_SCRIPTS) ; do \
+		if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+		$(INSTALL_SCRIPT) $$d$$i $(DESTDIR)/$(bindir) ; \
+	done
+	$(mkinstalldirs) $(DESTDIR)/$(sbindir)
+	set -e ; for i in $(SBIN_SCRIPTS) ; do \
+		if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+		$(INSTALL_SCRIPT) $$d$$i $(DESTDIR)/$(sbindir) ; \
+	done
+	$(mkinstalldirs) $(DESTDIR)/$(alternativesdir)
+	$(INSTALL_DATA) $(srcdir)/README.alternatives \
+		$(DESTDIR)/$(alternativesdir)/README
+	$(mkinstalldirs) $(DESTDIR)/$(parsechangelogdir)
+	set -e ; for i in $(CHANGELOG_PARSERS) ; do \
+		if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+		rn=`echo $$i | $(SED) -e 's/^cl-//'` ; \
+		$(INSTALL_SCRIPT) $$d$$i $(DESTDIR)/$(parsechangelogdir)/$$rn ; \
+	done
+	$(mkinstalldirs) $(DESTDIR)/$(dpkglibdir)
+	set -e ; for i in $(SCRIPTLIBS) ; do \
+		if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+		$(INSTALL_DATA) $$d$$i $(DESTDIR)/$(dpkglibdir) ; \
+	done
+
+.PHONY: install-doc
+install-doc:
+	$(mkinstalldirs) $(DESTDIR)/$(man1dir)
+	set -e ; for i in $(MAN1PAGES) $(GEN_MAN1PAGES) ; do \
+		if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+		$(INSTALL_DATA) $$d$$i $(DESTDIR)/$(man1dir) ; \
+	done
+	set -e ; for i in $(MAN_SOURCE_ALIASES) ; do \
+		echo ".so man1/dpkg-source.1" > $(DESTDIR)$(man1dir)/$$i ; \
+		chmod 644 $(DESTDIR)$(man1dir)/$$i ; \
+	done
+	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
+	set -e ; for i in $(MAN8PAGES) $(GEN_MAN8PAGES) ; do \
+		if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
+		$(INSTALL_DATA) $$d$$i $(DESTDIR)/$(man8dir) ; \
+	done
+
+
+%.1: $(srcdir)/%.pl
+	pod2man --section=1 $^ > $@
+
+%: %.pl
+	$(SED) -e "s:^#![:space:]*/usr/bin/perl:#! $(PERL):; \
+		s:\$$dpkglibdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$dpkglibdir=\"$(dpkglibdir)\":; \
+		s:\$$admindir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$admindir=\"$(admindir)\":; \
+		s:\$$version[[:space:]]*=[[:space:]]*['\"][^'\"]*[\"']:\$$version=\"$(VERSION)\":" \
+		< $< > $@
+
+%: %.sh 
+	$(SED) -e "s:version=\"[^\"]*\":version=\"$(VERSION)\":" \
+		< $< > $@

scripts/dpkg-architecture.1

@@ -1,403 +0,0 @@
-.rn '' }`
-''' $RCSfile: dpkg-architecture.1,v $$Revision: 1.4 $$Date: 1999/09/27 01:37:25 $
-'''
-''' $Log: dpkg-architecture.1,v $
-''' Revision 1.4  1999/09/27 01:37:25  wakkerma
-''' Updated to dpkg 1.4.1.11
-'''
-'''
-.de Sh
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
-.de Sp
-.if t .sp .5v
-.if n .sp
-..
-.de Ip
-.br
-.ie \\n(.$>=3 .ne \\$3
-.el .ne 3
-.IP "\\$1" \\$2
-..
-.de Vb
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve
-.ft R
-
-.fi
-..
-'''
-'''
-'''     Set up \*(-- to give an unbreakable dash;
-'''     string Tr holds user defined translation string.
-'''     Bell System Logo is used as a dummy character.
-'''
-.tr \(*W-|\(bv\*(Tr
-.ie n \{\
-.ds -- \(*W-
-.ds PI pi
-.if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
-.ds L" ""
-.ds R" ""
-'''   \*(M", \*(S", \*(N" and \*(T" are the equivalent of
-'''   \*(L" and \*(R", except that they are used on ".xx" lines,
-'''   such as .IP and .SH, which do another additional levels of
-'''   double-quote interpretation
-.ds M" """
-.ds S" """
-.ds N" """""
-.ds T" """""
-.ds L' '
-.ds R' '
-.ds M' '
-.ds S' '
-.ds N' '
-.ds T' '
-'br\}
-.el\{\
-.ds -- \(em\|
-.tr \*(Tr
-.ds L" ``
-.ds R" ''
-.ds M" ``
-.ds S" ''
-.ds N" ``
-.ds T" ''
-.ds L' `
-.ds R' '
-.ds M' `
-.ds S' '
-.ds N' `
-.ds T' '
-.ds PI \(*p
-'br\}
-.\"	If the F register is turned on, we'll generate
-.\"	index entries out stderr for the following things:
-.\"		TH	Title 
-.\"		SH	Header
-.\"		Sh	Subsection 
-.\"		Ip	Item
-.\"		X<>	Xref  (embedded
-.\"	Of course, you have to process the output yourself
-.\"	in some meaninful fashion.
-.if \nF \{
-.de IX
-.tm Index:\\$1\t\\n%\t"\\$2"
-..
-.nr % 0
-.rr F
-.\}
-.TH DPKG-ARCHITECTURE 1 "perl 5.004, patch 04" "24/Jul/99" "User Contributed Perl Documentation"
-.UC
-.if n .hy 0
-.if n .na
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.de CQ          \" put $1 in typewriter font
-.ft CW
-'if n "\c
-'if t \\&\\$1\c
-'if n \\&\\$1\c
-'if n \&"
-\\&\\$2 \\$3 \\$4 \\$5 \\$6 \\$7
-'.ft R
-..
-.\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
-.	\" AM - accent mark definitions
-.bd B 3
-.	\" fudge factors for nroff and troff
-.if n \{\
-.	ds #H 0
-.	ds #V .8m
-.	ds #F .3m
-.	ds #[ \f1
-.	ds #] \fP
-.\}
-.if t \{\
-.	ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.	ds #V .6m
-.	ds #F 0
-.	ds #[ \&
-.	ds #] \&
-.\}
-.	\" simple accents for nroff and troff
-.if n \{\
-.	ds ' \&
-.	ds ` \&
-.	ds ^ \&
-.	ds , \&
-.	ds ~ ~
-.	ds ? ?
-.	ds ! !
-.	ds /
-.	ds q
-.\}
-.if t \{\
-.	ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.	ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.	ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.	ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.	ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.	ds ? \s-2c\h'-\w'c'u*7/10'\u\h'\*(#H'\zi\d\s+2\h'\w'c'u*8/10'
-.	ds ! \s-2\(or\s+2\h'-\w'\(or'u'\v'-.8m'.\v'.8m'
-.	ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.	ds q o\h'-\w'o'u*8/10'\s-4\v'.4m'\z\(*i\v'-.4m'\s+4\h'\w'o'u*8/10'
-.\}
-.	\" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds v \\k:\h'-(\\n(.wu*9/10-\*(#H)'\v'-\*(#V'\*(#[\s-4v\s0\v'\*(#V'\h'|\\n:u'\*(#]
-.ds _ \\k:\h'-(\\n(.wu*9/10-\*(#H+(\*(#F*2/3))'\v'-.4m'\z\(hy\v'.4m'\h'|\\n:u'
-.ds . \\k:\h'-(\\n(.wu*8/10)'\v'\*(#V*4/10'\z.\v'-\*(#V*4/10'\h'|\\n:u'
-.ds 3 \*(#[\v'.2m'\s-2\&3\s0\v'-.2m'\*(#]
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.ds oe o\h'-(\w'o'u*4/10)'e
-.ds Oe O\h'-(\w'O'u*4/10)'E
-.	\" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.	\" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.	ds : e
-.	ds 8 ss
-.	ds v \h'-1'\o'\(aa\(ga'
-.	ds _ \h'-1'^
-.	ds . \h'-1'.
-.	ds 3 3
-.	ds o a
-.	ds d- d\h'-1'\(ga
-.	ds D- D\h'-1'\(hy
-.	ds th \o'bp'
-.	ds Th \o'LP'
-.	ds ae ae
-.	ds Ae AE
-.	ds oe oe
-.	ds Oe OE
-.\}
-.rm #[ #] #H #V #F C
-.SH "NAME"
-dpkg-architecture \- set and determine the architecture for package building
-.SH "SYNOPSIS"
-dpkg-architecture [options] [action]
-.PP
-Valid options:
-\fB\-a\fRDebian-Architecture
-\fB\-t\fRGnu-System-Type
-\fB\-f\fR
-.PP
-Valid actions:
-\fB\-l\fR, \fB\-q\fRVariable-Name, \fB\-s\fR, \fB\-u\fR, \fB\-c\fR Command
-.SH "DESCRIPTION"
-dpkg-architecture does provide a facility to determine and set the build and
-host architecture for package building.
-.SH "OVERVIEW"
-The build architecture is always determined by an external call to dpkg, and
-can not be set at the command line.
-.PP
-You can specify the host architecture by providing one or both of the options \fB\-a\fR
-and \fB\-t\fR. The default is determined by an external call to gcc, or the same as
-the build architecture if CC or gcc are both not available. One out of \fB\-a\fR and \fB\-t\fR
-is sufficient, the value of the other will be set to a usable default.
-Indeed, it is often better to only specify one, because dpkg-architecture
-will warn you if your choice doesn't match the default.
-.PP
-The default action is \fB\-l\fR, which prints the environment variales, one each line,
-in the format VARIABLE=value. If you are only interested in the value of a
-single variable, you can use \fB\-q\fR. If you specify \fB\-s\fR, it will output an export
-command. This can be used to set the environment variables using eval. \fB\-u\fR
-does return a similar command to unset all variables. \fB\-c\fR does execute a
-command in an environment which has all variables set to the determined
-value.
-.PP
-Existing environment variables with the same name as used by the scripts are
-not overwritten, except if the \fB\-f\fR force flag is present. This allows the user
-to override a value even when the call to dpkg-architecture is buried in
-some other script (for example dpkg-buildpackage). The \fB\-q\fR query option
-implies \fB\-f\fR, and is therefore not affected by existing environment settings.
-.SH "TERMS"
-.Ip "build machine" 4
-The machine the package is build on.
-.Ip "host machine" 4
-The machine the package is build for.
-.Ip "Debian Architecture" 4
-The Debian archietcture string, which specifies the binary tree in the \s-1FTP\s0
-archive. Examples: i386, sparc, hurd-i386.
-.Ip "\s-1GNU\s0 System Type" 4
-An architecture specification string consisting of two or three parts,
-cpu-system or cpu-vendor-system. Examples: i386-linux, sparc-linux, i386-gnu.
-.SH "EXAMPLES"
-dpkg-buildpackage accepts the \fB\-a\fR option and passes it to dpkg-architecture.
-Other examples:
-.PP
-CC=i386-gnu-gcc dpkg-architecture \f(CW-c\fR debian/rules build
-.PP
-eval `dpkg-architecture \f(CW-u\fR`
-.SH "VARIABLES"
-The following variables are set by dpkg-architecture:
-.Ip "\s-1DEB_BUILD_ARCH\s0" 4
-The Debian architecture of the build machine.
-.Ip "\s-1DEB_BUILD_GNU_TYPE\s0" 4
-The \s-1GNU\s0 system type of the build machine.
-.Ip "\s-1DEB_BUILD_GNU_CPU\s0" 4
-The \s-1CPU\s0 part of \s-1DEB_BUILD_GNU_TYPE\s0
-.Ip "\s-1DEB_BUILD_GNU_SYSTEM\s0" 4
-The System part of \s-1DEB_BUILD_GNU_TYPE\s0
-.Ip "\s-1DEB_HOST_ARCH\s0" 4
-The Debian architecture of the host machine.
-.Ip "\s-1DEB_HOST_GNU_TYPE\s0" 4
-The \s-1GNU\s0 system type of the host machine.
-.Ip "\s-1DEB_HOST_GNU_CPU\s0" 4
-The \s-1CPU\s0 part of \s-1DEB_HOST_GNU_TYPE\s0
-.Ip "\s-1DEB_HOST_GNU_SYSTEM\s0" 4
-The System part of \s-1DEB_HOST_GNU_TYPE\s0
-.SH "DEBIAN/RULES"
-The environment variables set by dpkg-architecture are passed to
-debian/rules as make variables (see make documentation). You can and should
-use them in the build process as needed. Here are some examples, which also
-show how you can improve the cross compilation support in your package:
-.PP
-Instead:
-.PP
-ARCH=`dpkg --print-architecture`
-configure $(ARCH)\-linux
-.PP
-please use the following:
-.PP
-B_ARCH=$(DEB_BUILD_GNU_TYPE)
-H_ARCH=$(DEB_HOST_GNU_TYPE)
-configure --build=$(B_ARCH) --host=$(H_ARCH)
-.PP
-Instead:
-.PP
-ARCH=`dpkg --print-architecture`
-ifeq ($(ARCH),alpha)
-  ...
-endif
-.PP
-please use:
-.PP
-ARCH=$(DEB_HOST_ARCH)
-ifeq ($(ARCH),alpha)
-  ...
-endif
-.PP
-In general, calling dpkg in the rules file to get architecture information
-is deprecated (until you want to provide backward compatibility, see below).
-Especially the --print-architecture option is unreliable since we have
-Debian architectures which don't equal a processor name.
-.SH "BACKWARD COMPATIBILITY"
-When providing a new facility, it is always a good idea to stay compatible with old
-versions of the programs. Note that dpkg-architecture does not affect old
-debian/rules files, so the only thing to consider is using old building
-scripts with new debian/rules files. The following does the job:
-.PP
-DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture)
-DEB_BUILD_GNU_CPU := $(patsubst hurd-%,%,$(DEB_BUILD_ARCH))
-ifeq ($(filter-out hurd-%,$(DEB_BUILD_ARCH)),)
-  DEB_BUILD_GNU_SYSTEM := gnu
-else
-  DEB_BUILD_GNU_SYSTEM := linux
-endif
-DEB_BUILD_GNU_TYPE=$(DEB_BUILD_GNU_CPU)\-$(DEB_BUILD_GNU_SYSTEM)
-.PP
-DEB_HOST_ARCH=$(DEB_BUILD_ARCH)
-DEB_HOST_GNU_CPU=$(DEB_BUILD_GNU_CPU)
-DEB_HOST_GNU_SYSTEM=$(DEB_BUILD_GNU_SYSTEM)
-DEB_HOST_GNU_TYPE=$(DEB_BUILD_GNU_TYPE)
-.PP
-Put a subset of these lines at the top of your debian/rules file; these
-default values will be overwritten if dpkg-architecture is used.
-.PP
-You don't need the full set. Choose a consistent set which contains the
-values you use in the rules file. For example, if you only need the host
-Debian architecture, `DEB_HOST_ARCH=`dpkg --print-installation-architecture`
-is sufficient (this is indeed the Debian architecture of the build machine,
-but remember that we are only trying to be backward compatible with native
-compilation).
-.PP
-You may not want to care about old build packages (for example, if you have
-sufficient source dependencies declared anyway). But you should at least
-support the traditional way to build packages by calling `debian/rules
-build\*(R' directly, without setting environment variables. To do this, use the
-\fB\-q\fR option to query suitable default values:
-.PP
-DEB_BUILD_ARCH=`dpkg-architecture \-qDEB_BUILD_ARCH`
-DEB_BUILD_GNU=`dpkg-architecture \-qDEB_BUILD_GNU`
-.PP
-etc. You get the idea. This way, you can ensure that the variables are never
-undeclared. Note that this breaks backwards compatibility with old build
-scripts, and you should only do that if source dependencies are implemented
-and declared accordingly.
-.SH "SEE ALSO"
-dpkg-buildpackage
-dpkg-cross
-.SH "CONTACT"
-If you have questions about the usage of the make variables in your rules
-files, or about cross compilation support in your packages, please email me.
-The addresse is Marcus Brinkmann <brinkmd@debian.org>.
-
-.rn }` ''
-.IX Title "DPKG-ARCHITECTURE 1"
-.IX Name "dpkg-architecture - set and determine the architecture for package building"
-
-.IX Header "NAME"
-
-.IX Header "SYNOPSIS"
-
-.IX Header "DESCRIPTION"
-
-.IX Header "OVERVIEW"
-
-.IX Header "TERMS"
-
-.IX Item "build machine"
-
-.IX Item "host machine"
-
-.IX Item "Debian Architecture"
-
-.IX Item "\s-1GNU\s0 System Type"
-
-.IX Header "EXAMPLES"
-
-.IX Header "VARIABLES"
-
-.IX Item "\s-1DEB_BUILD_ARCH\s0"
-
-.IX Item "\s-1DEB_BUILD_GNU_TYPE\s0"
-
-.IX Item "\s-1DEB_BUILD_GNU_CPU\s0"
-
-.IX Item "\s-1DEB_BUILD_GNU_SYSTEM\s0"
-
-.IX Item "\s-1DEB_HOST_ARCH\s0"
-
-.IX Item "\s-1DEB_HOST_GNU_TYPE\s0"
-
-.IX Item "\s-1DEB_HOST_GNU_CPU\s0"
-
-.IX Item "\s-1DEB_HOST_GNU_SYSTEM\s0"
-
-.IX Header "DEBIAN/RULES"
-
-.IX Header "BACKWARD COMPATIBILITY"
-
-.IX Header "SEE ALSO"
-
-.IX Header "CONTACT"
-

split/Makefile

@@ -0,0 +1,48 @@
+
+
+srcdir		= .
+top_srcdir	= ..
+
+default: all
+include ../Makefile.conf
+
+SPLIT_SOURCES		= queue.c split.c info.c join.c main.c
+SPLIT_OBJECTS		= $(patsubst %.c, %.o, $(SPLIT_SOURCES))
+
+GENFILES		= $(SPLIT_OBJECTS) dpkg-split
+
+.PHONY: all
+all:: dpkg-split
+
+.PHONY: install
+install:: all
+
+.PHONY: clean
+clean::
+	$(RM) $(GENFILES)
+
+.PHONY: distclean
+cvslean:: clean
+	$(RM) Makefile
+
+.PHONY: install
+install:: install-program install-doc
+
+.PHONY: install-program
+install-program:
+	$(mkinstalldirs) $(DESTDIR)/$(bindir)
+	$(INSTALL) dpkg-split $(DESTDIR)$(bindir)
+	$(mkinstalldirs) $(DESTDIR)/$(admindir)/parts
+	$(mkinstalldirs) $(DESTDIR)/$(dpkglibdir)
+	$(INSTALL) $(srcdir)/mksplit.pl $(DESTDIR)/$(dpkglibdir)/mksplit
+
+.PHONY: install-doc
+install-doc:
+	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
+	$(INSTALL_DATA) $(srcdir)/dpkg-split.8 $(DESTDIR)/$(man8dir)
+
+dpkg-split: $(SPLIT_OBJECTS) 
+	$(CC) $(LDFLAGS) -o $@ $(SPLIT_OBJECTS) $(LIBS) $(NLS_LIBS)
+
+split.o: split.c
+	$(CC) $(ALL_CFLAGS) -DMKSPLITSCRIPT=\"$(dpkglibdir)/mksplit\" -c $<

utils/Makefile

@@ -0,0 +1,80 @@
+
+
+srcdir		= .
+top_srcdir	= ..
+
+default: all
+include ../Makefile.conf
+
+CFLAGS			+= -I$(top_srcdir)/optlib
+
+SSD_SOURCES		= start-stop-daemon.c
+SSD_OBJECTS		= $(patsubst %.c, %.o, $(SSD_SOURCES))
+SSD_MANPAGES		= start-stop-daemon.8
+
+MD5_SOURCES		= md5sum.c
+MD5_OBJECTS		= $(patsubst %.c, %.o, $(MD5_SOURCES))
+MD5_MANPAGES		= md5sum.1
+
+ENOENT_SOURCES		= enoent.c
+ENOENT_OBJECTS		= $(patsubst %.c, %.o, $(ENOENT_SOURCES))
+
+GENFILES		= $(MD5_OBJECTS) md5sum md5sum-static $(ENOENT_OBJECTS) enoent
+ifeq (true, true)
+GENFILES		+= $(SSD_OBJECTS) start-stop-daemon
+endif
+
+.PHONY: all
+ifeq (true, true)
+all:: start-stop-daemon md5sum enoent
+else
+all:: md5sum enoent
+endif
+
+.PHONY: install
+install:: all
+ifdef ALSO_STATIC
+all:: md5sum-static
+endif
+
+.PHONY: clean
+clean::
+	$(RM) $(GENFILES)
+
+.PHONY: distclean
+cvslean:: clean
+	$(RM) Makefile confdefs.h config.log
+
+.PHONY: install
+install:: install-program install-doc
+
+.PHONY: install-program
+install-program:
+ifeq (true, true)
+	$(mkinstalldirs) $(DESTDIR)/$(sbindir)
+	$(INSTALL_PROGRAM) start-stop-daemon $(DESTDIR)/$(sbindir)
+endif
+	$(mkinstalldirs) $(DESTDIR)/$(bindir)
+	$(INSTALL_PROGRAM) md5sum $(DESTDIR)/$(bindir)
+ifdef ALSO_STATIC
+	$(INSTALL_PROGRAM) md5sum-static $(DESTDIR)/$(bindir)
+endif
+	$(mkinstalldirs) $(DESTDIR)/$(dpkglibdir)
+	$(INSTALL_PROGRAM) enoent $(DESTDIR)/$(dpkglibdir)
+
+.PHONY: install-doc
+install-doc:
+ifeq (true, true)
+	$(mkinstalldirs) $(DESTDIR)/$(man8dir)
+	$(INSTALL_DATA) $(srcdir)/$(SSD_MANPAGES) $(DESTDIR)/$(man8dir)
+endif
+	$(mkinstalldirs) $(DESTDIR)/$(man1dir)
+	$(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir)
+
+start-stop-daemon: $(SSD_OBJECTS) ../lib/libdpkg.a
+	$(CC) $(LDFLAGS) -o $@ $(SSD_OBJECTS) $(LIBS) $(SSD_LIBS)
+
+md5sum-static: LDFLAGS += -static
+md5sum-static: ZLIB_LIBS = $(ZLIBS_LIBS_ALSO_STATIC)
+md5sum md5sum-static: $(MD5_OBJECTS) ../lib/libdpkg.a
+	$(CC) $(LDFLAGS) -o $@ $(MD5_OBJECTS) $(LIBS) $(NLS_LIBS)

version-nr

@@ -1 +1 @@
-1.10.27
+1.10.28