diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-05-30 12:33:26 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-05-30 12:33:26 +0200 |
| commit | 5a31840a564ab702e9223abd63f281deaaabeb31 (patch) | |
| tree | ce913e0698d31b507c748a48ef7cb584ed08c16a /ubuntu/maverick/applications/kdiff3 | |
| parent | 9814f425f0dae6fa0fb869ef038495df9dd0e588 (diff) | |
| parent | 650aae664769307d2d65098402dfa959b0d4c829 (diff) | |
| download | tde-packaging-5a31840a564ab702e9223abd63f281deaaabeb31.tar.gz tde-packaging-5a31840a564ab702e9223abd63f281deaaabeb31.zip | |
merge
Diffstat (limited to 'ubuntu/maverick/applications/kdiff3')
| -rw-r--r-- | ubuntu/maverick/applications/kdiff3/debian/cdbs/versions.pl | 8 | ||||
| -rw-r--r-- | ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.sgml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ubuntu/maverick/applications/kdiff3/debian/cdbs/versions.pl b/ubuntu/maverick/applications/kdiff3/debian/cdbs/versions.pl index 75c9add4b..1b110f7af 100644 --- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/versions.pl +++ b/ubuntu/maverick/applications/kdiff3/debian/cdbs/versions.pl @@ -13,7 +13,7 @@ my ($version2, $version2_next); ($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e; ($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e; -print "KDE-Version3=$version3\n"; -print "KDE-Version2=$version2\n"; -print "KDE-Next-Version3=$version3_next\n"; -print "KDE-Next-Version2=$version2_next\n"; +print "TDE-Version3=$version3\n"; +print "TDE-Version2=$version2\n"; +print "TDE-Next-Version3=$version3_next\n"; +print "TDE-Next-Version2=$version2_next\n"; diff --git a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.sgml b/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.sgml index 6eaa4064f..eaf1d947e 100644 --- a/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.sgml +++ b/ubuntu/maverick/applications/kdiff3/debian/kdiff3-trinity.sgml @@ -64,7 +64,7 @@ manpage.1: manpage.sgml <command>&dhpackage;</command> <arg><option>QT options</option></arg> - <arg><option>KDE options</option></arg> + <arg><option>TDE options</option></arg> <arg><option>KDiff3 options</option></arg> <arg><option><replaceable>File1/base</replaceable></option></arg> <arg><option><replaceable>File2</replaceable></option></arg> @@ -90,7 +90,7 @@ manpage.1: manpage.sgml <ListItem><para>provides an automatic merge-facility and</para></ListItem> <ListItem><para>an integrated editor for comfortable solving of merge-conflicts</para></ListItem> <ListItem><para>supports Unicode, UTF-8 and other codecs</para></ListItem> - <ListItem><para>supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.)</para></ListItem> + <ListItem><para>supports TDEIO on TDE (allows accessing ftp, sftp, fish, smb etc.)</para></ListItem> <ListItem><para>Printing of differences</para></ListItem> <ListItem><para>Manual alignment of lines</para></ListItem> <ListItem><para>Automatic merging of version control history ($Log$)</para></ListItem> |