debian/0000775000000000000000000000000012262436064007175 5ustar debian/README.Debian0000664000000000000000000000040112262435670011233 0ustar wiggle for Debian ----------------- The package also provides a script developed by Neil Brown that is useful for manipulating patches. See files in: /usr/share/doc/wiggle/contrib -- Jari Aalto , Thu, 4 Mar 2010 01:15:20 +0200 debian/source/0000775000000000000000000000000012262435670010477 5ustar debian/source/format0000664000000000000000000000001412262435670011705 0ustar 3.0 (quilt) debian/copyright0000664000000000000000000000260112262435670011131 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: wiggle Upstream-Contact: Neil Brown Source: http://neil.brown.name/wiggle X-Source: http://freecode.com/projects/wiggle X-Upstream-Vcs: http://git.neil.brown.name/git/wiggle X-Upstream-Comment: Upstream homepage is at http://neil.brown.name Files: * Copyright: 2010-2012 Jari Aalto 2007 Baruch Even 2004 Nicolas Thomas 2003 Igor Genibel License: GPL-2+ Files: debian/* Copyright: 2012-2013 Jari Aalto License: GPL-2+ License: GPL-2+ This package 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 package 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, see . . On Debian systems, the complete text of the GNU General Public License can be found in "/usr/share/common-licenses/GPL-2". debian/changelog0000664000000000000000000001256512262436064011060 0ustar wiggle (0.9.1-1.1) unstable; urgency=medium * Non-maintainer upload. * Fix big-endian FTBFS (Closes: #733831) -- Dimitri John Ledkov Mon, 06 Jan 2014 05:16:36 +0000 wiggle (0.9.1-1) unstable; urgency=low * New upstream release - Non-DSFG file DOC/diff.ps no longer included. See bug #698846. * debian/install - Rename from debian/wiggle.install. * debian/patches: - (10): Rm. Fix for a type in ReadMe.c accepted upstream. - (20): New. Correct hyphen in manual page. * debian/watch - Add URL to check new releases. Thanks to Bart Martens . -- Jari Aalto Thu, 23 May 2013 20:30:58 +0300 wiggle (0.8+dfsg1-2) unstable; urgency=low * debian/control - (Homepage): Update broken URL to Freecode (Closes: #699715). * debian/copyright - Update upstream URL locations. See above bug. -- Jari Aalto Thu, 28 Feb 2013 10:59:53 +0200 wiggle (0.8+dfsg1-1) unstable; urgency=low * Repackage upstream tarball: remove .git and non-free *.ps documentation about used algorithm (Closes: #698846). Upstream has removed the file in the next release. * debian/control - (Standards-Version): Update to 3.9.4. * debian/copyright - Update year. * debian/docs - Add missing newline to the last line. * debian/wiggle.docs - Delete file due to #698846. There is already debian/docs. -- Jari Aalto Wed, 20 Feb 2013 12:12:10 +0200 wiggle (0.8-2) unstable; urgency=low * debian/control - (Build-Depends): Update to debhelper 9. Add libncurses5-dev. - (Description): Adjust first line. - (Standards-Version): Update to 3.9.3.1. * debian/copyright - Update to format 1.0. * debian/rules - (override_dh_*_clean): New. Save and restore original files. - Use hardened build flags http://wiki.debian.org/ReleaseGoals/SecurityHardeningBuildFlags -- Jari Aalto Sat, 24 Mar 2012 06:07:32 -0400 wiggle (0.8-1) unstable; urgency=low * New upstream release - Manual page hyphens (Closes: #574576). - Gcc 4.4 pointer initialization with NULL (Closes: #574577) - Strange bogus conflict (Closes: #271766) * debian/control - (Build-Depends): Add libncurses5-dev. * debian/patches - Remove those integrated to upstream. - (10): Fix spelling. - (20): Fix include. * debian/watch - Add URL. * debian/rules - Simplify even further. - (binary-arch): delete. - (override_dh_installchangelogs): add. -- Jari Aalto Tue, 11 May 2010 09:43:43 +0300 wiggle (0.6.20100304+git1c5bfa7-1) unstable; urgency=low * New upstream release. * debian/control - (Vcs-*): new fields. - (Section): Change from utils to vcs (used by the FTP masters). * debian/patches - (02 p.help, 30 dotest): remove. Integrated to upstream. - (05 Makefile): Adjust for new upstream. -- Jari Aalto Fri, 05 Mar 2010 09:36:48 +0200 wiggle (0.6-7) unstable; urgency=low * New maintainer (Closes: #568575). - Move to packaging format "3.0 (quilt)". * debian/control - (Build-Depends): update to debhelper 7.1. - (Depends): add ${misc:Depends}. - (Standards-Version): Update to 3.8.4. * debian/copyright - Update layout. - Update download URL (Closes: #515124). * debian/dirs - Deleted. Not needed. * debian/patches - Convert inline changes to patches. * debian/README.Debian - Correct 'perl script' to just script (actually Bourne shell). - Remove indication to patches, not relevant for the end-user. * debian/rules - Update to dh(1). - (CFLAGS): Change -Werror to -Wall -pedantic (gcc-4.5 FTBFS; Closes: #565074). * debian/source/format - New file. * debian/wiggle.docs - New file. * debian/wiggle.install - New file. -- Jari Aalto Thu, 04 Mar 2010 18:08:16 +0200 wiggle (0.6-6) unstable; urgency=low * Take sole ownership of the package, Nicolas is unresponsive * Add Homepage field to control header * Change to dh compat level 5 * Do not ignore errors in make clean * Update Standards-Version to 3.7.3, no changes needed * Update the FSF address in the debian/copyright file * Switch to use the git upstream -- Baruch Even Sat, 29 Dec 2007 21:22:49 +0200 wiggle (0.6-5) unstable; urgency=low * Adopt this package (closes: #233661) * Modify build to use dpatch * New Standard: 3.6.1.1 - No need to change * Add upstream fixes 004ExtractFix 005Pchanges (006NoDebug is already applied) * Add the notes files to the documentation -- Nicolas Thomas Sat, 4 Dec 2004 22:42:17 +0100 wiggle (0.6-4) unstable; urgency=low * Orphan this package -- Igor Genibel Thu, 19 Feb 2004 11:07:37 +0100 wiggle (0.6-3) unstable; urgency=low * Fix upstream bug (Thanks Jan Hudec ) - upstream provided a patch * New Standard: 3.6.0 - No need to change -- Igor Genibel Sat, 12 Jul 2003 10:39:15 +0200 wiggle (0.6-2) unstable; urgency=low * Add new build dependency to groff (Closes: #197994) -- Igor Genibel Thu, 19 Jun 2003 09:31:14 +0200 wiggle (0.6-1) unstable; urgency=low * Initial Release. (Closes: #196862) -- Igor Genibel Tue, 10 Jun 2003 12:24:49 +0200 debian/control0000664000000000000000000000145512262435670010607 0ustar Source: wiggle Section: vcs Priority: optional Maintainer: Jari Aalto Build-Depends: debhelper (>= 9), time, groff, libncurses5-dev Standards-Version: 3.9.4 Vcs-Browser: http://git.debian.org/?p=collab-maint/wiggle.git Vcs-Git: git://git.debian.org/git/collab-maint/wiggle.git Homepage: http://freecode.com/projects/wiggle Package: wiggle Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: apply patches with conflicting changes Wiggle is a program for applying patches that 'patch' cannot apply due to conflicting changes in the original. . Wiggle will always apply all changes in the patch to the original. If it cannot find a way to cleanly apply a patch, it inserts it in the original in a manner similar to 'merge', and report an unresolvable conflict. debian/rules0000775000000000000000000000042112262435670010254 0ustar #!/usr/bin/make -f export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -I. export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed override_dh_auto_build: $(MAKE) CFLAGS="$(CFLAGS) $(CPPFLAGS) $(LDFLAGS)" %: dh $@ # End of file debian/watch0000664000000000000000000000013312262435670010225 0ustar version=3 http://neil.brown.name/wiggle/wiggle-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) debian/install0000664000000000000000000000010312262435670010562 0ustar p usr/share/doc/wiggle/contrib p.help usr/share/doc/wiggle/contrib debian/patches/0000775000000000000000000000000012262436175010627 5ustar debian/patches/ftbfs-big-endian.patch0000664000000000000000000000147512262436127014753 0ustar Description: Fix big-endian FTBFS (Closes: #733831) Author: Dimitri John Ledkov Bug-Debian: http://bugs.debian.org/733831 --- wiggle-0.9.1.orig/config.h +++ wiggle-0.9.1/config.h @@ -1,13 +1,17 @@ /* Includes and defines for ccan files */ -#if !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN) - #include +#if !defined(BYTE_ORDER) && !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN) + #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + #include + #else + #include + #endif #endif -#ifdef LITTLE_ENDIAN +#if BYTE_ORDER == LITTLE_ENDIAN #define HAVE_LITTLE_ENDIAN 1 #define HAVE_BIG_ENDIAN 0 -#elif defined(BIG_ENDIAN) +#elif BYTE_ORDER == BIG_ENDIAN #define HAVE_LITTLE_ENDIAN 0 #define HAVE_BIG_ENDIAN 1 #else debian/patches/20-manpage.patch0000664000000000000000000000417012262435670013500 0ustar From: Jari Aalto Subject: Corrections manual page (hyphens). --- wiggle.1 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) --- a/wiggle.1 +++ b/wiggle.1 @@ -136,16 +136,16 @@ be wiggled in to place. .TP -.BR -w ", " \-\-words +.BR \-w ", " \-\-words Request that all operations and display be word based. This is the default for the "diff" function. .TP -.BR -l ", " \-\-lines +.BR \-l ", " \-\-lines Request that all operations and display be line based. .TP -.BR -p ", " \-\-patch +.BR \-p ", " \-\-patch Treat the last named file as a patch instead of a file (with \-\-diff) or a merge (\-\-extract). In @@ -153,7 +153,7 @@ or .B browse mode, -.B -p +.B \-p requires there be exactly one file which is a patch and which can contain patches to multiple file. The patches are merged into each file. When used in @@ -163,7 +163,7 @@ option as writing lots of merged files to standard-out is impractical. When processing a multi-file patch, -B -p +B \-p can be followed by a numeric argument indicating how many file name components should be stripped from files named in the patch file. If no numeric argument is given, @@ -171,12 +171,12 @@ will deduce an appropriate number based what files are visible. .TP -.BR -r ", " \-\-replace +.BR \-r ", " \-\-replace Normally the merged output is written to standard-output. With \-\-replace, the original file is replaced with the merge output. .TP -.BR -R ", " \-\-reverse +.BR \-R ", " \-\-reverse When used with the "diff" function, swap the files before calculating the differences. When used with the "merge" function, @@ -184,13 +184,13 @@ attempts to revert changes rather than apply them. .TP -.BR -i ", " \-\-no\-ignore +.BR \-i ", " \-\-no\-ignore Normally wiggle will ignore changes in the patch which appear to already have been applied in the original. With this flag those changes are reported as conflicts rather than being ignored. .TP -.BR -W ", " \-\-show\-wiggle +.BR \-W ", " \-\-show\-wiggle When used with .IR \-\-merge , conflicts that can be wiggled into place are reported as conflicts debian/patches/series0000664000000000000000000000005012262436112012026 0ustar 20-manpage.patch ftbfs-big-endian.patch debian/docs0000664000000000000000000000002412262435670010046 0ustar TODO ANNOUNCE notes debian/compat0000664000000000000000000000000212262435670010375 0ustar 9