+++ /dev/null
---- dpkg-1.6.15/configure.in.orig Fri Oct 19 22:48:16 2001
-+++ dpkg-1.6.15/configure.in Fri Oct 19 22:50:56 2001
-@@ -49,8 +49,8 @@
- fi
- AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])
--AC_REQUIRE([AC_ARG_PROGRAM])
--AC_REQUIRE([AC_PROG_MAKE_SET])
-+AC_ARG_PROGRAM
-+AC_PROG_MAKE_SET
-
- AC_MSG_CHECKING(dpkg version)
- AC_MSG_RESULT($VERSION)
-diff -Nur dpkg-1.6.15.orig/acinclude.m4 dpkg-1.6.15/acinclude.m4
---- dpkg-1.6.15.orig/acinclude.m4 Thu Jan 1 01:00:00 1970
-+++ dpkg-1.6.15/acinclude.m4 Fri Oct 19 22:54:18 2001
-@@ -0,0 +1,91 @@
-+dnl Bunch of extra macros to make dpkg more portable
-+dnl Copyright (C) 1999 Wichert Akkerman <wakkerma@debian.org>
-+dnl
-+dnl This program is free software; you can redistribute it and/or modify
-+dnl it under the terms of the GNU General Public License as published by
-+dnl the Free Software Foundation; either version 2, or (at your option)
-+dnl any later version.
-+dnl
-+dnl This program is distributed in the hope that it will be useful,
-+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+dnl GNU General Public License for more details.
-+dnl
-+dnl You should have received a copy of the GNU General Public License
-+dnl along with this program; if not, write to the Free Software
-+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+dnl 02111-1307, USA.
-+
-+AC_DEFUN(AC_HAVE_SYSINFO,
-+[AC_CACHE_CHECK(whether sysinfo is available,
-+ ac_cv_func_sysinfo,
-+[ AC_CHECK_FUNC(sysinfo,ac_cv_func_sysinfo=yes,ac_cv_func_sysinfo=no)])
-+if test "$ac_cv_func_sysinfo" = "yes" ; then
-+ AC_DEFINE(HAVE_SYSINFO)
-+fi
-+])
-+
-+AC_DEFUN(AC_MEMINFO_IN_SYSINFO,
-+[AC_REQUIRE([AC_HAVE_SYSINFO])dnl
-+ if test "$ac_cv_header_sys_sysinfo" = "" ; then
-+ AC_CHECK_HEADERS(sys/sysinfo.h)
-+ fi
-+ AC_CACHE_CHECK(whether struct sysinfo contains memory information,
-+ ac_cv_meminfo_in_sysinfo,
-+[AC_TRY_COMPILE([
-+#ifdef HAVE_SYS_SYSINFO_H
-+#include <sys/sysinfo.h>
-+#endif
-+], [struct sysinfo si ; si.freeram;si.sharedram;si.bufferram;],
-+ ac_cv_meminfo_in_sysinfo=yes, ac_cv_meminfo_in_sysinfo=no)])
-+ if test "$ac_cv_have_sysinfo_meminfo" = yes ; then
-+ AC_DEFINE(MEMINFO_IN_SYSINFO)
-+ fi
-+])
-+
-+
-+
-+dnl Moved from configure.in, modified to use AC_DEFUN
-+dnl -- Tom Lees <tom@lpsg.demon.co.uk>
-+
-+dnl DPKG_CACHED_TRY_COMPILE(<description>,<cachevar>,<include>,<program>,<ifyes>,<ifno>)
-+AC_DEFUN(DPKG_CACHED_TRY_COMPILE,[
-+ AC_MSG_CHECKING($1)
-+ AC_CACHE_VAL($2,[
-+ AC_TRY_COMPILE([$3],[$4],[$2=yes],[$2=no])
-+ ])
-+ if test "x$$2" = xyes; then
-+ true
-+ $5
-+ else
-+ true
-+ $6
-+ fi
-+])
-+
-+dnl DPKG_C_GCC_TRY_WARNS(<warnings>,<cachevar>)
-+AC_DEFUN(DPKG_C_GCC_TRY_WARNS,[
-+ AC_MSG_CHECKING([GCC warning flag(s) $1])
-+ if test "${GCC-no}" = yes
-+ then
-+ AC_CACHE_VAL($2,[
-+ oldcflags="${CFLAGS-}"
-+ CFLAGS="${CFLAGS-} ${CWARNS} $1 -Werror"
-+ AC_TRY_COMPILE([
-+#include <string.h>
-+#include <stdio.h>
-+],[
-+ strcmp("a","b"); fprintf(stdout,"test ok\n");
-+], [$2=yes], [$2=no])
-+ CFLAGS="${oldcflags}"])
-+ if test "x$$2" = xyes; then
-+ CWARNS="${CWARNS} $1"
-+ AC_MSG_RESULT(ok)
-+ else
-+ $2=''
-+ AC_MSG_RESULT(no)
-+ fi
-+ else
-+ AC_MSG_RESULT(no, not using GCC)
-+ fi
-+])
+++ /dev/null
-diff -urN dpkg-1.6.15.orig/utils/start-stop-daemon.c dpkg-1.6.15/utils/start-stop-daemon.c
---- dpkg-1.6.15.orig/utils/start-stop-daemon.c 2000-01-09 02:31:18.000000000 +0100
-+++ dpkg-1.6.15/utils/start-stop-daemon.c 2003-08-30 22:38:37.000000000 +0200
-@@ -161,34 +161,34 @@
- static void
- do_help(void)
- {
-- printf("\
--start-stop-daemon for Debian GNU/Linux - small and fast C version written by\n\
--Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>, public domain.\n"
--VERSION "\n\
--\n\
--Usage:
-- start-stop-daemon -S|--start options ... -- arguments ...\n\
-- start-stop-daemon -K|--stop options ...\n\
-- start-stop-daemon -H|--help\n\
-- start-stop-daemon -V|--version\n\
--\n\
--Options (at least one of --exec|--pidfile|--user is required):
-- -x|--exec <executable> program to start/check if it is running\n\
-- -p|--pidfile <pid-file> pid file to check\n\
-- -c|--chuid <name|uid[:group|gid]>
-- change to this user/group before starting process\n\
-- -u|--user <username>|<uid> stop processes owned by this user\n\
-- -n|--name <process-name> stop processes with this name\n\
-- -s|--signal <signal> signal to send (default TERM)\n\
-- -a|--startas <pathname> program to start (default is <executable>)\n\
-- -b|--background force the process to detach\n\
-- -m|--make-pidfile create the pidfile before starting\n\
-- -t|--test test mode, don't do anything\n\
-- -o|--oknodo exit status 0 (not 1) if nothing done\n\
-- -q|--quiet be more quiet\n\
-- -v|--verbose be more verbose\n\
--\n\
--Exit status: 0 = done 1 = nothing done (=> 0 if --oknodo) 2 = trouble\n");
-+ printf("\n"
-+"start-stop-daemon for Debian GNU/Linux - small and fast C version written by\n"
-+"Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>, public domain.\n"
-+VERSION "\n"
-+"\n"
-+"Usage:\n"
-+" start-stop-daemon -S|--start options ... -- arguments ...\n"
-+" start-stop-daemon -K|--stop options ...\n"
-+" start-stop-daemon -H|--help\n"
-+" start-stop-daemon -V|--version\n"
-+"\n"
-+"Options (at least one of --exec|--pidfile|--user is required):\n"
-+" -x|--exec <executable> program to start/check if it is running\n"
-+" -p|--pidfile <pid-file> pid file to check\n"
-+" -c|--chuid <name|uid[:group|gid]>\n"
-+" change to this user/group before starting process\n"
-+" -u|--user <username>|<uid> stop processes owned by this user\n"
-+" -n|--name <process-name> stop processes with this name\n"
-+" -s|--signal <signal> signal to send (default TERM)\n"
-+" -a|--startas <pathname> program to start (default is <executable>)\n"
-+" -b|--background force the process to detach\n"
-+" -m|--make-pidfile create the pidfile before starting\n"
-+" -t|--test test mode, don't do anything\n"
-+" -o|--oknodo exit status 0 (not 1) if nothing done\n"
-+" -q|--quiet be more quiet\n"
-+" -v|--verbose be more verbose\n"
-+"\n"
-+"Exit status: 0 = done 1 = nothing done (=> 0 if --oknodo) 2 = trouble\n");
- }
-
-
+++ /dev/null
---- dpkg-1.6.14/doc/Makefile.in~ Tue May 16 17:24:23 2000
-+++ dpkg-1.6.14/doc/Makefile.in Mon Jul 31 19:02:11 2000
-@@ -8,7 +8,7 @@
-
- MAN5PAGES = deb-control.5 deb-old.5 deb.5
-
--all: internals.html all-recursive
-+all: all-recursive
-
- clean: clean-recursive
- $(RM) $(srcdir)/manuals-version
---- dpkg-1.6.14/doc/Makefile.in~ Mon Jul 31 19:05:04 2000
-+++ dpkg-1.6.14/doc/Makefile.in Mon Jul 31 19:07:11 2000
-@@ -33,11 +33,6 @@
- if test -f $$i ; then d= ; else d="$(srcdir)/" ; fi ; \
- $(INSTALL_DATA) $$d$$i $(DESTDIR)$(man5dir) ; \
- done
-- $(mkinstalldirs) $(DESTDIR)$(docdir)/internals/
-- set -e ; for i in internals.html/* ; do \
-- bn=`basename $$i` ; \
-- $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/internals/$$bn ; \
-- done
- $(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(docdir)/ChangeLog.manuals
- set -e ; for i in ChangeLog THANKS TODO ; do \
- $(INSTALL_DATA) $(top_srcdir)/$$i $(DESTDIR)$(docdir) ; \
+++ /dev/null
---- scripts/Makefile.in.old Sun Nov 4 17:54:04 2001
-+++ scripts/Makefile.in Sun Nov 4 17:54:09 2001
-@@ -84,7 +84,7 @@
- $(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 ; \
-+ echo ".so dpkg-source.1" > $(DESTDIR)$(man1dir)/$$i ; \
- chmod 644 $(DESTDIR)$(man1dir)/$$i ; \
- done
- $(mkinstalldirs) $(DESTDIR)/$(man8dir)
+++ /dev/null
---- dpkg-1.6.14/configure.in.orig Mon May 29 14:22:15 2000
-+++ dpkg-1.6.14/configure.in Mon Jan 15 23:23:14 2001
-@@ -112,12 +112,11 @@
-
- AC_SUBST(OPTCFLAGS)
- if test "${GCC-no}" = yes; then
-- CFLAGS="-D_REENTRANT -D_GNU_SOURCE -O2"
-- CXXFLAGS="-D_REENTRANT -D_GNU_SOURCE -O2"
-- OPTCFLAGS="-O3"
-+ CFLAGS="-D_REENTRANT -D_GNU_SOURCE $CFLAGS"
-+ CXXFLAGS="-D_REENTRANT -D_GNU_SOURCE $CXXFLAGS"
- else
-- CFLAGS="-D_REENTRANT -D_GNU_SOURCE -O"
-- CXXFLAGS="-D_REENTRANT -D_GNU_SOURCE -O"
-+ CFLAGS="-D_REENTRANT -D_GNU_SOURCE $CFLAGS"
-+ CXXFLAGS="-D_REENTRANT -D_GNU_SOURCE $CXXFLAGS"
- fi
-
- AC_TRY_COMPILE([
+++ /dev/null
---- dpkg-1.6.15/po/en.po~ Fri Sep 5 19:32:29 2003
-+++ dpkg-1.6.15/po/en.po Fri Sep 5 19:32:29 2003
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "POT-Creation-Date: 2000-10-02 21:39+0200\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-+"Last-Translator: UNKNOWN\n"
- "Language-Team: LANGUAGE <LL@li.org>\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=CHARSET\n"
--"Content-Transfer-Encoding: ENCODING\n"
-+"Content-Type: text/plain; charset=US-ASCII\n"
-+"Content-Transfer-Encoding: 7bit\n"
-
- #: lib/compat.c:46
- msgid "unable to open tmpfile for vsnprintf"
---- dpkg-1.6.15/po/ru.po~ Fri Sep 5 19:30:39 2003
-+++ dpkg-1.6.15/po/ru.po Fri Sep 5 19:30:39 2003
-@@ -2,7 +2,6 @@
- # Copyright (C) 1999 Michael Sobolev
- # Michael Sobolev <mss@transas.com>, 1999.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: dpkg 1.6.5\n"
projects / packages / dpkg.git / commitdiff