debian/0000755000000000000000000000000012212620401007154 5ustar debian/control0000644000000000000000000000253612202171320010565 0ustar Source: diffutils Section: utils Priority: required Maintainer: Santiago Vila Build-Depends: debhelper (>= 9), texinfo Standards-Version: 3.9.3 Homepage: http://www.gnu.org/software/diffutils/ Package: diffutils Essential: yes Architecture: any Pre-Depends: ${shlibs:Depends} Depends: ${misc:Depends} Replaces: diff Suggests: diffutils-doc, wdiff Description: File comparison utilities The diffutils package provides the diff, diff3, sdiff, and cmp programs. . `diff' shows differences between two files, or each corresponding file in two directories. `cmp' shows the offsets and line numbers where two files differ. `cmp' can also show all the characters that differ between the two files, side by side. `diff3' shows differences among three files. `sdiff' merges two files interactively. . The set of differences produced by `diff' can be used to distribute updates to text files (such as program source code) to other people. This method is especially useful when the differences are small compared to the complete files. Given `diff' output, the `patch' program can update, or "patch", a copy of the file. Package: diffutils-doc Section: doc Priority: optional Architecture: all Depends: ${misc:Depends} Description: Documentation for GNU diffutils in HTML format This package contains the HTML documentation for GNU diffutils. debian/watch0000644000000000000000000000010312202203163010200 0ustar version=3 http://ftp.gnu.org/gnu/diffutils/diffutils-(.*)\.tar\.xz debian/patches/0000755000000000000000000000000012212612536010615 5ustar debian/patches/01-workaround-for-failing-gnulib-test0000644000000000000000000000071312202237300017567 0ustar From: Paul Eggert Subject: Workaround for gnulib problem X-Debian-version: 1:3.3-1 --- a/gnulib-tests/test-xvasprintf.c +++ b/gnulib-tests/test-xvasprintf.c @@ -95,7 +95,7 @@ { /* Silence gcc warning about zero-length format string. */ const char *empty = ""; - result = xasprintf (empty); + result = xasprintf (empty, empty); ASSERT (result != NULL); ASSERT (strcmp (result, "") == 0); free (result); debian/patches/99-config-guess-config-sub0000644000000000000000000002356612202237300015425 0ustar From: Santiago Vila Subject: Updated config.guess and config.sub X-Debian-version: 1:3.2-7 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2013-02-12' +timestamp='2013-06-10' # 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 @@ -132,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -853,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *: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 + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -880,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -951,57 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1234,19 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2013-02-12' +timestamp='2013-08-10' # 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 @@ -252,12 +252,12 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc \ + | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -366,13 +366,13 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -794,7 +794,7 @@ os=-mingw64 ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -830,7 +830,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1546,6 +1546,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; debian/patches/series0000644000000000000000000000016012212612527012027 0ustar 01-workaround-for-failing-gnulib-test 02-fix-mkdir-p-definition-in-po-makefile-in-in 99-config-guess-config-sub debian/patches/02-fix-mkdir-p-definition-in-po-makefile-in-in0000644000000000000000000000057112212612443021037 0ustar From: Santiago Vila Subject: Fix mkdir_p definition in po/Makefile.in.in X-Debian-version: 1:3.3-1 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -42,7 +42,7 @@ mkinstalldirs = $(SHELL) @install_sh@ -d install_sh = $(SHELL) @install_sh@ MKDIR_P = @MKDIR_P@ -mkdir_p = @mkdir_p@ +mkdir_p = $(MKDIR_P) GMSGFMT_ = @GMSGFMT@ GMSGFMT_no = @GMSGFMT@ debian/diffutils.info0000644000000000000000000000001311741523640012031 0ustar doc/*.info debian/source/0000755000000000000000000000000011361710732010467 5ustar debian/source/format0000644000000000000000000000001411361710732011675 0ustar 3.0 (quilt) debian/compat0000644000000000000000000000000211741523640010367 0ustar 9 debian/diffutils.install0000644000000000000000000000002611741523640012550 0ustar usr/share/* usr/bin/* debian/changelog0000644000000000000000000003724112212620312011036 0ustar diffutils (1:3.3-1) unstable; urgency=low * New upstream release. * Switch from texi2html to makeinfo. * Source tarball is now in xz format. * Changed watch file to look for tar.xz sources. * Added --disable-silent-rules to configure command line. * Filenames with spaces are now allowed by diff. Closes: #99807. * Improved description of -I option. Closes: #648411. -- Santiago Vila Sat, 07 Sep 2013 14:43:28 +0200 diffutils (1:3.2-8) unstable; urgency=low * Added fix for gnulib compilation against eglibc 2.16, which no longer declares gets by default. Closes: #693346. -- Santiago Vila Sun, 24 Feb 2013 13:28:12 +0100 diffutils (1:3.2-7) unstable; urgency=low * Updated config.guess and config.sub for arm64. Closes: #688965, #689617. -- Santiago Vila Thu, 04 Oct 2012 18:12:38 +0200 diffutils (1:3.2-6) unstable; urgency=low * Forgot to update configure script after modifying m4/float_h.m4. -- Santiago Vila Sun, 29 Apr 2012 21:30:06 +0200 diffutils (1:3.2-5) unstable; urgency=low * The previous change didn't work. Fix it the right way: Applied patch by Bruno Haible (taken from gnulib) fixing powerpc float issues. -- Santiago Vila Sun, 29 Apr 2012 17:06:46 +0200 diffutils (1:3.2-4) unstable; urgency=medium * Modified gnulib-tests/Makefile.in to disable test-float, as it fails on powerpc. -- Santiago Vila Sun, 29 Apr 2012 14:53:14 +0200 diffutils (1:3.2-3) unstable; urgency=low * Switch to dh. Should hopefully cross-build from source now. Closes: #664270. -- Santiago Vila Thu, 12 Apr 2012 20:20:46 +0200 diffutils (1:3.2-2) unstable; urgency=low * Dropped dummy "diff" binary package. * Build with hardened flags. Closes: #653853. -- Santiago Vila Sat, 03 Mar 2012 13:31:40 +0100 diffutils (1:3.2-1) unstable; urgency=low * New upstream release. * Manual license is now GFDL without cover or back texts, which means we can generate diffutils-doc from this source package again. * Moved info manual to diffutils. Now diffutils-doc has only HTML. * However, no need to add Replaces: diffutils-doc (<= 2.8.1-14) to diffutils, as old diff.info is now diffutils.info. * Info manual now clearly states that regular expressions are to be considered `grep'-style. Closes: #287682. * Fixed cmp manpage where it wrongly suggested "info diff" instead of "info cmp". Closes: #434214. * Manpage has improved a bit about format options. Closes: #547691. * Recursive diff now avoids printing excess slashes in concatenated file names. Closes: #586301. * Behaviour of --ignore-all-space has been clarified about what is to be considered "white space". Closes: #613319. * Fixed reporting of spurious differences. Closes: #633978. -- Santiago Vila Sun, 16 Oct 2011 16:47:44 +0200 diffutils (1:3.0-1) unstable; urgency=low * New upstream release. -- Santiago Vila Tue, 04 May 2010 20:38:00 +0200 diffutils (1:2.9-4) unstable; urgency=medium * Applied improved patch from Paul Eggert to fix Bug #577832. -- Santiago Vila Sat, 17 Apr 2010 15:03:40 +0200 diffutils (1:2.9-3) unstable; urgency=medium * Fixed regression where newline is added to a line not having a newline. Reported by Timo Juhani Lindfors. Patch by Jim Meyering. Closes: #577832. * Switch to 3.0 (quilt) source format, 2 patches. * Drop unused INSTALL_PROGRAM stuff. -- Santiago Vila Fri, 16 Apr 2010 00:29:16 +0200 diffutils (1:2.9-2) unstable; urgency=low * Applied patch from Raphael Hertzog which reverts upstream commit that changed "Binary files %s and %s differ" into "Files %s and %s differ", as the new output breaks dpkg-dev. -- Santiago Vila Tue, 16 Feb 2010 11:39:46 +0100 diffutils (1:2.9-1) unstable; urgency=low * New upstream release, now under GPL version 3 or later. * There is now a --tab-size option. Closes: #82923. * Manpage for cmp describes exit status. Closes: #200614. * Manpage for diff describes exit status. Closes: #228441, #473233. * The file de.po is now more recent. Closes: #313686. * Fixed bad sdiff behaviour. Closes: #320222. * Added wdiff to Suggests. Closes: #324627. * Fixed cmp behaviour regarding stdout and stderr. Closes: #356083. * The file ru.po is now more recent. Closes: #409274. * The file es.po is now more recent. Closes: #418005, #481708. * The file nl.po is now more recent. Closes: #427370. * Modified watch file to use http instead of ftp. * Removed .comment section from executables. * Added Homepage field to control file. -- Santiago Vila Sat, 13 Feb 2010 11:49:00 +0100 diffutils (1:2.8.1-18) unstable; urgency=medium * Modify Replaces field so that it includes old releases of diff in experimental. Closes: #546364. Note: This will make diff 2.8.7 to "upgrade" to diffutils 2.8.1 if you don't have experimental in sources.list anymore. Those who really want diffutils 2.8.7 should keep experimental in sources.list. -- Santiago Vila Sun, 13 Sep 2009 11:13:04 +0200 diffutils (1:2.8.1-17) unstable; urgency=medium * Made diff to Pre-Depend on diffutils, as it's proper for the transition of an essential package. Thanks, Steve Langasek. -- Santiago Vila Tue, 8 Sep 2009 15:32:42 +0200 diffutils (1:2.8.1-16) unstable; urgency=low * Added epoch to fix upload mistake. -- Santiago Vila Sat, 29 Aug 2009 12:46:12 +0200 diffutils (2.8.1-15) unstable; urgency=low * Use the new binary package name in the extended description. -- Santiago Vila Fri, 28 Aug 2009 20:29:24 +0200 diffutils (2.8.1-14) unstable; urgency=low * Updated config.guess and config.sub. * Renamed diff package to diffutils. Closes: #539517. * Changed section to utils, following the override file. * Package diff is now a transition package (extra/oldlibs). * Changed Suggests to diffutils-doc, which is also renamed. * Do not ignore errors from make distclean (lintian warning). -- Santiago Vila Thu, 27 Aug 2009 14:38:30 +0200 diffutils (2.8.1-13) unstable; urgency=low * Fixed --ignore-file-name-case. Patch from Ubuntu. Closes: #300258. * Modified debian/rules to support cross-build. Closes: #451159. * Updated config.guess and config.sub. -- Santiago Vila Fri, 29 May 2009 18:00:00 +0200 diffutils (2.8.1-12) unstable; urgency=low * Drop outdated preinst. * Updated config.guess and config.sub. * Do not override _POSIX2_VERSION anymore. Please fix your scripts. -- Santiago Vila Sun, 29 Apr 2007 15:04:18 +0200 diffutils (2.8.1-11) unstable; urgency=low * Changed default value of _POSIX2_VERSION in lib/posixver.c to 199209 to not break backwards compatibility (Closes: #295421). People should be encouraged to set _POSIX2_VERSION="200112" in the environment, see what breaks, and fix it, as this change should be reverted some day after the release of sarge. -- Santiago Vila Tue, 15 Feb 2005 22:45:18 +0100 diffutils (2.8.1-10) unstable; urgency=low * Suggests: diff-doc (Closes: #294211). * Added a debian/watch file (Closes: #294834). -- Santiago Vila Mon, 14 Feb 2005 19:06:28 +0100 diffutils (2.8.1-9) unstable; urgency=low * Fixed typo in the copyright file. -- Santiago Vila Wed, 19 Jan 2005 16:38:26 +0100 diffutils (2.8.1-8) unstable; urgency=low * Repackaged source without the GFDL-covered manual. Closes: #212523. * Source is renamed to "diffutils" to make the archive scripts happy. * Removed texinfo and texi2html from Build-Depends, no longer needed. * Dropped diff-doc, will be generated from another source. * Added appropriate --build and --host options to ./configure call in debian/rules to support cross-compilation. Closes: #283642. -- Santiago Vila Sat, 8 Jan 2005 19:09:00 +0100 diff (2.8.1-7) unstable; urgency=low * Moved info manual to diff-doc to address Bug#212523 partially. * Added appropriate Replaces field to diff-doc. * Updated config.guess and config.sub. -- Santiago Vila Wed, 24 Nov 2004 19:01:10 +0100 diff (2.8.1-6) unstable; urgency=low * Fixed sdiff manpage (Closes: #219166). -- Santiago Vila Wed, 5 Nov 2003 10:55:58 +0100 diff (2.8.1-5) unstable; urgency=low * Updated config.guess and config.sub for GNU/KFreeBSD (Closes: #216779). -- Santiago Vila Tue, 21 Oct 2003 15:26:22 +0200 diff (2.8.1-4) unstable; urgency=low * Modified doc/Makefile.in so that it *never* uses install-info. This is a workaround for an automake bug triggered by the fact that install-info --version now outputs to stdout (Closes: #213495). -- Santiago Vila Wed, 1 Oct 2003 12:35:02 +0200 diff (2.8.1-3) unstable; urgency=low * Converted Debian changelog to UTF-8. * Made sdiff -E to work (Closes: #212954). -- Santiago Vila Mon, 29 Sep 2003 23:50:50 +0200 diff (2.8.1-2) unstable; urgency=low * Removed doc symlinks. * Updated DEB_BUILD_OPTIONS handling (added noopt, removed debug). * Updated config.sub/config.guess for netbsd (Closes: #179701). -- Santiago Vila Thu, 24 Apr 2003 22:17:04 +0200 diff (2.8.1-1) unstable; urgency=low * New upstream release. * There are upstream manpages now, generated by help2man. * The ranges feature by Peter Samuelson is now implemented upstream, but using a slightly different syntax. -- Santiago Vila Sat, 20 Jul 2002 12:51:04 +0200 diff (2.7-29) unstable; urgency=low * The DIFF environment variable is now ignored by sdiff, this feature was undocumented and will be removed in the next stable diffutils release. Thanks to Patrik Hägglund (Closes: #66486). -- Santiago Vila Tue, 12 Mar 2002 00:40:34 +0100 diff (2.7-28) unstable; urgency=medium * Fixed yet another bug in the ranges feature, where cmp -i misreports the byte number where files differ. Thanks to Tim Bell (Closes: #120583). -- Santiago Vila Fri, 23 Nov 2001 09:52:08 +0100 diff (2.7-27) unstable; urgency=low * Added support for DEB_BUILD_OPTIONS. -- Santiago Vila Wed, 21 Nov 2001 16:32:02 +0100 diff (2.7-26) unstable; urgency=medium * Fixed a bug (introduced in diff_2.7-24) where cmp reports the wrong char number where files differ. Thanks to Gergely Risko (Closes: #109683). -- Santiago Vila Thu, 23 Aug 2001 12:55:33 +0200 diff (2.7-25) unstable; urgency=low * Rightly refer to the GNU General Public License in the copyright file. Reported by André Dahlqvist (Closes: #102236). * Registered HTML docs using doc-base. -- Santiago Vila Thu, 28 Jun 2001 19:03:34 +0200 diff (2.7-24) unstable; urgency=low * Fixed a bug (introduced in diff_2.7-19) where cmp -l may misreport the byte number of the differences it finds (Closes: #89755). Thanks to Vasco Pedro . -- Santiago Vila Sat, 17 Mar 2001 18:12:04 +0100 diff (2.7-23) unstable; urgency=low * Changed cmp doc to read 'byte number' instead of offset. Patch by Peter Muir . Closes: #59514. * Build-Depends: texinfo, since .texi source is now modified. * Build-Depends-Indep: texi2html, not tetex-bin. Closes: #86580. -- Santiago Vila Tue, 20 Feb 2001 19:09:17 +0100 diff (2.7-22) unstable; urgency=low * Removed old doc.Makefile from source, we already provide HTML. * Updated upstream source URL in copyright file. * Build-Depends-Indep: tetex-bin. -- Santiago Vila Wed, 3 Jan 2001 18:28:58 +0100 diff (2.7-21) frozen unstable; urgency=high * Avoid race condition in sdiff.c (edit) when creating temporary file. Patch by the upstream maintainer, Paul Eggert . Thanks to Colin Phipps for the report (Closes: #59730). * Standards-Version: 3.1.1. -- Santiago Vila Sat, 6 May 2000 18:20:38 +0200 diff (2.7-20) unstable; urgency=low * Fixed cmp manpage. Patch by Daniel Martin . * Switch back to /usr/doc/diff. -- Santiago Vila Tue, 21 Sep 1999 12:49:44 +0200 diff (2.7-19) unstable; urgency=low * cmp: Applied the ranges feature patch by Peter Samuelson (Bug #16735). * Standards-Version: 3.0.0. -- Santiago Vila Fri, 27 Aug 1999 17:37:46 +0200 diff (2.7-18) unstable; urgency=low * Pre-Depends line not hardcoded anymore (bug #23296). * Rewritten debian/rules. Now it makes install (bug #23297). * Converted .texi to HTML, now in a separate package. * Source: moved manpages to the debian directory. * Added the file NEWS to the doc directory. * Updated copyright file. * Pristine source. * Added md5sums. * New maintainer. -- Santiago Vila Mon, 28 Sep 1998 20:25:44 +0200 diff (2.7-17) frozen unstable; urgency=low * applied Raul Miller's patch for stat under ncpfs: fixes 6958 * fixed clean target in rules for multi-architecture builds -- Dale Scheetz Sun, 7 Jun 1998 13:53:23 -0400 diff (2.7-16) frozen unstable; urgency=low * added Pre-Depends: libc6 to the control info: fixes 20717 * removed texinfo.tex from the doc files: fixes 20761 -- Dale Scheetz Sat, 11 Apr 1998 14:10:06 -0400 diff (2.7-15) unstable; urgency=low * general clean up of rules file * removed gzip from copyright file : bug#14433 -- Dale Scheetz Thu, 13 Nov 1997 13:24:55 -0500 diff (2.7-14) unstable; urgency=high * build with libc6 : bug #11674 * fixed changelog problems : bug #7555 * changed clean target to distclean : bug #12479 -- Dale Scheetz Sun, 5 Oct 1997 14:18:57 -0400 diff (2.7-13) frozen unstable; urgency=low * fixed permissions on doc files -- Dale Scheetz Sat, 16 Nov 1996 15:20:02 -0500 diff (2.7-12) frozen unstable; urgency=low * increased revision number to non-duplicate value -- Dale Scheetz Wed, 13 Nov 1996 13:35:39 -0500 diff (2.7-11) unstable; urgency=low * Updated package to Standards-Version 2.1.0.0. -- Dale Scheetz Tue, 10 Sep 1996 23:33:40 -0400 Changes for diff-2.7-10 elf package * use PRE-DEPENDS and add ESSENTIAL in control file Changes for diff-2.7-9 elf package * fixed problem in DEPENDS line of control file Changes for diff-2.7-8 elf package * added manpages from the FreeBSD-stable sources on ftp.cdrom.com Changes for diff-2.7-7 elf package * added dependency on lib5 These appear to have been written to describe diff-2.6 Changes for diff-2.7-6 * rebuilt for elf Changes for diff-2.7-5 Priority: Routine Changes: Added texinfo file and Makefile in /usr/doc/diff Changes for diff-2.7-4 Priority: Routine Changes: Made the extended description shorter. Changes for diff-2.7-3 1. Removed blank line at the end of the extended description. This may have been causing problems with the debian distribution's "Packages" file. Changes for diff-2.7-2 1. Changed debian.control to list me as maintainer. 2. Added extended description to debian.control. 3. Went to Ian Murdock style debian.rules file, similar to my other packages. This is the diffutils-2.7 package Kitted up by Bill Mitchell Taken over from Peter Tobias debian/rules0000755000000000000000000000061312202237772010252 0ustar #!/usr/bin/make -f package = diffutils export AM_UPDATE_INFO_DIR = no %: dh $@ override_dh_auto_clean: [ ! -f Makefile ] || $(MAKE) distclean rm -rf doc/$(package) override_dh_auto_configure: dh_auto_configure -- --disable-silent-rules override_dh_installdocs: cd doc && makeinfo --html --split=chapter $(package).texi dh_installdocs -i doc/$(package)/*.html dh_installdocs -a NEWS debian/diffutils-doc.doc-base0000644000000000000000000000067011616561322013327 0ustar Document: diffutils-doc Title: GNU diffutils manual Author: David MacKenzie, Paul Eggert, Richard Stallman, and John Hasler Abstract: This manual documents the GNU `diff', `diff3', `sdiff', and `cmp' commands for showing the differences between text files and the `patch' command for using their output to update files. Section: Text Format: HTML Index: /usr/share/doc/diffutils-doc/index.html Files: /usr/share/doc/diffutils-doc/*.html debian/copyright0000644000000000000000000000344412202172561011124 0ustar This is the Debian prepackaged version of the GNU diffutils package. GNU `diff' was written by Mike Haertel, David Hayes, Richard Stallman, Len Tower, and Paul Eggert. Wayne Davison designed and implemented the unified output format. GNU `diff3' was written by Randy Smith. GNU `sdiff' was written by Thomas Lord. GNU `cmp' was written by Torbjorn Granlund and David MacKenzie. The source for this release was obtained from http://ftp.gnu.org/gnu/diffutils/diffutils-3.3.tar.xz Program copyright and license: ============================= Copyright (C) 1988-1996, 1998, 2001-2002, 2004, 2006-2007, 2009-2013 Free Software Foundation, Inc. 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 3 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. On Debian systems, the complete text of the GNU General Public License may be found in `/usr/share/common-licenses/GPL'. Manual copyright and license: ============================ Copyright (C) 1992-1994, 1998, 2001-2002, 2004, 2006, 2009-2013 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. On Debian systems, the complete text of the GNU Free Documentation License may be found in `/usr/share/common-licenses/GFDL'.