--- dirdiff-2.1.orig/debian/copyright +++ dirdiff-2.1/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by Steven Robbins in September 2001. +Since July 2009 this package is maintained by Santiago Sánchez Paz. + +Upstream sources available at http://samba.org/ftp/paulus/ + + +# Copyright (C) 1999-2001 Paul Mackerras. All rights reserved. +# This program is free software; it may be used, copied, modified +# and distributed under the terms of the GNU General Public Licence, +# either version 2, or (at your option) any later version. + +On Debian systems, the text of the GNU General Public Licence +can be found in /usr/share/common-licenses/GPL. + --- dirdiff-2.1.orig/debian/control +++ dirdiff-2.1/debian/control @@ -0,0 +1,19 @@ +Source: dirdiff +Homepage: http://samba.org/ftp/paulus/ +Section: utils +Priority: optional +Maintainer: Santiago Sánchez Paz +Uploaders: Luciano Bello +Build-Depends: quilt, debhelper (>= 7), tk8.5-dev +Standards-Version: 3.8.2.0 + +Package: dirdiff +Architecture: any +Depends: ${shlibs:Depends}, tk8.5 +Description: Display and merge changes between two directory trees + Dirdiff can handle up to 5 trees. It displays a main window with a + list of the files which are different between the trees, with colored + squares to indicate the relative ages of the versions. A menu allows + you to display the differences between any two of the versions in + another window. Another menu allows you to copy the file from one + tree to another. --- dirdiff-2.1.orig/debian/changelog +++ dirdiff-2.1/debian/changelog @@ -0,0 +1,95 @@ +dirdiff (2.1-5) unstable; urgency=low + + * New mantainer. Closes: #466481. + * New Standards-Version. + * debhelper version 7 + + -- Santiago Sánchez Paz Mon, 27 Jul 2009 15:52:36 +0200 + +dirdiff (2.1-4) unstable; urgency=low + + * debian/control: + * debian/patches/shared-object.patch + * debian/patches/tcl-version.patch: Build using tk 8.5. + Closes: #475318. + + -- Steve M. Robbins Thu, 10 Apr 2008 14:14:27 -0500 + +dirdiff (2.1-3) unstable; urgency=low + + * debian/patches/ignore-svn: New. Ignore .svn directories (thanks, + Tomas Pospisek). Closes: #470778. + + -- Steve M. Robbins Fri, 14 Mar 2008 03:03:40 -0500 + +dirdiff (2.1-2) unstable; urgency=low + + * debian/patches/funky-chars.patch: New. Take care to quote filenames + (thanks, kostix). Closes: #466034. + + * debian/rules: Use quilt to manage patches. Put DH_COMPAT level into + debian/compat; switch from level 3 to level 5. Don't ignore errors in + clean target (remove lintian warning). + + * debian/control: Depend on quilt. Update debhelper dependency to + version 5. Set Standards-Version to 3.7.3 (no changes). Add + Homepage. Remove period from end of short description (to remove + lintian warning). + + * Makefile: Revert to upstream 2.1. + * debian/patches/tcl-version.patch: New. Patch to Makefile that uses + /usr/include/tcl8.4 instead of .../8.3. + * debian/patches/shared-object.patch: New. Patch to Makefile to build + shared object using -fPIC, soname libfilecmp.so.0.0, and link against + -ltcl8.4. + + -- Steve M. Robbins Mon, 25 Feb 2008 02:17:02 -0600 + +dirdiff (2.1-1) unstable; urgency=low + + * New upstream version. + + -- Steve M. Robbins Mon, 27 Jun 2005 00:41:58 -0400 + +dirdiff (2.0-1) unstable; urgency=low + + * New upstream version. Closes: #298892. + + -- Steve M. Robbins Sun, 13 Mar 2005 23:28:46 -0500 + +dirdiff (1.6-4) unstable; urgency=low + + * debian/rules: Explicitly link with libtcl8.4. Closes: #262017. + + -- Steve M. Robbins Sun, 1 Aug 2004 10:10:24 -0400 + +dirdiff (1.6-3) unstable; urgency=low + + * Makefile (CFLAGS): Select tcl8.4 directory with -I flag. + Closes: #215323. + + -- Steve M. Robbins Sun, 12 Oct 2003 10:45:50 -0400 + +dirdiff (1.6-2) unstable; urgency=low + + * Applied patch to handle filenames with spaces. + Thanks, Raul M. Jorja. + + * Build with tk 8.4. + + -- Steve M. Robbins Fri, 10 Oct 2003 18:18:01 -0400 + +dirdiff (1.6-1) unstable; urgency=low + + * New upstream release. + * Install README. + + -- Steve M. Robbins Thu, 2 May 2002 08:43:58 -0400 + +dirdiff (1.5-1) unstable; urgency=low + + * Initial packaging. Closes: #111219. + + -- Steve M. Robbins Mon, 3 Sep 2001 18:54:11 -0400 + + --- dirdiff-2.1.orig/debian/rules +++ dirdiff-2.1/debian/rules @@ -0,0 +1,76 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# This file is public domain software, originally written by Joey Hess. +# +# This version is for a multibinary package. It also allows you to build any +# of the binary packages independantly, via binary- targets. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +include /usr/share/quilt/quilt.make + +build: patch build-stamp +build-stamp: + dh_testdir + $(MAKE) + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + $(MAKE) clean + dh_clean + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_prep + mkdir -p debian/tmp/usr/bin + mkdir -p debian/tmp/usr/lib + $(MAKE) install DESTDIR=`pwd`/debian/tmp + dh_install --autodest debian/tmp/usr + +# This single target is used to build all the packages, all at once, or +# one at a time. So keep in mind: any options passed to commands here will +# affect _all_ packages. Anything you want to only affect one package +# should be put in another target, such as the install target. +binary-common: + dh_testdir + dh_testroot + dh_installdocs README + dh_installmenu + dh_installman debian/dirdiff.1 + dh_installchangelogs + dh_link + dh_compress + dh_strip + dh_fixperms + dh_makeshlibs + dh_lintian + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: build install +# (Uncomment this next line if you have such packages.) +# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: build install + $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + +# Any other binary targets build just one binary package at a time. +binary-%: build install + make -f debian/rules binary-common DH_OPTIONS=-p$* + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- dirdiff-2.1.orig/debian/compat +++ dirdiff-2.1/debian/compat @@ -0,0 +1 @@ +7 --- dirdiff-2.1.orig/debian/Notes +++ dirdiff-2.1/debian/Notes @@ -0,0 +1,18 @@ +What programs does dirdiff use? From a grep for 'exec' and +'open', we see the following + +program package +------- ------- +cmp diff +diff diff +bk (bitkeeper) [not in debian] +cp fileutils + + +Both "diff" and "fileutils" are deemed "essential", so +we're not supposed to declare the dependency. + + + 2002-05-01 + +Sent the man page to Paul M. --- dirdiff-2.1.orig/debian/dirdiff.lintian-overrides +++ dirdiff-2.1/debian/dirdiff.lintian-overrides @@ -0,0 +1 @@ +dirdiff: package-name-doesnt-match-sonames libfilecmp0.0 --- dirdiff-2.1.orig/debian/dirdiff.1 +++ dirdiff-2.1/debian/dirdiff.1 @@ -0,0 +1,111 @@ +.TH DIRDIFF 1 "May 2002" +.\" Please adjust this date whenever revising the manpage. +.SH NAME +dirdiff \- display differences and merge changes between directory trees +.SH SYNOPSIS +.B dirdiff +.BI [-a|--all] +.BI [-o|--only " pattern"] +.BI [-I|--ignore " pattern"] +.BI [-r|--rcs] +.BI [-t|--bktag] +.BI [-c|--context " num"] +.BI [-b] +.BI [-w] +.BI [-B] +.BI [-i] +.BI [-d] +.BI [-S] +.BI [-k] +.BI dir1\ dir2\ ... +.SH OPTIONS +.TP +.BI \-a,\-\-all +Don't exclude any files. +.TP +.BI \-o,\-\-only " pattern" +Only process files matching +.I pattern. +.TP +.BI \-I,\-\-ignore " pattern" +Don't process files matching +.I pattern. +.TP +.BI \-r,\-\-rcs +Ignore differences in RCS strings. +.TP +.BI \-t,\-\-bktag +Ignore differences in Bitkeeper strings. +.TP +.BI \-c,\-\-context " num" +Set number of lines of context to show. +.TP +.BI \-b,\-w,\-B,\-i,\-d +Pass these on to +.B diff. +.TP +.BI \-S +Show files that are the same in the file list. +.TP +.BI \-K +Enable bitkeeper support. +.SH DESCRIPTION +.B Dirdiff +is a graphical tool for displaying the differences between directory +trees (up to 5) and for merging changes from one tree into another. +.PP +At startup, +.B dirdiff +displays a main window with a list of the files that are different +between the trees. Colored squares are used to indicate the relative +ages of the versions. Files are like leaves on a deciduous tree: the +newest ones are green, and then they turn yellow, orange, and red as +they get older. Missing files are black, and directories are white. +.PP +To see the differences between two versions of a file, double-click on +the file name. By default, the first and last versions are compared, +but this can be changed using the +.I Diff +menu in the main window. +In the differences window, there are checkboxes to the left of all the +sections which are different. You can use button 1 to select an +individual checkbox, or shift-button 1 or button 3 to select a whole +group. Selecting a line means that you are asking for that change to +be made when you update either of the files using the Merge menu. The +line will be removed if it is already present or added if it is not +present. +.PP +To copy from one tree to another, click on the file name and +select the appropriate copy operation from the +.I Copy +menu of the main window. +.PP +Selecting +.I Make patch +from the +.I File +menu of the main window produces a file describing the changes between +the files that can be applied by the patch tool. You can edit the +patch before saving, and may wish to add explanatory text, +instructions, or patch +.I Prereq +lines at the beginning. To save the patch, enter a filename in the +patch window relative to the current directory, and choose +.I Save. +This will also close the window. +.PP +If you are sending out patches, then the +.I from +directory should be the original version of the source. Try to make +sure that the two files have the same number of leading directories. +See the patch(1) man page for more information. +.SH NOTES +.B Dirdiff +needs to be able to load the +.I libfilecmp.so.0.0 +shared library for the -r or -t flags to work. +.SH SEE ALSO +.BR diff (1) +.BR patch (1) +.SH AUTHOR +Paul Mackerras --- dirdiff-2.1.orig/debian/patches/ignore-svn +++ dirdiff-2.1/debian/patches/ignore-svn @@ -0,0 +1,11 @@ +--- cvs-local.orig/dirdiff ++++ cvs-local/dirdiff +@@ -37,7 +37,7 @@ + set docvsignore 0 + + set defaultcvsignore { +- RCS SCCS CVS CVS.adm RCSLOG cvslog.* tags TAGS ++ RCS SCCS CVS CVS.adm RCSLOG cvslog.* .svn tags TAGS + .make.state .nse_depinfo *~ \#* .\#* ,* _$* *$ + *.old *.bak *.BAK *.orig *.rej .del-* *.a *.olb + *.o *.obj *.so *.exe *.Z *.elc *.ln core --- dirdiff-2.1.orig/debian/patches/tcl-version.patch +++ dirdiff-2.1/debian/patches/tcl-version.patch @@ -0,0 +1,19 @@ +--- cvs-local.orig/Makefile ++++ cvs-local/Makefile +@@ -7,12 +7,14 @@ + INSTALL=install + + # You may need to change the -I arguments depending on your system +-CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl ++CFLAGS=-O3 -I/usr/include/tcl8.5 ++ ++LIBS = -ltcl8.5 + + all: libfilecmp.so.0.0 + + libfilecmp.so.0.0: filecmp.c +- $(CC) $(CFLAGS) -shared -o $@ filecmp.c ++ $(CC) $(CFLAGS) -shared -o $@ filecmp.c $(LIBS) + + install: dirdiff libfilecmp.so.0.0 + $(INSTALL) -c dirdiff $(BINDIR) --- dirdiff-2.1.orig/debian/patches/funky-chars.patch +++ dirdiff-2.1/debian/patches/funky-chars.patch @@ -0,0 +1,201 @@ +--- cvs-local.orig/dirdiff ++++ cvs-local/dirdiff +@@ -563,7 +563,7 @@ + if {$d1 == $d2} continue + set any 1 + $base.p.$sub1 add command -label "$d2" \ +- -command "makepatch \"$d1\" \"$d2\"" ++ -command [list makepatch $d1 $d2] + } + if {$any} { + $base.p add cascade -label "$d1 ->" -menu $base.p.$sub1 +@@ -579,7 +579,7 @@ + set i 0 + foreach d $dirs { + if {!$dirreadonly($i)} { +- $base.t add command -label $d -command "touchfiles \"$d\"" ++ $base.t add command -label $d -command [list touchfiles $d] + } + incr i + } +@@ -677,7 +677,7 @@ + set i 0 + foreach d $dirs { + .bar.options add checkbutton -label "Read-only $d" \ +- -variable dirreadonly($i) -command "readonlychange $i" ++ -variable dirreadonly($i) -command [list readonlychange $i] + incr i + } + +@@ -1153,7 +1153,7 @@ + if {$xi != ""} { + set x [lindex $dirs $xi] + $diffbut add command -label "Show $x" \ +- -command "showfile \"$x\" \"$selfile\"" ++ -command [list showfile $x $selfile] + } + } elseif {$numgroups > 1} { + if {$numgroups > 2} { +@@ -1163,7 +1163,7 @@ + lappend x [lindex $dirs $i] + } + $diffbut add command -label "$numgroups-way diff" \ +- -command "diffn {$x} {$selfile}" ++ -command [list diffn $x $selfile] + } + for {set gn 1} {$gn < $numgroups} {incr gn} { + set yi [lindex $groupelts($gn) 0] +@@ -1184,7 +1184,7 @@ + set xi [lindex $groupelts($go) 0] + if {$xi == ""} continue + set x [lindex $dirs $xi] +- set cmd "diff2 \"$x\" \"$y\" \"$selfile\"" ++ set cmd [list diff2 $x $y $selfile] + if {$numgroups <= 3} { + if {$compound_ok} { + $diffbut add command -label "$x vs. $y" \ +@@ -1283,7 +1283,7 @@ + set cl2 [lindex $bgcolors($ng) $age] + if {$im2 == "ex"} {set im2 ""} + set y [lindex $dirs $dst] +- set cmd "copyselfile \"$src\" \"$dst\" \"$selfile\" 0" ++ set cmd [list copyselfile $src $dst $selfile 0] + if {$any == 1} { + if {$compound_ok} { + $copybut add command -label "$x -> $y" \ +@@ -1346,7 +1346,7 @@ + set im2 [lindex $agecolors($ng) $age] + set cl2 [lindex $bgcolors($ng) $age] + set y [lindex $dirs $dst] +- set cmd "copyselfile \"$src\" \"$dst\" \"$selfile\" 1" ++ set cmd [list copyselfile $src $dst $selfile 1] + if {$any == 1} { + if {$compound_ok} { + $copybut add command -label "$x -> $y" \ +@@ -1392,10 +1392,10 @@ + if {$compound_ok} { + $copybut add command -label "Remove from $x" \ + -image ex -compound left \ +- -command "removeselfile \"$dst\" \"$selfile\"" ++ -command [list removeselfile $dst $selfile] + } else { + $copybut add command -label "Remove from $x" \ +- -command "removeselfile \"$dst\" \"$selfile\"" ++ -command [list removeselfile $dst $selfile] + } + } + } +@@ -1415,7 +1415,7 @@ + if {$dirreadonly($d)} continue + set y [lindex $dirs $d] + $copybut add command -label "$x -> $y" \ +- -command "copyselfile \"$s\" \"$d\" \"$selfile\" 0" ++ -command [list copyselfile $s $d $selfile 0] + } + } + set needsep 1 +@@ -1429,10 +1429,10 @@ + if {$compound_ok} { + $copybut add command -label "Remove from $x" \ + -image ex -compound left \ +- -command "removeselfile \"$s\" \"$selfile\"" ++ -command [list removeselfile $s $selfile] + } else { + $copybut add command -label "Remove from $x" \ +- -command "removeselfile \"$s\" \"$selfile\"" ++ -command [list removeselfile $s $selfile] + } + } + } +@@ -1469,7 +1469,7 @@ + + # Show the file in an external viewer + if { [llength $showprogram] > 0} { +- eval "exec $showprogram \"$fn\" &" ++ exec $showprogram $fn & + return + } + # Or make our own viewer +@@ -1569,7 +1569,7 @@ + set diffopts "-U $ctxlines $diffiflag $diffwflag $diffbflag $diffBflag $diffdflag" + + if { [llength $diffprogram] > 0} { +- eval "exec $diffprogram \"$path1\" \"$path2\" &" ++ exec $diffprogram $path1 $path2 & + return + } + # If we used an external diff program, its options are used. If we didn't, +@@ -1750,7 +1750,7 @@ + if {$gx == $g && !$dirreadonly($k)} { + set f [lindex $dirs $k] + $mergebut.m add command -label "update $f" \ +- -command "diffmerge $i \"$f\"" ++ -command [list diffmerge $i $f] + set path [joinname $f $difffile] + set diffmtime($path) [file mtime $path] + } +@@ -1770,7 +1770,7 @@ + if {$gx == $g && !$dirreadonly($k)} { + set f [lindex $dirs $k] + $mpatchbut.m add command -label "for $f" \ +- -command "diffmpatch $i \"$f\"" ++ -command [list diffmpatch $i $f] + } + incr k + } +@@ -3424,7 +3424,7 @@ + $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t" + $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t" + $w.bar.edit.m add command -label Find \ +- -command "difffind :merge:$di:$fi $w.t" ++ -command [list difffind :merge:$di:$fi $w.t] + pack $w.bar.edit -side left + frame $w.f -relief sunk -border 2 + entry $w.f.filename +@@ -3533,7 +3533,7 @@ + $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t" + $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t" + $w.bar.edit.m add command -label Find \ +- -command "difffind :mpatch:$fi $w.t" ++ -command [list difffind :mpatch:$fi $w.t] + pack $w.bar.edit -side left + frame $w.f -relief sunk -border 2 + entry $w.f.filename +@@ -3993,7 +3993,7 @@ + $w.bar.edit.m add command -label Copy -command "tk_textCopy $w.t" + $w.bar.edit.m add command -label Paste -command "tk_textPaste $w.t" + $w.bar.edit.m add command -label Find \ +- -command "difffind :patch:$patchnum $w.t" ++ -command [list difffind :patch:$patchnum $w.t] + pack $w.bar.edit -side left + frame $w.f -relief sunk -border 2 + label $w.f.l -text "Filename: " +@@ -4032,23 +4032,23 @@ + set p1 [joinname $d1 $f] + set p2 [joinname $d2 $f] + if {[file exists $p1] && [file exists $p2]} { +- set fh [open "|diff $contextopt $p1 $p2" r] ++ set fh [open [list |diff $contextopt $p1 $p2] r] + } elseif {[file exists $p1] && ! [file exists $p2]} { +- set fh [open "|diff $contextopt $p1 $nullfile" r] ++ set fh [open [list |diff $contextopt $p1 $nullfile] r] + } elseif {! [file exists $p1] && [file exists $p2]} { +- set fh [open "|diff $contextopt $nullfile $p2" r] ++ set fh [open [list |diff $contextopt $nullfile $p2] r] + } else { + continue + } + fconfigure $fh -blocking 0 +- fileevent $fh readable "readpatch $fh $pnum $w $d1 $d2 $i \"$f\"" ++ fileevent $fh readable [list readpatch $fh $pnum $w $d1 $d2 $i $f] + return + } + if {[string match ".*" $w]} { + $w.t delete "end - 1c" end + } else { + close $w +- eval "exec $showprogram \"$patch_outfile\" &" ++ exec $showprogram $patch_outfile & + # Should we remove the tempfile here? We don't have it if we used + # the internal viewer + } --- dirdiff-2.1.orig/debian/patches/series +++ dirdiff-2.1/debian/patches/series @@ -0,0 +1,4 @@ +ignore-svn +tcl-version.patch +shared-object.patch +funky-chars.patch --- dirdiff-2.1.orig/debian/patches/shared-object.patch +++ dirdiff-2.1/debian/patches/shared-object.patch @@ -0,0 +1,18 @@ +--- cvs-local.orig/Makefile ++++ cvs-local/Makefile +@@ -9,12 +9,14 @@ + # You may need to change the -I arguments depending on your system + CFLAGS=-O3 -I/usr/include/tcl8.5 + ++SOFLAGS = -fPIC -Wl,-soname,libfilecmp.so.0.0 ++ + LIBS = -ltcl8.5 + + all: libfilecmp.so.0.0 + + libfilecmp.so.0.0: filecmp.c +- $(CC) $(CFLAGS) -shared -o $@ filecmp.c $(LIBS) ++ $(CC) $(CFLAGS) -shared $(SOFLAGS) -o $@ filecmp.c $(LIBS) + + install: dirdiff libfilecmp.so.0.0 + $(INSTALL) -c dirdiff $(BINDIR)