debian/0000755000000000000000000000000011424575545007202 5ustar debian/control0000644000000000000000000000225411424545016010576 0ustar Source: libalgorithm-merge-perl Section: perl Priority: optional Build-Depends: debhelper (>= 7) Build-Depends-Indep: perl, libalgorithm-diff-perl Maintainer: Debian Perl Group Uploaders: Jonathan Yu , Salvatore Bonaccorso Standards-Version: 3.9.1 Homepage: http://search.cpan.org/dist/Algorithm-Merge/ Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libalgorithm-merge-perl/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libalgorithm-merge-perl/ Package: libalgorithm-merge-perl Architecture: all Depends: ${perl:Depends}, ${misc:Depends}, libalgorithm-diff-perl Description: Perl module for three-way merge of textual data Algorithm::Merge provides three-way merge and diff functions, complementing the functionality offered by Algorithm::Diff (libalgorithm-diff-perl). Given three sets of items, known as the original, left and right, this module can take a three-way difference or merge them. Taking a difference provides an array reference that is very similar to the behaviour of Algorithm::Diff. One can also implement custom conflict resolution using the CONFLICT callback. debian/rules0000755000000000000000000000003611424545016010247 0ustar #!/usr/bin/make -f %: dh $@ debian/watch0000644000000000000000000000017311424545016010222 0ustar version=3 http://search.cpan.org/dist/Algorithm-Merge/ .*/Algorithm-Merge-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ debian/changelog0000644000000000000000000000166511424545016011052 0ustar libalgorithm-merge-perl (0.08-2) unstable; urgency=low [ Ryan Niebur ] * Update jawnsy's email address [ Salvatore Bonaccorso ] * debian/control: Changed: Replace versioned (build-)dependency on perl (>= 5.6.0-{12,16}) with an unversioned dependency on perl (as permitted by Debian Policy 3.8.3). * Add myself to Uploaders. * Convert to '3.0 (quilt)' source package format. * Drop quilt framework from debian/{rules,control}. Lower Build- Depends on debhelper to (>= 7). * Refresh debian/copyright to revision 135 of DEP5s format- specification for machine-readable copyright file. Update debian/* packaging stanza. * Bump Standards-Version to 3.9.1. -- Salvatore Bonaccorso Fri, 30 Jul 2010 14:47:51 +0200 libalgorithm-merge-perl (0.08-1) unstable; urgency=low * Initial Release (Closes: #537970) -- Jonathan Yu Tue, 21 Jul 2009 20:17:13 -0400 debian/compat0000644000000000000000000000000211424545016010366 0ustar 7 debian/source/0000755000000000000000000000000011424545016010470 5ustar debian/source/format0000644000000000000000000000001411424545016011676 0ustar 3.0 (quilt) debian/patches/0000755000000000000000000000000011424545016010617 5ustar debian/patches/pod-errors.patch0000644000000000000000000000042111424545016013731 0ustar Description: Fix POD errors Origin: vendor Author: Jonathan Yu Forwarded: no --- a/Merge.pm +++ b/Merge.pm @@ -677,7 +677,7 @@ current position. The three arguments are the current positions within each sequence. -=back 4 +=back =head1 BUGS debian/patches/series0000644000000000000000000000002111424545016012025 0ustar pod-errors.patch debian/copyright0000644000000000000000000000214611424545016011126 0ustar Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 Maintainer: James G. Smith Source: http://search.cpan.org/dist/Algorithm-Merge/ Name: Algorithm-Merge Files: * Copyright: 2003, 2007 Texas A&M University License: Artistic or GPL-1+ Files: debian/* Copyright: 2009, Jonathan Yu 2010, Salvatore Bonaccorso License: Artistic or GPL-1+ License: Artistic This program is free software; you can redistribute it and/or modify it under the terms of the Artistic License, which comes with Perl. . On Debian GNU/Linux systems, the complete text of the Artistic License can be found in `/usr/share/common-licenses/Artistic'. License: GPL-1+ 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 1, or (at your option) any later version. . On Debian GNU/Linux systems, the complete text of version 1 of the General Public License can be found in `/usr/share/common-licenses/GPL-1'.