--- tkcvs-8.2.3.orig/debian/README.debian +++ tkcvs-8.2.3/debian/README.debian @@ -0,0 +1,23 @@ +tkcvs for DEBIAN +---------------- + +Downloaded from + +http://www.twobarleycorns.net/tkcvs.html + +and originally packaged for Debian by Joel Rosdahl . +Packaging now being maintained by Tim Cutts . + +N.B.: + +TkCVS needs a graphical texteditor for editing/viewing files. By +default, + + x-terminal-emulator -e sensible-editor + +is used as the editor command. You can change the editor and other +configuration options by editing /etc/tkcvs/tkcvs_def.tcl; see the +manual page for tkcvs for more information. + +Also make sure that the CVSROOT variable is set for your users. + --- tkcvs-8.2.3.orig/debian/changelog +++ tkcvs-8.2.3/debian/changelog @@ -0,0 +1,398 @@ +tkcvs (8.2.3-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix tk depencencies (Closes: #725768). + * Add explicit debian/source/format. + + -- Andrey Rahmatullin Sun, 18 Dec 2016 22:28:56 +0500 + +tkcvs (8.2.3-1) unstable; urgency=low + + * New upstream version + * Updated to standards 3.9.3 + * Provides tkdiff (Closes: #675352) + + -- Tim Cutts Fri, 08 Jun 2012 22:25:55 +0100 + +tkcvs (8.2.1-2) unstable; urgency=low + + * Updated to standards 3.8.4 + + -- Tim Cutts Wed, 26 May 2010 20:45:30 +0200 + +tkcvs (8.2.1-1) unstable; urgency=low + + * New upstream version (Closes: #580191) + * Change package section to vcs + * Remove conflict with tkdiff, but keep 'Replaces' (Closes: #545106) + + -- Tim Cutts Wed, 26 May 2010 09:25:49 +0200 + +tkcvs (8.2-1) unstable; urgency=low + + * New upstream version + * Updated to policy 3.8.2 + * Removed conflict with tk8.3 (Closes: #517897) + * Change the suggested tag date format to avoid locale issues + (Closes: #412987) + + -- Tim Cutts Wed, 12 Aug 2009 17:33:08 +0200 + +tkcvs (8.1-5) unstable; urgency=low + + * Accidentally missed out tkdiff (Closes: #502922) + + -- Tim Cutts Tue, 21 Oct 2008 17:52:14 +0200 + +tkcvs (8.1-4) unstable; urgency=low + + * Allow tkcvs to work with either tk8.4 or tk8.5 (Closes: #502545) + + -- Tim Cutts Sat, 18 Oct 2008 20:57:34 +0200 + +tkcvs (8.1-3) unstable; urgency=low + + * Patch from Alexander Galinin to fix merge + within a branch (Closes: #501256) + + -- Tim Cutts Mon, 06 Oct 2008 10:40:51 +0200 + +tkcvs (8.1-2) unstable; urgency=low + + * Updated policy to 3.8.0 + * Fixed bashism in contrib script (Closes: #489666) + * Fixed a couple of lintian warnings + + -- Tim Cutts Fri, 05 Sep 2008 14:12:42 +0200 + +tkcvs (8.1-1) unstable; urgency=low + + * New upstream version (Closes: #485923) + * Moved to tk8.5 + * Updated standards to 3.7.3 + * Revised menu location according to policy + * Added short description to tkdirdiff manpage + * tkdiff is now being provided by tkcvs internally + + -- Tim Cutts Thu, 12 Jun 2008 12:34:36 +0200 + +tkcvs (8.0.4-2) unstable; urgency=low + + * Fixed bug in cvscfg(editor) handling, which caused .tkcvs to grow + (Closes: #442111) + + -- Tim Cutts Sat, 15 Sep 2007 08:52:42 +0100 + +tkcvs (8.0.4-1) unstable; urgency=low + + * New upstream version (Closes: #375686, #399391) + * New tkdirdiff program + * Fixed some minor errors in packaging flagged up by lintian + * Menu entry correctly removed on package removal (Closes: #417572) + + -- Tim Cutts Mon, 13 Aug 2007 18:31:15 +0100 + + +tkcvs (8.0.3-3) unstable; urgency=low + + + * Included desktop icon patch from Ubuntu (Closes: #368824) + + -- Tim Cutts Tue, 3 Oct 2006 09:21:57 +0100 + +tkcvs (8.0.3-2) unstable; urgency=low + + * Updated to policy 3.7.2 + + -- Tim Cutts Tue, 3 Oct 2006 09:06:16 +0100 + +tkcvs (8.0.3-1) unstable; urgency=low + + * New upstream release, fixes some problems with SVN repositories + (Closes: #359222) + + -- Tim Cutts Sun, 14 May 2006 11:06:19 +0100 + +tkcvs (8.0.1-1) unstable; urgency=low + + * New upstream release (Closes: #349866) + * Updated to DH_COMPAT=4 + + -- Tim Cutts Tue, 7 Feb 2006 13:49:20 +0000 + +tkcvs (7.2.4-1) unstable; urgency=low + + * New upstream release. + * Updated to standards version 3.6.2 + + -- Tim Cutts Tue, 30 Aug 2005 14:25:57 +0100 + +tkcvs (7.2.2-1) unstable; urgency=low + + * New upstream release. Closes: #282193 + + -- Tim Cutts Thu, 25 Nov 2004 21:13:39 +0000 + +tkcvs (7.2.1-1) unstable; urgency=low + + * New maintainer + * New upstream release + * Added alternative xterm dependency for x-terminal-emulator, in + accordance with policy + * Changed deprecated use of dh_installmanpages to dh_installman + * Removed conffiles file, now that debhelper treats /etc files as + conffiles anyway + * /etc/tkcvs/tkcvs_def.tcl sets a default date format. Not setting + it in .tkcvs is not a problem. Closes: #152060. + + -- Tim Cutts Tue, 13 Jul 2004 20:40:12 +0100 + +tkcvs (7.2-2) unstable; urgency=low + + * Orphaned. + + -- Joel Rosdahl Sun, 4 Apr 2004 20:49:59 +0200 + +tkcvs (7.2-1) unstable; urgency=low + + * New upstream release. + * Standards-Version 3.6.1. + * Files beginning with ~ aren't listed as unknown. Closes: bug#131829. + * The vertical scrollbar is updated correctly when the file list is + sorted. Closes: bug#170957. + + -- Joel Rosdahl Sun, 11 Jan 2004 12:47:37 +0100 + +tkcvs (7.1.4-1) unstable; urgency=low + + * New upstream release. + * tkcvs no longer hangs due to incompatibility with current CVS + versions. Closes: bug#219593. + * Depend on Tcl/Tk 8.4 instead of 8.3. Closes: bug#219749. + * Standards-Version 3.6.0. + + -- Joel Rosdahl Mon, 10 Nov 2003 20:24:37 +0100 + +tkcvs (7.1.2-1) unstable; urgency=low + + * New upstream release. + * Standards-Version 3.5.8. + + -- Joel Rosdahl Sat, 25 Jan 2003 22:36:50 +0100 + +tkcvs (7.1.1-2) unstable; urgency=low + + * Fixed tkdiff command name in configuration file; upstream now defaults + to its own "tkdiffb". + + -- Joel Rosdahl Thu, 28 Nov 2002 19:18:17 +0100 + +tkcvs (7.1.1-1) unstable; urgency=low + + * New upstream release. Closes: bug#139196, bug#139199, bug#139200 + and bug#139202. + + -- Joel Rosdahl Mon, 25 Nov 2002 22:42:49 +0100 + +tkcvs (7.0.3-1) unstable; urgency=low + + * New upstream version. Closes: bug#131824. + + -- Joel Rosdahl Fri, 1 Feb 2002 20:53:43 +0100 + +tkcvs (7.0.2-2) unstable; urgency=low + + * Changes to the menu entry (closes: bug#121002): + - Moved to section Apps/Programming. + - Added menu hint: "cvs". + - Added long title. + + -- Joel Rosdahl Sun, 25 Nov 2001 10:12:43 +0100 + +tkcvs (7.0.2-1) unstable; urgency=low + + * New upstream version. + * Moved debconf note to README.debian (should please Joey Hess :-)). + * Standards-Version: 3.5.6. + * Changed Build-Depends to Build-Depends-Indep, as this is an + architecture-independent package. + * Default to running sensible-editor in an x-terminal-emulator. + + -- Joel Rosdahl Mon, 5 Nov 2001 19:56:05 +0100 + +tkcvs (7.0.1-1) unstable; urgency=low + + * New upstream version. Closes: bug#99879. + * Removed INSTALL and README.windows from doc dir. + * The module browser works much better without special tagging. Closes: + bug#84318. + * Switched to DH_COMPAT=3. + * Standards-Version 3.5.6. + + -- Joel Rosdahl Sat, 6 Oct 2001 23:24:53 +0200 + +tkcvs (6.4-4) unstable; urgency=low + + * Added German translation of debconf templates. Closes: bug#94851. + * Removed dh_suidregister from debian/rules. + * Source debconf confmodule in postinst. + + -- Joel Rosdahl Tue, 1 May 2001 21:57:52 +0200 + +tkcvs (6.4-3) unstable; urgency=low + + * Translated debconf templates to Swedish. + * Standards-Version: 3.2.1. + + -- Joel Rosdahl Thu, 25 Jan 2001 21:31:31 +0100 + +tkcvs (6.4-2) unstable; urgency=low + + * Included more docs and the upstream changelog. + + -- Joel Rosdahl Mon, 16 Oct 2000 21:36:08 +0200 + +tkcvs (6.4-1) unstable; urgency=low + + * New upstream version. + + -- Joel Rosdahl Mon, 16 Oct 2000 21:31:22 +0200 + +tkcvs (6.3-1) unstable; urgency=low + + * New upstream version. + + -- Joel Rosdahl Sun, 3 Sep 2000 13:07:29 +0200 + +tkcvs (6.0p6.3b3-3) unstable; urgency=low + + * Improved build target in debian/rules. + * Added Build-Depends field to debian/control. + + -- Joel Rosdahl Sat, 13 May 2000 00:21:32 +0200 + +tkcvs (6.0p6.3b3-2) unstable; urgency=low + + * Use x-terminal-emulator instead of xterm. Fixes bug#61383. + + -- Joel Rosdahl Thu, 30 Mar 2000 15:10:52 +0200 + +tkcvs (6.0p6.3b3-1) unstable; urgency=low + + * New version. + + -- Joel Rosdahl Sat, 11 Mar 2000 20:05:35 +0100 + +tkcvs (6.0p6.2b3-1) unstable; urgency=low + + * New version. + + -- Joel Rosdahl Fri, 3 Dec 1999 14:04:41 +0100 + +tkcvs (6.0p6.1a8-2) unstable; urgency=low + + * Added URL in /usr/doc/tkcvs/copyright. + * Clean up build tree to get a smaller diff. + * Put library files in /usr/share/tkcvs. + * Standards-version 3.0.1. + + -- Joel Rosdahl Sun, 19 Sep 1999 20:03:37 +0200 + +tkcvs (6.0p6.1a8-1) unstable; urgency=low + + * New version. + * Recommend xterm instead of depend on xbase. + + -- Joel Rosdahl Thu, 21 Jan 1999 20:35:58 +0100 + +tkcvs (6.0p6.1a7-1) unstable; urgency=low + + * New upstream version. + + -- Joel Rosdahl Fri, 30 Oct 1998 20:50:50 +0100 + +tkcvs (6.0p6.1a3-1) unstable; urgency=low + + * New version (fixes bug #26981). + * Removed deprecated icon tag in the menu entry. + + -- Joel Rosdahl Sat, 26 Sep 1998 17:03:06 +0200 + +tkcvs (6.0-12) unstable; urgency=low + + * Converted to debhelper. + * Standards-Version 2.4.1 + + -- Joel Rosdahl Sun, 26 Jul 1998 17:14:17 +0200 + +tkcvs (6.0-11) unstable; urgency=low + + * Fixed an unterminated string (bug #23885) + + -- Joel Rosdahl Fri, 26 Jun 1998 00:28:17 +0200 + +tkcvs (6.0-10) unstable; urgency=low + + * Changed parameter usage in call of tkdiff (bug #23266) + + -- Joel Rosdahl Tue, 9 Jun 1998 01:35:01 +0200 + +tkcvs (6.0-9) frozen unstable; urgency=low + + * Aaargh, forgot to upload to frozen. :P + + -- Joel Rosdahl Sun, 19 Apr 1998 18:06:10 +0200 + +tkcvs (6.0-8) unstable; urgency=low + + * Moved back to main, because tkdiff changed from non-free to main. + + -- Joel Rosdahl Sun, 19 Apr 1998 17:56:17 +0200 + +tkcvs (6.0-7) unstable; urgency=low + + * Fixed flags on /usr/lib/tkcvs/venget.tcl + * Fixed so that /usr/man/man1/tkcvs.1.gz is in md5sums + + -- Joel Rosdahl Sun, 8 Mar 1998 21:32:25 +0100 + +tkcvs (6.0-6) unstable; urgency=low + + * Moved /usr/bin/cvscheck to /usr/lib/tkcvs/cvscheck + * Fixed file permissions + * Standards-Version 2.4.0.0 + + -- Joel Rosdahl Sun, 8 Mar 1998 11:42:53 +0100 + +tkcvs (6.0-5) unstable; urgency=low + + * Rebuilt with debmake 3.5.8 to fix md5sums + + -- Joel Rosdahl Wed, 28 Jan 1998 11:00:27 +0100 + +tkcvs (6.0-4) unstable; urgency=low + + * Patched the default config file (/etc/tkcvs/tkcvs_def.tcl) to pop up an + error box if $CVSROOT is not set (closes bug #16701) + * Added a line of text (about CVSROOT) to the postinst script + + -- Joel Rosdahl Fri, 9 Jan 1998 14:08:46 +0100 + +tkcvs (6.0-3) unstable; urgency=low + + * Moved to contrib because of dependency of non-free tkdiff + * Standards-version 2.3.0.1 + + -- Joel Rosdahl Tue, 6 Jan 1998 10:48:55 +0100 + +tkcvs (6.0-2) unstable; urgency=low + + * Fixed default editor + + -- Joel Rosdahl Thu, 11 Dec 1997 11:54:39 +0100 + +tkcvs (6.0-1) unstable; urgency=low + + * Initial Release. + + -- Joel Rosdahl Wed, 26 Nov 1997 08:52:45 +0100 --- tkcvs-8.2.3.orig/debian/compat +++ tkcvs-8.2.3/debian/compat @@ -0,0 +1 @@ +7 --- tkcvs-8.2.3.orig/debian/control +++ tkcvs-8.2.3/debian/control @@ -0,0 +1,48 @@ +Source: tkcvs +Section: vcs +Priority: optional +Maintainer: Tim Cutts +Standards-Version: 3.9.3 +Homepage: http://www.twobarleycorns.net/tkcvs.html +Build-Depends: debhelper (>= 7.0.0) + +Package: tkcvs +Architecture: all +Depends: cvs | subversion, tk (>= 8.4), ttf-dejavu, ${misc:Depends} +Replaces: tkdiff +Provides: tkdiff +Recommends: xterm | x-terminal-emulator, dirdiff +Description: Graphical front-end to CVS and Subversion + TkCVS is a Tk based graphical interface to the CVS and Subversion + version control systems. For CVS, it includes facilities for providing + "user friendly" names to modules and directories within the repository, + and provides a facility to interactively browse the repository looking for + modules and directories. + . + Some of the features of TkCVS include: + . + File and directory browser, with optional display of hidden + files, and display of the current directory's location within + the CVS tree. + . + Push-button based check-in / check-out of CVS modules. Ability + to add and delete files from the repository also using push + buttons. + . + Module tree browser, and reports showing the structure of the + CVS modules tree. Individual modules or entire directory trees + may be checked out using the browser. + . + Updating of files from the repository when they change. + . + Tagging and branching of files from the file browser, and tagging + and branching of modules from the module browser. + . + Exporting a CVS module or directory from the repository for + delivery off-site. + . + Creation of patch files between two releases of a module, or + between a release and the current (head) version. + . + Viewing of diff and status listings for currently checked out + modules. --- tkcvs-8.2.3.orig/debian/copyright +++ tkcvs-8.2.3/debian/copyright @@ -0,0 +1,18 @@ +This package was originally debianized by Joel Rosdahl . +It is currently being mainained by Tim Cutts . + +The upstream source code was downloaded from: + + http://www.twobarleycorns.net/tkcvs.html + +Distributed under GPL version 2. See /usr/share/common-licenses/GPL-2. + +Portions of the code are: +Copyright (C) 1999-2002 Paul Mackerras. All rights reserved +Copyright (C) 1993,1994 by John Heidemann +Copyright (C) 1997,1998 D. Richard Hipp +Copyright (C) 1994-2005 by John M. Klassa. +Copyright (C) 1999-2001 by AccuRev Inc. +Copyright(C) 1998 by Dean S. Jones +Copyright (C) 1993,1994 by John Heidemann +Copyright (C) 1998-2005 Bryan Oakley --- tkcvs-8.2.3.orig/debian/rules +++ tkcvs-8.2.3/debian/rules @@ -0,0 +1,67 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp +build-stamp: + dh_testdir + touch build-stamp + +clean: + dh_testdir + dh_testroot + -rm -f build-stamp + dh_clean + -rm -f tkcvs/tkcvs + +# Build architecture-independent files here. +binary-indep: build +# dh_testversion + dh_testdir + dh_testroot + dh_prep + dh_installdirs + dh_install debian/tkcvs.desktop usr/share/applications + dh_install debian/tkcvs.xpm usr/share/pixmaps + + cp tkcvs/tkcvs.tcl debian/tkcvs/usr/bin/tkcvs + cp tkdiff/tkdiff debian/tkcvs/usr/bin/tkdiff + + sed -e '1s:wish8\..*:wish:' \ + contrib/tkdirdiff >debian/tkcvs/usr/bin/tkdirdiff + + chmod +x debian/tkcvs/usr/bin/tkcvs + cp -r tkcvs/bitmaps debian/tkcvs/usr/share/tkcvs + cp tkcvs/*.tcl tkcvs/tclIndex \ + debian/tkcvs/usr/share/tkcvs + mv debian/tkcvs/usr/share/tkcvs/tkcvs_def.tcl debian/tkcvs/etc/tkcvs/ + chmod +x debian/tkcvs/usr/bin/tkdirdiff + + dh_installdocs + dh_installexamples + dh_installmenu + dh_installcron + dh_installman + dh_installchangelogs CHANGELOG.txt + dh_strip + dh_compress + dh_fixperms + + chmod u+w debian/tkcvs/etc/tkcvs/tkcvs_def.tcl + + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-arch: build +# We have nothing to do by default. + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary --- tkcvs-8.2.3.orig/debian/source/format +++ tkcvs-8.2.3/debian/source/format @@ -0,0 +1 @@ +1.0 --- tkcvs-8.2.3.orig/debian/tkcvs.desktop +++ tkcvs-8.2.3/debian/tkcvs.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Encoding=UTF-8 +Name=tkcvs +GenericName=CVS/Subversion Frontend +Comment=A graphical frontend to CVS and Subversion. +Exec=tkcvs +Icon=tkcvs +Categories=RevisionControl;Development;ProjectManagement; + --- tkcvs-8.2.3.orig/debian/tkcvs.dirs +++ tkcvs-8.2.3/debian/tkcvs.dirs @@ -0,0 +1,7 @@ +usr/bin +usr/share/tkcvs +usr/share/tkcvs/bitmaps +usr/share/man/man1 +usr/share/pixmaps +usr/share/applications +etc/tkcvs --- tkcvs-8.2.3.orig/debian/tkcvs.docs +++ tkcvs-8.2.3/debian/tkcvs.docs @@ -0,0 +1 @@ +FAQ.txt --- tkcvs-8.2.3.orig/debian/tkcvs.examples +++ tkcvs-8.2.3/debian/tkcvs.examples @@ -0,0 +1,2 @@ +contrib/vendorcode.sh +contrib/cvsdiff --- tkcvs-8.2.3.orig/debian/tkcvs.manpages +++ tkcvs-8.2.3/debian/tkcvs.manpages @@ -0,0 +1,3 @@ +tkcvs/tkcvs.1 +debian/tkdirdiff.1 +debian/tkdiff.1 --- tkcvs-8.2.3.orig/debian/tkcvs.menu +++ tkcvs-8.2.3/debian/tkcvs.menu @@ -0,0 +1,8 @@ +?package(tkcvs): \ + command="/usr/bin/tkcvs" \ + needs="X11" \ + section="Applications/Programming" \ + hints="cvs" \ + title="TkCVS" \ + icon="/usr/share/pixmaps/tkcvs.xpm" \ + longtitle="TkCVS - Graphical CVS Frontend" --- tkcvs-8.2.3.orig/debian/tkcvs.xpm +++ tkcvs-8.2.3/debian/tkcvs.xpm @@ -0,0 +1,46 @@ +/* XPM */ +static char * tkcvs_xpm[] = { +"32 32 11 1", +" c None", +". c #FFFFFF", +"+ c #C6C6C6", +"@ c #E3E3E3", +"# c #717171", +"$ c #8E8E8E", +"% c #AAAAAA", +"& c #000000", +"* c #393939", +"= c #555555", +"- c #1C1C1C", +"................................", +"................................", +"...+@@++@@+.@#+.................", +"..+$##$$##$+@#+.................", +"......##....+$$.................", +"......##....+$$...$$............", +"......$$....@#+.@#$+............", +"......$$....@#+.@#+.............", +"......##....+$$.$+..............", +"......##....+$$$$+..............", +"......$$....@#+.##+.............", +"......$$....@#+.@#+.............", +"......##....+$$.+$#@............", +"......##....+$$..+##............", +"................................", +"................................", +"................................", +"................................", +"....@%&&&&&%*&=....+-+@%&&&&&%..", +"....*&*%%%&%%&=....==.*&*%%%#%..", +"...=&*......+-*@..@*$.&&........", +"..+-*@.......=&%..%&..&&$.......", +"..%&=........=&#..#*..+-&&%@....", +"..%&=........+&&..&%...+&&&*$...", +"..%&=.........&&.+&%.....$*&&#..", +"..%&-+........#&$=*@......@%&&..", +"...=&#........%&**=.........&&..", +"...+&&$...++..@*&&+...=+...$&#..", +"....+=&&&&-+...=&&....&&&&&&$...", +"......%%%%+....+%%....%%%%%%....", +"................................", +"................................"}; --- tkcvs-8.2.3.orig/debian/tkdiff.1 +++ tkcvs-8.2.3/debian/tkdiff.1 @@ -0,0 +1,40 @@ +.TH TKDIFF 1 "1995/06/16 12:52:15" + +.SH NAME +tkdiff \- A graphical "diff" utility. + +.SH SYNOPSIS +.B tkdiff +to interactively pick files. + +.B tkdiff +to compare two files. + +.B tkdiff -conflict +to merge a file with conflict markers generated by "merge" or "cvs", The +file is split into two temporary files which you can then merge as usual. + +.B tkdiff +to compare with the most recent version checked into CVS/SCCS/RCS +(checked for in that order). + +.B tkdiff -r +to compare with the most recent version checked in. + +.B tkdiff -r +to compare with revision of . + +.B tkdiff -r -r +to compare revision of with the most recent version +checked in. + +.B tkdiff -r -r +to compare revisions and of . + +.SH DESCRIPTION +A graphical "diff" utility. Online help is available by hitting +the "help" button. + +.SH AUTHOR +John Klassa +Warren Jones, Peter Brandstrom. --- tkcvs-8.2.3.orig/debian/tkdirdiff.1 +++ tkcvs-8.2.3/debian/tkdirdiff.1 @@ -0,0 +1,46 @@ +.TH tkdirdiff 1 Release 8.0.4 +.SH NAME +tkdirdiff \- graphical directory comparison tool +.SH SYNOPSIS +.B tkdirdiff +[options] dir1 dir2 ... +.SH DESCRIPTION +.LP +tkdirdiff gives a graphical representation of the differences between +two or more (up to five) directories, produce diffs between directory pairs +and so on. +.sp +.SH OPTIONS +.LP +tkdirdiff accepts the following options. +.TP +.B --all|-a +Don't exclude any files +.TP +.BI --only|-o " pattern" +Only process files matching pattern +.TP +.BI --ignore|-i " pattern" +Don't process files matching pattern +.TP +.B --rcs|r +Ignore differences in RCS strings. Requires the dirdiff package to be +installed. +.TP +.B --bktag|-t +Ignore differences in Bitkeeper strings. Requires the dirdiff package to be +installed. +.TP +.B -b, -w, -B, -i, -d +Passed on to diff(1) +.TP +.B -S +Show files that are the same in the file list +.TP +.B -K +Bitkeeper support +.sp +.SH SEE ALSO +diff(1), dirdiff(1) +.SH AUTHOR +Paul Mackerras --- tkcvs-8.2.3.orig/tkcvs/tkcvs.1 +++ tkcvs-8.2.3/tkcvs/tkcvs.1 @@ -9,7 +9,7 @@ TkCVS is a Tcl/Tk-based graphical interface to the CVS and Subversion configuration management systems. It displays the status of the files in the current working directory, and provides buttons and menus to execute configuration-management commands on the selected files. Limited RCS functionality is also present. TkDiff is bundled in for browsing and merging your changes. .LP TkCVS also aids in browsing the repository. For Subversion, the repository tree is browsed like an ordinary file tree. For CVS, the CVSROOT/modules file is read. TkCVS extends CVS with a method to produce a browsable, "user friendly" listing of modules. This requires special comments in the CVSROOT/modules file. See "CVS Modules File" for more guidance. -.SP +.sp .SH OPTIONS .LP TkCVS accepts the following options. @@ -37,7 +37,7 @@ % tkcvs -log tstheap.c .RE View the log of the file tstheap.c -.SP +.sp .SH Working Directory Browser .LP The working directory browser shows the files in your local working copy, or "sandbox." It shows the status of the files at a glance and provides tools to help with most of the common CVS, SVN, and RCS operations you might do. @@ -195,7 +195,7 @@ .TP .I Close: Press this button to close the Working Directory Browser. If no other windows are open, TkCVS exits. -.SP +.sp .SH Log (Branch) Browser .LP The TkCVS Log Browser window enables you to view a graphical display of the revision log of a file, including all previous versions and any branched versions. @@ -234,7 +234,7 @@ .LP [chars] Matches any character in the set given by chars. If a sequence of the form x-y appears in chars, then any character between x and y, inclusive, will match. .LP - \x Matches the single character x. This provides a way of avoiding the special interpretation of the characters *?[]\ in pattern. + \\x Matches the single character x. This provides a way of avoiding the special interpretation of the characters *?[]\ in pattern. .LP If you only enter "FOO" (without the \") in the entry box, it searches the exact string "foo". If you want to search all strings starting with "foo", you have to put "foo*". For all strings containing "foo", you must put "*foo*". .SS Log Browser Buttons @@ -263,7 +263,7 @@ This button closes the Log Browser. If no other windows are open, TkCVS exits. .SS The View Options Menu The View Menu allows you to control what you see in the branch diagram. You can choose how much information to show in the boxes, whether to show empty revisions, and whether to show tags. You can even control the size of the boxes. If you are using Subversion, you may wish to turn the display of tags off. If they aren't asked for they won't be read from the repository, which can save a lot of time. -.SP +.sp .SH Merge Tool for CVS .LP The Merge Tool chooses a "representative" file in the current directory and diagrams the branch tags. It tries to pick the "bushiest" file, or failing that, the most-revised file. If you disagree with its choice, you can type the name of another file in the top entry and press Return to diagram that file instead. @@ -275,7 +275,7 @@ .TP .I Merge Changes to Current: Instead of merging from the base of the branch, this button merges the changes that were made since a particular version on the branch. It pops up a dialog in which you fill in the version. It should usually be the version that was last merged. -.SP +.sp .SH Module Browser .LP Operations that are performed on the repository instead of in a checked-out working directory are done with the Module Browser. The most common of these operations is checking out or exporting from the repository. The Module Browser can be started from the command line (tkcvs -win module) or started from the main window by pressing the big button. @@ -329,7 +329,7 @@ .TP .I Close: This button closes the Repository Browser. If no other windows are open, TkCVS exits. -.SP +.sp .SH Importing New Modules .LP Before importing a new module, first check to make sure that you have write permission to the repository. Also you'll have to make sure the module name is not already in use. @@ -365,7 +365,7 @@ The current version number of the module. This should be a number of the form X.Y.Z where .Y and .Z are optional. You can leave this blank, in which case 1 will be used as the first version number. .LP Importing a directory into Subversion is similar but not so complicated. You use the SVN -> Import CWD into Repository menu. You need supply only the path in the repository where you want the directory to go. The repository must be prepared and the path must exist, however. -.SP +.sp .SH Importing to an Existing Module (CVS) .LP Before importing to an existing module, first check to make sure that you have write permission to the repository. @@ -392,7 +392,7 @@ .TP .I Version Number: The current version number of the module to be imported. This should be a number of the form X.Y.Z where .Y and .Z are optional. You can leave this blank, in which case 1 will be used as the first version number. -.SP +.sp .SH Vendor Merge (CVS) .LP Software development is sometimes based on source distribution from a vendor or third-party distributor. After building a local version of this distribution, merging or tracking the vendor's future release into the local version of the distribution can be done with the vendor merge command. @@ -414,7 +414,7 @@ The checked out local code will now contain changes from a merge between two revisions of the vendor modules. This code will not be checked into the repository. You can do that after you've reconciled conflicts and decide if that is what you really want. .LP A detailed example on how to use the vendor merge operation is provided in the PDF file vendor5readme.pdf. -.SP +.sp .SH Configuration Files .LP There are two configuration files for TkCVS. The first is stored in the directory in which the *.tcl files for TkCVS are installed. This is called tkcvs_def.tcl. You can put a file called site_def in that directory, too. That's a good place for site-specific things like tagcolours. Unlike tkcvs_def.tcl, it will not be overwritten when you install a newer version of TkCVS. @@ -594,13 +594,13 @@ .TP .B cvscfg(logging) Logging (debugging) on or off -.SP +.sp .SH Environment Variables .LP You should have the CVSROOT environment variable pointing to the location of your CVS repository before you run TkCVS. It will still allow you to work with different repositories within the same session. .LP If you wish TkCVS to point to a Subversion repository by default, you can set the environment variable SVNROOT. This has no meaning to Subversion itself, but it will clue TkCVS if it's started in an un-versioned directory. -.SP +.sp .SH User Configurable Menu Extensions .LP It is possible to extend the TkCVS menu by inserting additional commands into the .tkcvs or tkcvs_def.tcl files. These extensions appear on an extra menu to the right of the TkCVS Options menu. @@ -630,7 +630,7 @@ Any user-defined commands will be passed a list of file names corresponding to the files selected on the directory listing on the main menu as arguments. .LP The output of the user defined commands will be displayed in a window when the command is finished. -.SP +.sp .SH CVS Modules File .LP If you haven't put anything in your CVSROOT/modules file, please do so. See the "Administrative Files" section of the CVS manual. Then, you can add comments which TkCVS can use to title the modules and to display them in a tree structure. @@ -700,7 +700,7 @@ These extension lines commence with a "#" character, so CVS interprets them as comments. They can be safely left in the file whether you are using TkCVS or not. .LP "#M" is equivalent to "#D". The two had different functions in previous versions of TkCVS, but now both are parsed the same way. -.SP +.sp .SH SEE ALSO cvs(1), svn(1) .SH AUTHOR --- tkcvs-8.2.3.orig/tkcvs/tkcvs.tcl +++ tkcvs-8.2.3/tkcvs/tkcvs.tcl @@ -54,6 +54,9 @@ #puts "TclRoot $TclRoot" set TclRoot [file join [file dirname $TclRoot] "lib"] #puts "TclRoot $TclRoot" + + # Override TclRoot for debian systems + set TclRoot /usr/share # allow runtime replacement if {[info exists env(TCLROOT)]} { @@ -98,8 +101,8 @@ } # Read in defaults -if {[file exists [file join $TCDIR tkcvs_def.tcl]]} { - source [file join $TCDIR tkcvs_def.tcl] +if {[file exists /etc/tkcvs/tkcvs_def.tcl]} { + source /etc/tkcvs/tkcvs_def.tcl } # This helps us recover from a problem left behind by tkcvs 7.2 --- tkcvs-8.2.3.orig/tkcvs/tkcvs_def.tcl +++ tkcvs-8.2.3/tkcvs/tkcvs_def.tcl @@ -95,10 +95,10 @@ # example "mergeto_BRANCH_%d%b%y". The date format must be the same # for both. # CVS rule: a tag must not contain the characters `$,.:;@' -#set cvscfg(mergetoformat) "t_BRANCH_%d%b%y_%H-%M" -#set cvscfg(mergefromformat) "f_BRANCH_%d%b%y_%H-%M" -set cvscfg(mergetoformat) "mergeto_BRANCH_%d%b%y" -set cvscfg(mergefromformat) "mergefrom_BRANCH_%d%b%y" +#set cvscfg(mergetoformat) "t_BRANCH_%d%b%y" +#set cvscfg(mergefromformat) "f_BRANCH_%d%b%y" +set cvscfg(mergetoformat) "mergeto_BRANCH_%Y-%m-%d" +set cvscfg(mergefromformat) "mergefrom_BRANCH_%Y-%m-%d" set cvscfg(mergetrunkname) "trunk" # The branch browser depends on the convention of having a trunk, branches, and @@ -145,7 +145,7 @@ set logcfg(draw_delay) 2000 # Scaling options to offer user -set logcfg(scaling_options) {50% 0.5 80% 0.8 90% 0.9 100% 1.0 120% 1.2 150% 1.5} +set logcfg(scaling_options) {50% 0.5 80% 0.8 90% 0.9 100% 1.0 120% 1.2 150% 1.5 200% 2.0 250% 2.5} # User options for info display set logcfg(update_drawing) 2 @@ -205,7 +205,7 @@ # installed) a user can set the cvscfg(editor) variable to the editor # of choice in their .tkcvs file (if they have one). #set cvscfg(editor) "dtpad" - set cvscfg(editor) {xterm -e vi} + set cvscfg(editor) {x-terminal-emulator -name TkCVS-editor-shell -n TkCVS-editor-shell -e sensible-editor} # The file editor to be used may also be identified by pattern-matching the # filename by setting the cvscfg(editors) variable. This contains a series # of string pairs giving the editor-command and string-match-pattern. The @@ -221,12 +221,11 @@ # gimp *.gif # {calibredrv -m} *.gds #} - set cvscfg(tkdiff) "tkdiff" - #set cvscfg(print_cmd) {enscript -Ghr -fCourier8} + set cvscfg(tkdiff) "/usr/bin/tkdiff" set cvscfg(print_cmd) "lpr" set cvscfg(allow_abort) "yes" # What do you want to happen when you ask for a shell? - set cvscfg(shell) {xterm -name tkcvsxterm -n {TkCVS xterm}} + set cvscfg(shell) "x-terminal-emulator -name {TkCVS-shell} -n {TkCVS-shell}" # Some special stuff for MacOSX "native" Tk if {! [catch {set windowingsystem [tk windowingsystem]}] && $windowingsystem == "aqua"} { --- tkcvs-8.2.3.orig/tkcvs/workdir.tcl +++ tkcvs-8.2.3/tkcvs/workdir.tcl @@ -1577,7 +1577,7 @@ if {$cvscfg(editorargs) != ""} { set cvscfg(editor) [concat $cvscfg(editor) $cvscfg(editorargs)] } - unset cvscfg(editorargs) + set cvscfg(editorargs) {} } # Save the list so we can keep track of what we've done