--- gcvs-1.0final.orig/common/AppGlue.h +++ gcvs-1.0final/common/AppGlue.h @@ -30,8 +30,8 @@ class CCvsConsole { public: - virtual long cvs_out(char *txt, long len) = 0L; - virtual long cvs_err(char *txt, long len) = 0L; + virtual long cvs_out(char *txt, long len) = 0; + virtual long cvs_err(char *txt, long len) = 0; }; #define errInternal -99 --- gcvs-1.0final.orig/common/MultiString.cpp +++ gcvs-1.0final/common/MultiString.cpp @@ -39,6 +39,12 @@ # pragma warning (disable : 4660) #endif /* WIN32 */ +#if __GNUC__ == 3 && __GNUC_MINOR__ > 2 +# define TYPENAME typename +#else +# define TYPENAME +#endif + template TMString::TMString(unsigned int maxstr, const char *uniqueName, char * const *defaultStr, kClassPersistent pclass) : CPersistent(uniqueName, pclass), fMaxStr(maxstr) --- gcvs-1.0final.orig/common/Persistent.h +++ gcvs-1.0final/common/Persistent.h @@ -47,9 +47,9 @@ CPersistent(const char *uniqueName, kClassPersistent pclass); virtual ~CPersistent(); - virtual unsigned int SizeOf(void) const = 0L; - virtual const void *GetData(void) const = 0L; - virtual void SetData(const void *ptr, unsigned int size) = 0L; + virtual unsigned int SizeOf(void) const = 0; + virtual const void *GetData(void) const = 0; + virtual void SetData(const void *ptr, unsigned int size) = 0; // virtual access static void SaveAll(void); --- gcvs-1.0final.orig/common/UCvsConsole.cpp +++ gcvs-1.0final/common/UCvsConsole.cpp @@ -34,6 +34,8 @@ #include "uconsole.h" #include "TclGlue.h" +#include + UIMPLEMENT_DYNAMIC(UCvsConsole, UWidget) UBEGIN_MESSAGE_MAP(UCvsConsole, UWidget) @@ -138,7 +140,7 @@ gtk_text_insert(w, NULL, &col, NULL, s, -1); } else - gtk_text_insert(w, NULL, >K_WIDGET(w)->style->black, NULL, s, -1); + gtk_text_insert(w, NULL, >K_WIDGET(w)->style->text[GTK_STATE_NORMAL], NULL, s, -1); #endif } @@ -304,7 +306,7 @@ gtk_text_insert(w, NULL, &col, NULL, txt, len); } else - gtk_text_insert(w, NULL, >K_WIDGET(w)->style->black, NULL, txt, len); + gtk_text_insert(w, NULL, >K_WIDGET(w)->style->text[GTK_STATE_NORMAL], NULL, txt, len); #endif } --- gcvs-1.0final.orig/common/UCvsFiles.cpp +++ gcvs-1.0final/common/UCvsFiles.cpp @@ -439,6 +439,11 @@ } } +void UCvsFiles::ResetView(const UStr &path, bool notifyBrowser) +{ + ResetView(path.c_str(), notifyBrowser); +} + void UCvsFiles::GetEntriesModTime(time_t & newEntriesMod, time_t & newEntriesLogMod) { newEntriesMod = 0; --- gcvs-1.0final.orig/common/UCvsFiles.h +++ gcvs-1.0final/common/UCvsFiles.h @@ -35,7 +35,8 @@ UCvsFiles(); virtual ~UCvsFiles(); - void ResetView(const char *path, bool notifyBrowser = false); + void ResetView(const char *path, bool notifyBrowser = false); + void ResetView(const UStr &path, bool notifyBrowser = false); // reset to this path and notify optionally the directories tree void ResetView(bool forceReload = false, bool notifyBrowser = false); --- gcvs-1.0final.orig/common/getline.h +++ gcvs-1.0final/common/getline.h @@ -33,8 +33,8 @@ #define __PROTO(args) () #endif /* GCC. */ -int - getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream)); +//int +// getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream)); int getstr __PROTO ((char **_lineptr, size_t *_n, FILE *_stream, char _terminator, int _offset)); --- gcvs-1.0final.orig/cvstree/main.cpp +++ gcvs-1.0final/cvstree/main.cpp @@ -1,3 +1,4 @@ +#include #include #include "getopt.h" #include --- gcvs-1.0final.orig/cvsunix/lib/Makefile.in +++ gcvs-1.0final/cvsunix/lib/Makefile.in @@ -49,10 +49,9 @@ waitpid.c \ xgetwd.c \ yesno.c \ - cvsgui.c \ - cvsgui_process.cpp \ - cvsgui_wire.cpp + $(CVSGUI_SOURCES) +CVSGUI_SOURCES = cvsgui_wire.cpp cvsgui_process.cpp cvsgui.c CVSGUI_HEADERS = cvsgui_wire.h cvsgui_process.h cvsgui_protocol.h cvsgui.h cvsgui.c : $(top_srcdir)/../common/cvsgui.c $(CVSGUI_HEADERS) rm -f $@ @@ -164,7 +163,7 @@ .PHONY: clean distclean: clean - rm -f tags TAGS Makefile + rm -f tags TAGS Makefile $(CVSGUI_HEADERS) $(CVSGUI_SOURCES) .PHONY: distclean realclean: distclean --- gcvs-1.0final.orig/cvsunix/src/cvsbug.sh +++ gcvs-1.0final/cvsunix/src/cvsbug.sh @@ -85,9 +85,9 @@ [ -z "$TMPDIR" ] && TMPDIR=/tmp -TEMP=$TMPDIR/p$$ -BAD=$TMPDIR/pbad$$ -REF=$TMPDIR/pf$$ +TEMP="`tempfile -d $TMPDIR -p p.`" +BAD="`tempfile -d $TMPDIR -p pbad.`" +REF="`tempfile -d $TMPDIR -p pf.`" if [ -z "$LOGNAME" -a -n "$USER" ]; then LOGNAME=$USER @@ -108,14 +108,12 @@ /usr/bin/ypcat passwd 2>/dev/null | cat - /etc/passwd | grep "^$LOGNAME:" | cut -f5 -d':' | sed -e 's/,.*//' > $TEMP ORIGINATOR="`cat $TEMP`" - rm -f $TEMP fi fi if [ "$ORIGINATOR" = "" ]; then grep "^$LOGNAME:" /etc/passwd | cut -f5 -d':' | sed -e 's/,.*//' > $TEMP ORIGINATOR="`cat $TEMP`" - rm -f $TEMP fi if [ -n "$ORGANIZATION" ]; then --- gcvs-1.0final.orig/debian/changelog +++ gcvs-1.0final/debian/changelog @@ -0,0 +1,159 @@ +gcvs (1.0final-13build1) hardy; urgency=low + + * Rebuild for libglib1.2 -> libglib1.2ldbl transition. + + -- Luke Yelavich Wed, 05 Dec 2007 11:42:15 +1100 + +gcvs (1.0final-13) unstable; urgency=low + + * Fix GCC 4.3 compile errors (includes) (Closes: #417191) + * debian/control: Standards-Version: 3.7.2 + + -- Roland Stigge Tue, 10 Apr 2007 10:03:08 +0200 + +gcvs (1.0final-12) unstable; urgency=low + + * Fixed GCC 4.1 compile error: pure virtual methods "= 0" instead of + "= 0L" (Closes: #362209) + + -- Roland Stigge Thu, 13 Apr 2006 13:34:21 +0200 + +gcvs (1.0final-11) unstable; urgency=low + + * rf/ustr.h: Applied patch by Martin Michlmayr to fix + g++ 4.1 compilation (Closes: #356964) + * Added gcvs.desktop, provided by Reinhard Tartler + (Closes: #349363) + + -- Roland Stigge Wed, 15 Mar 2006 21:25:28 +0100 + +gcvs (1.0final-10) unstable; urgency=low + + * Removed unnecessary build dependency on xlibs-dev (Closes: #346779) + + -- Roland Stigge Tue, 10 Jan 2006 08:47:33 +0100 + +gcvs (1.0final-9) unstable; urgency=low + + * debian/control: Added "wish" to Suggests (Closes: #337501) + + -- Roland Stigge Mon, 14 Nov 2005 22:29:57 +0100 + +gcvs (1.0final-8) unstable; urgency=high + + * Patching cvsunix/src/cvsbug.sh (CVE: CAN-2005-2693) + Note: Patching sources only, not shipping cvsbug in the binary package for + general security reasons. The tool not necessary in gcvs. + + -- Roland Stigge Fri, 2 Sep 2005 21:54:52 +0200 + +gcvs (1.0final-7) unstable; urgency=low + + * debian/rules: Removed cvsbug from binary package for security reasons + (Closes: #324969) + * debian/control: Removed statement that gcvs uses the latest CVS sources + + -- Roland Stigge Sat, 27 Aug 2005 13:08:13 +0200 + +gcvs (1.0final-6) unstable; urgency=low + + * Rebuild due to new C++ ABI + * debian/control: Standards-Version: 3.6.2.0 + + -- Roland Stigge Mon, 1 Aug 2005 18:29:21 +0200 + +gcvs (1.0final-5) unstable; urgency=low + + * Build-Conflicts: libkrb5-dev to prevent different results on different + build environments (Closes: #279583) + * rf/{uevent,uwidget}.cpp: Applied patch to enable build on gcc 4.0 + (Closes: #286514) + + -- Roland Stigge Sun, 27 Feb 2005 19:42:42 +0100 + +gcvs (1.0final-4) unstable; urgency=low + + * Applied patch to set default text color instead of black (Closes: #278726) + + -- Roland Stigge Sat, 30 Oct 2004 12:16:38 +0200 + +gcvs (1.0final-3) unstable; urgency=low + + * Fixed debian/watch + + -- Roland Stigge Sat, 25 Oct 2003 14:21:26 +0200 + +gcvs (1.0final-2) unstable; urgency=low + + * debian/control: Suggests: meld instead of tkdiff (Closes: #118467) + + -- Roland Stigge Wed, 15 Oct 2003 20:43:11 +0200 + +gcvs (1.0final-1) unstable; urgency=low + + * New maintainer (Closes: #215380) + * New upstream release (Closes: #180099, #154942) + * Acknowledge NMU (Closes: #196402) + * common/getline.h: Commented out getline() redeclaration from stdio.h + (Closes: #203336) + * Set dependency to tcl8.4 (Closes: #183114) + * Upgraded to debhelper 4 + * Removed README.SUN from binary package + * Standards-Version: 3.6.1 + + -- Roland Stigge Wed, 15 Oct 2003 12:17:08 +0200 + +gcvs (1.0b3-3.1) unstable; urgency=low + + * Non-maintainer upload sponsored by Joey Hess. + * Correct failures to find implicit type converstions by allowing + UCvsFiles::ResetView() to take a UStr as an argument (closes: #196402). + + -- Mark Brown Wed, 16 Jul 2003 11:48:47 +0200 + +gcvs (1.0b3-3) unstable; urgency=low + + * Applied gcc 3.2 patch (more or less) from "Jeroen T. Vermeulen" + . Thanks! Gcvs now compiles with gcc-2.95, gcc-3.1, + and gcc-3.2, though not at the same time :-). (Closes: #158545) + * Beefed up the menu entry (Added cute fish icon, long description). + + -- David Caldwell Mon, 30 Sep 2002 19:04:50 -0700 + +gcvs (1.0b3-2) unstable; urgency=low + + * Changed docbase title. (Closes #146999) + * Changed subsection to devel. (Closes #145113) + + -- David Caldwell Thu, 23 May 2002 00:54:22 -0700 + +gcvs (1.0b3-1) unstable; urgency=low + + * New upstream release (closes: #130385) + * Had to patch around a couple environment variable bugs to make + sub-processes work. + + -- David Caldwell Sun, 24 Mar 2002 23:17:37 -0800 + +gcvs (1.0a7-2) unstable; urgency=medium + + * Fixed c++ compilation problem with gcc 3.0 for hppa port. + Closes: #133677 + * I Considered upgrading to new upstream, but I couldn't get it to + work at all, so I just backported their g++ 3.0 changes. + + -- David Caldwell Sun, 17 Feb 2002 15:21:40 -0700 + +gcvs (1.0a7-1) unstable; urgency=low + + * New upstream release + + -- David Caldwell Sat, 20 Oct 2001 01:27:40 -0700 + +gcvs (1.0a6-1) unstable; urgency=low + + * Initial Debain Release. + + -- David Caldwell Fri, 19 Oct 2001 23:57:13 -0700 + + --- gcvs-1.0final.orig/debian/compat +++ gcvs-1.0final/debian/compat @@ -0,0 +1 @@ +4 --- gcvs-1.0final.orig/debian/control +++ gcvs-1.0final/debian/control @@ -0,0 +1,25 @@ +Source: gcvs +Section: devel +Priority: optional +Maintainer: Roland Stigge +Build-Depends: debhelper (>= 4), file, flex, libglib1.2-dev, libgtk1.2-dev, tcl8.4-dev, texinfo +Build-Conflicts: libkrb5-dev +Standards-Version: 3.7.2 + +Package: gcvs +Architecture: any +Depends: ${shlibs:Depends} +Suggests: meld, wish +Description: Graphical frontend for CVS + An advanced, easy to use frontend for CVS. + . + gCvs features: + - gCvs is part of the CvsGui project and shares a large portion of code + with WinCvs and MacCvs, both of which are fairly mature + - gCvs is written in C++ using GTK+ + - Makes CVS easier for the novice + - Increases the power of CVS by providing a high-end interface + - The project is growing because it is supported and developed by several + CVS users + . + Homepage: http://sourceforge.net/projects/cvsgui/ --- gcvs-1.0final.orig/debian/copyright +++ gcvs-1.0final/debian/copyright @@ -0,0 +1,22 @@ +This package was debianized by David Caldwell on +Fri, 19 Oct 2001 23:57:13 -0700. +Currently maintained by Roland Stigge +Wed, 15 Oct 2003 15:30:07 +0200 + +It was downloaded from: http://sourceforge.net/projects/cvsgui/ + +Main Web Page: www.cvsgui.org +Sourceforge project: cvsgui + +Upstream Authors: The www.cvsgui.org team. + +Copyright: + Copyright (c) 1993-1994 Brian Berliner + Copyright (c) 1992 Brian Berliner and Jeff Polk + Copyright (c) 1989-1992, Brian Berliner + All Rights Reserved + +You are free to distribute this software under the terms of +the GNU General Public License. +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL file. --- gcvs-1.0final.orig/debian/cvs.gif.uu +++ gcvs-1.0final/debian/cvs.gif.uu @@ -0,0 +1,30 @@ +begin 664 cvs.gif +M1TE&.#EA/@!0`-4``/___Q`0$#$Q,4)"0F-C8W-SYXRMQKW.WK7&UIRUSG.4M5)[I4)KE#%C +ME&.$K82R&.BH\>&QR@&I)%"0FJ$'0"K7HZ"^L!IU"L[1ST$;7"@L67)14#IVH`$0F7+H`4[ +M:(#YR(+0C8]0[&8$`F/4L!U`.-(`-N$C(;<6^6R[MX/2IWW?!4B$&DFT*5K9Q`=MO+)C"=U"^3P!G@7TYQ]8 +M@3#X@K-;$N!+5P^EL>8.MTR@7V\/S#9?8QDXTP$S`@Z(FG-85"=8!?!DX&!H +MOWG1G7W--'C_86,%=D$?:!-40$%^'X;6`!;,I8C>`]=AYR)\,.HU(XU6!'?C +M=O)!(6%H#W2WXW=/_-A8`R/N".(5<]6U``0)Z$BC9\<1V<4"0FKW`)$1"'<% +M!(!=V,`FKL'6XW-&GI?A$=FAEH9G6:*V98Q&8`D:?VDH`$$$83I65P2182$7 +M70T$"M>AB":J:!-?:4-%(".8\$(+E+;PP@E^N'"""YJZ<,2FF]:1P`F35NI" +M1EV`X$*EK%;ZTZJL?O1(K!VURNH+5!55JJDLC#""`2^8`(`)K9Y01`F5O@`` +M"ZRZT.L(*IS00AA0@+`KI<8^0H:MCL#:@K#>3JO2%=(VRT2X+325TP"K<+3J +MPEA,K-NJK$BHX*X8I@IA:PN8=C&"K4YJ:J47#UMQ"R@[\6^K3Y@, +M<[)%H5LI%!&S[$3/K0J+Q`@Z6R$RS$_H3"F\1UN1@,#9GK%)"/O&+`1"1:3` +M:M1/6.NNKY$&:\3!/YV!;24CL+#K"VV4I32E+[0,P-$#%T%WLB0G@0"IS29< + insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +cvstree \- program to help parse the output of "cvs log" for gcvs +.SH SYNOPSIS +.B cvs +.RI [ cvsoptions ]\ log \ [ logoptions ]\ |\ cvstree \ [ cvstree\ options ] +.SH DESCRIPTION +This manual page briefly documents the +.B cvstree +command. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBcvstree\fP is a program that helps gcvs parse the output of the "cvs log" command. +.SH OPTIONS +A summary of options is included below. +.TP +.B \-h, \-\-help +Show summary of options. +.TP +.B \-\-version +Show version of program. +.TP +.B \-v +Verbose the output similar to cvs log (default) +.TP +.B \-o output +Output in a file +.TP +.B \-g +Output a graph of the revisions +.TP +.B \-1 +Debug the lexer (flex output) +.TP +.B \-2 +Debug the parser (bison output) +.TP +.B \-3 +Debug both the parser and the lexer +.SH SEE ALSO +.BR cvs (1), +.BR gcvs (1). +.SH AUTHOR +This manual page was written by David Caldwell , +for the Debian GNU/Linux system (but may be used by others). --- gcvs-1.0final.orig/debian/dirs +++ gcvs-1.0final/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/share/doc/gcvs +usr/share/pixmaps --- gcvs-1.0final.orig/debian/doc-base.package +++ gcvs-1.0final/debian/doc-base.package @@ -0,0 +1,15 @@ +Document: gcvs +Title: Gcvs Manual +Author: Alexandre Parenteau +Abstract: This manual describes what gcvs is + and how it can be used. +Section: Apps/Programming + +Format: debiandoc-sgml +Files: /usr/share/doc/gcvs/GuiDoc/cvsgui.sgml.gz + +Format: HTML +Index: /usr/share/doc/gcvs/GuiDoc/cvsgui.html +Files: /usr/share/doc/gcvs/GuiDoc/*.html + + --- gcvs-1.0final.orig/debian/docs +++ gcvs-1.0final/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- gcvs-1.0final.orig/debian/gcvs-32x32-ugly-but-policy.xpm +++ gcvs-1.0final/debian/gcvs-32x32-ugly-but-policy.xpm @@ -0,0 +1,54 @@ +/* XPM */ +static char *gcvs-32x32[] = { +/* columns rows colors chars-per-pixel */ +"32 32 16 1", +" c black", +". c #191919", +"X c gray20", +"o c #00007f", +"O c #007f7f", +"+ c #7f7f00", +"@ c gray50", +"# c cyan", +"$ c red", +"% c yellow", +"& c gray60", +"* c #b2b2b2", +"= c gray80", +"- c gray90", +"; c white", +": c None", +/* pixels */ +":::::::::::::::::::::::-::::::::", +":::::::::::::::::::::::=:*::::::", +":::::::::::::::::::::=:=:=:&::::", +"::::::::::::::::::::::&--:&:::::", +"::::::::::::;OO#-:::;&=#=*-*=:::", +"::::::::::::OO=*O:::::=*=*::::::", +":::::::::::=OOOOO-:--:-*#*-&-:::", +":::::#OO:::-O##OO;:::;-*=:=:::::", +":::::OO=O:::OOOOO:::-::=:::;::::", +":::::OO#O::::--:::::::::::::::::", +":::::OOO;:::::::::::::::::::::::", +"::::::::::::::::::::::::::::::::", +":::::::::::::::::::::::::::%%%::", +"::&#*::::::%%%%%::::::::%%%%%%::", +"::OOO:::%%%%%%%%%%%%:::%%%%%%%::", +":::*:::%%%%%%%%%%%%%%:%%%%%%%:::", +"::::::%%%%%%%%%%%%%%%%%%%%%%%:::", +":::::%+OO@%%%%%%%%%%%%%%%%%%::::", +"::::%%O&OO%%%%%%%%%%%%%%%%%:::::", +"::::%%&OOO%%%%%%%%%%%%%%%:::::::", +"::::%%%+&%%%%%%%%%%%%%%%%%::::::", +"::::%%%%%%%%%%%%%%%%%%%%%%%:::::", +"::::%%%%%%%%%%%%%%%%%%%%%%%%::::", +"::::%%%%%%%%%%%%%%%%%%%%%%%%::::", +":::::=%*-=%%%%%%%%%%%%:%%%%%%:::", +"::::::%%%%%%%%%%%%%%%::%%%%%%:::", +"::::::::%%%%%%%%%%%::::::%%%%:::", +"::::::::::::::::::::::::::::::::", +"::::::::::::::::::::::::::::::::", +"::::::::::::::::::::::::::::::::", +"::::::::::::::::::::::::::::::::", +"::::::::::::::::::::::::::::::::" +}; --- gcvs-1.0final.orig/debian/gcvs-32x32.xpm +++ gcvs-1.0final/debian/gcvs-32x32.xpm @@ -0,0 +1,84 @@ +/* XPM */ +static char * gcvs_32x32_lovely_xpm[] = { +"32 32 49 1", +" c None", +". c #FFFFFF", +"+ c #101010", +"@ c #313131", +"# c #424242", +"$ c #636363", +"% c #737373", +"& c #848484", +"* c #BDBDBD", +"= c #CECECE", +"- c #EFEFEF", +"; c #FFEFCE", +"> c #FFD684", +", c #FFAD00", +"' c #FFCE63", +") c #FFC642", +"! c #FFB510", +"~ c #FFE7AD", +"{ c #FFD673", +"] c #DEA508", +"^ c #CEA518", +"/ c #9CA531", +"( c #849C42", +"_ c #739C5A", +": c #52946B", +"< c #429473", +"[ c #21948C", +"} c #4AB5BD", +"| c #1094A5", +"1 c #008C9C", +"2 c #9CD6DE", +"3 c #31A5B5", +"4 c #63BDCE", +"5 c #CEDEE7", +"6 c #8CADC6", +"7 c #BDCEDE", +"8 c #B5C6D6", +"9 c #9CB5CE", +"0 c #7394B5", +"a c #527BA5", +"b c #426B94", +"c c #316394", +"d c #6384AD", +"e c #849CBD", +"f c #104284", +"g c #ADB5CE", +"h c #00105A", +"i c #313973", +"j c #101863", +".......................-........", +".......................*.6......", +".....................*.8.=.0....", +"......................0-5.0.....", +"............-|1}5...-07226-*9...", +"............11241.....8g59......", +"...........21113|5.5-.5999-05...", +".....31|...-11111-...--68.g.....", +".....1|21...|111|...-..*...-....", +".....1111....55.................", +".....311-.......................", +"................................", +"...........................>))..", +"..}}4.....>!,,,)>.......;,,,,,..", +"..111...!,,,,,,,,,,~...',,,,,,..", +"...4..;,,,,,,,,,,,,,,.;,,,,,,{..", +".....;,,,,,,,,,,,,,,,,,,,,,,,...", +".....,^11_,,,,,,,,,,,,,,,,,,....", +"....,,13|1,,,,,,,,,,,,,,,,!.....", +"....,,(11[,,,,,,,,,,,,,,,;......", +"...~,,,^/,,,,,,,,,,,,,,,,,......", +"...;,,,,,,,,,,,,,,,,,,,,,,!.....", +"...;,,,,,,,,,,,,,,,,,,,,,,,!....", +"....',,,,,!,,,,,,,,,,,,,,,,,>...", +".....>))~>,,,,,,,,,,,!),,,,,,...", +"......~!,,,,,,,,,,,,-..~,,,,,...", +"........),,,,,,,,!;......!,,,...", +"................................", +"................................", +"................................", +"................................", +"................................"}; --- gcvs-1.0final.orig/debian/gcvs.1 +++ gcvs-1.0final/debian/gcvs.1 @@ -0,0 +1,51 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH GCVS 1 "October 19, 2001" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +gcvs \- Graphical cvs front-end +.SH SYNOPSIS +.B gcvs +.RI [ -root \ ] +.\".br +.\".B bar +.\".RI [ options ] " files" ... +.SH DESCRIPTION +This manual page briefly documents the +.B gcvs +command. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBgcvs\fP is a program that provides a advanced graphical front-end for +cvs using the gtk+ libraries. +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +.TP +.B \-\-root +Sets the default CVSROOT. +.SH SEE ALSO +.BR cvs (1), +.BR cvstree (1). +.br +.SH AUTHOR +This manual page was written by David Caldwell , +for the Debian GNU/Linux system (but may be used by others). --- gcvs-1.0final.orig/debian/gcvs.desktop +++ gcvs-1.0final/debian/gcvs.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=gcvs +GenericName= +Comment= +Icon=/usr/share/pixmaps/gcvs-32x32.xpm +Exec=/usr/bin/gcvs +Terminal=false +Categories=Programming --- gcvs-1.0final.orig/debian/gcvs.manpages +++ gcvs-1.0final/debian/gcvs.manpages @@ -0,0 +1 @@ +debian/gcvs.1 --- gcvs-1.0final.orig/debian/info +++ gcvs-1.0final/debian/info @@ -0,0 +1,14 @@ +cvsunix/doc/cvs.info +cvsunix/doc/cvsclient.info +cvsunix/doc/cvs.info-1 +cvsunix/doc/cvs.info-2 +cvsunix/doc/cvs.info-3 +cvsunix/doc/cvs.info-4 +cvsunix/doc/cvs.info-5 +cvsunix/doc/cvs.info-6 +cvsunix/doc/cvs.info-7 +cvsunix/doc/cvs.info-8 +cvsunix/doc/cvs.info-9 +cvsunix/doc/cvsclient.info-1 +cvsunix/doc/cvsclient.info-2 +cvsunix/doc/cvsclient.info-3 --- gcvs-1.0final.orig/debian/lintian-overrides +++ gcvs-1.0final/debian/lintian-overrides @@ -0,0 +1,71 @@ +gcvs: interpreter-not-absolute ./usr/share/gcvs/ChangeRoot.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/ChangeRoot.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/ChangeRoot.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/Cleanup.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/Cleanup.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/Cleanup.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/ColorTest.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/ColorTest.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/ColorTest.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/CvsAddAll.tcl #!cvsgui1.0 +gcvs: script-not-executable ./usr/share/gcvs/CvsAddAll.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/CvsAddAll.tcl #!cvsgui1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/FastModSearch.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/FastModSearch.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/FastModSearch.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/FolderTest.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/FolderTest.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/FolderTest.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/ListDeleted.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/ListDeleted.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/ListDeleted.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/ListLockedFiles.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/ListLockedFiles.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/ListLockedFiles.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/ListModules.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/ListModules.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/ListModules.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/ListNonCVS.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/ListNonCVS.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/ListNonCVS.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/ListStickyTags.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/ListStickyTags.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/ListStickyTags.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/QueryState.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/QueryState.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/QueryState.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/RevertChanges.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/RevertChanges.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/RevertChanges.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/SelectionTest.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/SelectionTest.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/SelectionTest.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/TclVersion.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/TclVersion.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/TclVersion.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/cvs2cl.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/cvs2cl.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/cvs2cl.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/ChangeRootTK.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/ChangeRootTK.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/ChangeRootTK.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/CvsAddAll.tcl #!CVSGUI1.0 +gcvs: unusual-interpreter ./usr/share/gcvs/CvsAddAll.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/EditSafely.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/EditSafely.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/EditSafely.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/ForceUpdate.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/ForceUpdate.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/ForceUpdate.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/PrepPatch.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/PrepPatch.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/PrepPatch.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/SetCurrentVersion.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/SetCurrentVersion.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/SetCurrentVersion.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/cvsignore_add.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/cvsignore_add.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/cvsignore_add.tcl #!CVSGUI1.0 +gcvs: interpreter-not-absolute ./usr/share/gcvs/cvsignore_remove.tcl #!CVSGUI1.0 +gcvs: script-not-executable ./usr/share/gcvs/cvsignore_remove.tcl +gcvs: unusual-interpreter ./usr/share/gcvs/cvsignore_remove.tcl #!CVSGUI1.0 --- gcvs-1.0final.orig/debian/menu +++ gcvs-1.0final/debian/menu @@ -0,0 +1,7 @@ +?package(gcvs): \ + needs="X11" \ + section="Apps/Programming" \ + title="gcvs" \ + command="/usr/bin/gcvs" \ + icon="/usr/share/pixmaps/gcvs-32x32.xpm" \ + description="gcvs is an advanced, easy to use graphical front-end for cvs." --- gcvs-1.0final.orig/debian/rules +++ gcvs-1.0final/debian/rules @@ -0,0 +1,120 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + --with-tclinclude=/usr/include/tcl8.4 --with-tcllib=/usr/lib/tcl8.4 + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + # We don't need to make the whole world--gcvs normally includes + # a whole distribution of command-line cvs... So here we just + # concentrate on making the gui part. + # cd common; $(MAKE) libcommon.a + # cd cvstree; $(MAKE) + # cd rf; $(MAKE) + # cd gcvs; $(MAKE) + # That sadly doesn't work because gcvs has custom versions of the command line + # cvs programs with new options. So we really need them. However, we can't have them + # overriding the standard cvs binaries so we stick them in /use/lib/gcvs. Then we + # have to tell gcvs to run the ones out of /usr/lib/gcvs instead of the normal ones, + # otherwise nothing will work. + # + # bindir is used to set the EXECLIB define, which UCvsApp.cpp uses to find + # the correct cvs executable. + $(MAKE) bindir=/usr/lib/gcvs/bin + #/usr/bin/docbook-to-man debian/gcvs.sgml > gcvs.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) distclean + rm -f cvsunix/windows-NT/SCC/Makefile + + dh_clean + +install: build short-circuit-install + +short-circuit-install: + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # $(MAKE) install prefix=$(CURDIR)/debian/gcvs/usr + # Oh if that would only work. But gcvs wants to install its custom version + # of the CVS binaries into bin. So I install each piece separately so I can + # fine tune where everything goes according to debain policy. Then I copy over + # the docs into share/doc/gcvs because the gcvs makefile doesn't install those. + # Then I install the lintian override file. + cd cvstree; $(MAKE) install prefix=$(CURDIR)/debian/gcvs/usr/lib/gcvs + cd cvsunix/src; $(MAKE) install prefix=$(CURDIR)/debian/gcvs/usr/lib/gcvs + cd gcvs; $(MAKE) install prefix=$(CURDIR)/debian/gcvs/usr + cd Macros; $(MAKE) install prefix=$(CURDIR)/debian/gcvs/usr + cp -r GuiDoc $(CURDIR)/debian/gcvs/usr/share/doc/gcvs + rm -f $(CURDIR)/debian/gcvs/usr/share/doc/gcvs/GuiDoc/.cvsignore + rm -f $(CURDIR)/debian/gcvs/usr/share/doc/gcvs/GuiDoc/Makefile* + rm -f $(CURDIR)/debian/gcvs/usr/lib/gcvs/bin/cvsbug + install --mode=644 -D debian/lintian-overrides $(CURDIR)/debian/gcvs/usr/share/lintian/overrides/gcvs + cp debian/gcvs-32x32.xpm $(CURDIR)/debian/gcvs/usr/share/pixmaps + cp debian/gcvs-32x32-ugly-but-policy.xpm $(CURDIR)/debian/gcvs/usr/share/pixmaps + install -d $(CURDIR)/debian/gcvs/usr/share/applications + install --mode=644 debian/gcvs.desktop $(CURDIR)/debian/gcvs/usr/share/applications + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install short-circuit-package + +short-circuit-package: + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs + dh_installexamples + dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit + dh_installcron + dh_installman +# Skip the info because, even though it has info pages, they are for straight command +# line cvs and will therefore conflict with the regular cvs package. They aren't +# applicable to gcvs. +# dh_installinfo +# dh_undocumented + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure short-circuit-install short-circuit-package --- gcvs-1.0final.orig/debian/watch +++ gcvs-1.0final/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://prdownloads.sourceforge.net/cvsgui/gcvs-(.*)\.tar\.gz --- gcvs-1.0final.orig/rf/uevent.cpp +++ gcvs-1.0final/rf/uevent.cpp @@ -375,7 +375,7 @@ (this->*mmf.pfnV_ii)(ULOWORD(arg1), UHIWORD(arg1)); break; case epV_iii: - (this->*mmf.pfnV_iii)(ULOWORD(arg1), UHIWORD(arg1), (int)arg2); + (this->*mmf.pfnV_iii)(ULOWORD(arg1), UHIWORD(arg1), (long)arg2); break; case epV_iiVP: (this->*mmf.pfnV_iiVP)(ULOWORD(arg1), UHIWORD(arg1), arg2); --- gcvs-1.0final.orig/rf/ustr.h +++ gcvs-1.0final/rf/ustr.h @@ -175,13 +175,13 @@ //! concatenate UStr & operator<<(int addToStr); //! concatenate - UStr & UStr::operator+=(int addToStr); + UStr & operator+=(int addToStr); //! concatenate - UStr & UStr::operator+=(char *addToStr); + UStr & operator+=(char *addToStr); //! concatenate - UStr & UStr::operator+=(const char *addToStr); + UStr & operator+=(const char *addToStr); //! concatenate - UStr & UStr::operator+=(const UStr & addToStr); + UStr & operator+=(const UStr & addToStr); //! compare inline int compare(const char *thestr) const { return strcmp(*this, thestr); } --- gcvs-1.0final.orig/rf/uwidget.cpp +++ gcvs-1.0final/rf/uwidget.cpp @@ -24,6 +24,7 @@ #include "config.h" #endif +#include #include #include "uwidget.h" @@ -231,23 +232,23 @@ static void gtkclicked(GtkButton *button, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((long)user_data); + int cmdid = UHIWORD((long)user_data); UEventSendMessage(widid, EV_CMD, cmdid, 0L); } static void gtkmenuitemactivate(GtkMenuItem *menuitem, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((long)user_data); + int cmdid = UHIWORD((long)user_data); UEventSendMessage(widid, EV_CMD, cmdid, 0L); } static void gtkselectclist(GtkWidget *clist, gint row, gint column, GdkEventButton *event, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((long)user_data); + int cmdid = UHIWORD((long)user_data); gchar *text; gtk_clist_get_text(GTK_CLIST(clist), row, column, &text); UEventSendMessage(widid, EV_LIST_SELECTING, UMAKEINT(cmdid, row), text); @@ -255,15 +256,15 @@ static void gtkselectclistcolumn(GtkCList *clist, gint column, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((long)user_data); + int cmdid = UHIWORD((long)user_data); UEventSendMessage(widid, EV_LIST_SELCOLUMN, UMAKEINT(cmdid, column), 0L); } static gint gtkclistdblclick(GtkWidget *widget, GdkEventButton *event, gpointer data) { - int widid = ULOWORD((int)data); - int cmdid = UHIWORD((int)data); + int widid = ULOWORD((long)data); + int cmdid = UHIWORD((long)data); if (event->type == GDK_2BUTTON_PRESS) { UEventSendMessage(widid, EV_LIST_DBLCLICK, cmdid, 0L); @@ -274,8 +275,8 @@ static void gtkcomboclicked(GtkWidget *widget, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((long)user_data); + int cmdid = UHIWORD((long)user_data); GtkList *list = GTK_LIST(widget->parent); GList *selection = list->selection; @@ -320,8 +321,8 @@ static void gtkmenuactivated(GtkWidget *widget, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((long)user_data); + int cmdid = UHIWORD((long)user_data); UStr selTxt; @@ -392,7 +393,7 @@ static void dataForeach(GQuark key_id, gpointer data, gpointer user_data) { const char *str = g_quark_to_string(key_id); - int id = (int)user_data; + int id = (long)user_data; int cmd; if(matchToken(str, cmd)) { @@ -514,32 +515,32 @@ static void gtktreeexpand(GtkWidget *item, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((long)user_data); + int cmdid = UHIWORD((long)user_data); g_assert(GTK_IS_TREE_ITEM(item)); UEventSendMessage(widid, EV_TREE_EXPANDING, UMAKEINT(cmdid, 0), item); } static void gtktreecollapse(GtkWidget *item, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((long)user_data); + int cmdid = UHIWORD((long)user_data); g_assert(GTK_IS_TREE_ITEM(item)); UEventSendMessage(widid, EV_TREE_EXPANDING, UMAKEINT(cmdid, 1), item); } static void gtktreeselect(GtkWidget *item, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((long)user_data); + int cmdid = UHIWORD((long)user_data); g_assert(GTK_IS_TREE_ITEM(item)); UEventSendMessage(widid, EV_TREE_SELECTING, UMAKEINT(cmdid, 0), item); } static void gtktreedeselect(GtkWidget *item, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((long)user_data); + int cmdid = UHIWORD((long)user_data); g_assert(GTK_IS_TREE_ITEM(item)); UEventSendMessage(widid, EV_TREE_SELECTING, UMAKEINT(cmdid, 1), item); } @@ -661,8 +662,8 @@ gint page_num, gpointer data) { - int widid = ULOWORD((int)data); - int cmdid = UHIWORD((int)data); + int widid = ULOWORD((long)data); + int cmdid = UHIWORD((long)data); UEventSendMessage(widid, EV_PAGE_CHANGED, UMAKEINT(cmdid, page_num), 0L); } @@ -682,8 +683,8 @@ static gint gtkexposeevent(GtkWidget *widget, GdkEvent *event, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((long)user_data); + int cmdid = UHIWORD((long)user_data); UEventSendMessage(widid, EV_CUSTOM_DRAW, cmdid, event); return TRUE;