From: Damir Dzeko Date: Tue, 14 Mar 2006 20:23:53 +0000 (+0000) Subject: r99: minor version update X-Git-Tag: debian/3.0.0~17 X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=64e2d2cffac17873e3dc3e342edf87344d5552b3;p=carnet-upgrade.git r99: minor version update --- diff --git a/changelog.CARNet b/changelog.CARNet index 55cbd84..2b8e94f 100644 --- a/changelog.CARNet +++ b/changelog.CARNet @@ -1,10 +1,10 @@ -carnet-tools-cn (2.5.2) sarge; urgency=low +carnet-tools-cn (2.6) sarge; urgency=low * cp-update: ispravljen propust u sigurnosnoj provjeri prilikom generiranja prazne datoteke nakon brisanja bloka koji je predstavljao jedini sadrzaj datoteke - -- Damir Dzeko Tue, 07 Mar 2006 22:35:37 +0100 + -- Damir Dzeko Mon, 13 Mar 2006 07:18:56 +0100 carnet-tools-cn (2.5.1) sarge; urgency=low diff --git a/cp-update b/cp-update index 4ae4213..01bfe48 100755 --- a/cp-update +++ b/cp-update @@ -35,7 +35,7 @@ sub DEBUG () { 0 }; # my ($ProgramName, $UsageLong, $UsageShort, $VERSION); -$VERSION = '2.0'; +$VERSION = '2.1'; # Looks nicer without the slashes and dots ($ProgramName = $0) =~ s!.*/!!; # strip dir diff --git a/cp-update.1 b/cp-update.1 index cd6dc2b..b8cd11b 100644 --- a/cp-update.1 +++ b/cp-update.1 @@ -1,5 +1,5 @@ .\" Copied from from Pod::Man template -.\" Wed, 23 Mar 2005 11:51:08 +0100 +.\" Wed, 14 Mar 2006 21:15:00 +0100 .\" .\" Standard preamble: .\" ====================================================================== @@ -38,7 +38,7 @@ .if n .na .\" .IX Title "cp-update 1" -.TH cp-update 1 "March 2005" CARNet "CARNet Packaging Tools" +.TH cp-update 1 "March 2006" CARNet "CARNet Packaging Tools" .SH NAME cp-update \- versatile line-based file updating tool .\" @@ -81,15 +81,15 @@ block marking and file handling. Remove entry \fIpackage\fR from \fIfile\fR. Default is to add lines from stdin. .TP +\fB\-x\fR | \fB\-\-change\fR +Modify existing block, or add it if it does not exist but the begin +mark can be found. Does basically the same as regular insert without +\-\-allow\-multiple but on other way (in-place). Thus those two options +are mutually exclusive. +.TP \fB\-m\fR | \fB\-\-allow\-multiple\fR Allow multiple blocks of the same type. By default, old blocks are replaced with the new one. -.TP -\fB\-h\fR | \fB\-\-help\fR -Print usage reference and exit. -.TP - \fB\-\-version\fR -Print title, version, copyright message, and exit. .SS Placement control .TP \fB\-t\fR | \fB\-\-insert\-on\-top\fR @@ -139,6 +139,13 @@ anew and replaces the old by renaming it to target name. \fB\-n\fR | \fB\-\-no\-close\fR Do not close and reopen file when editing it in place. Slightly optimized version of the above. +.SS Support modes +.TP +\fB\-h\fR | \fB\-\-help\fR +Print usage reference and exit. +.TP + \fB\-\-version\fR +Print title, version, copyright message, and exit. .\" .SH "EXIT STATUS" Upon successful execution of given operation, program returns