From b055379d998dd5f2b90a162b995238de808328ea Mon Sep 17 00:00:00 2001 From: Michiel van Wessem Date: Mon, 11 Mar 2013 19:29:44 -0400 Subject: development/kdiff3: Updated for version 0.9.97. Signed-off-by: dsomero --- development/kdiff3/kdiff3.SlackBuild | 10 +++++----- development/kdiff3/kdiff3.info | 6 +++--- development/kdiff3/slack-desc | 22 +++++++++++----------- 3 files changed, 19 insertions(+), 19 deletions(-) (limited to 'development') diff --git a/development/kdiff3/kdiff3.SlackBuild b/development/kdiff3/kdiff3.SlackBuild index 0574e6c262..94783c197c 100644 --- a/development/kdiff3/kdiff3.SlackBuild +++ b/development/kdiff3/kdiff3.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=kdiff3 -VERSION=${VERSION:-0.9.96} +VERSION=${VERSION:-0.9.97} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,9 +57,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP +cd $TMP rm -rf $PRGNAM-$VERSION -tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz +tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -68,7 +68,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -mkdir build +mkdir build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ @@ -85,7 +85,7 @@ cd .. find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/development/kdiff3/kdiff3.info b/development/kdiff3/kdiff3.info index c080487153..a4c1f039f1 100644 --- a/development/kdiff3/kdiff3.info +++ b/development/kdiff3/kdiff3.info @@ -1,8 +1,8 @@ PRGNAM="kdiff3" -VERSION="0.9.96" +VERSION="0.9.97" HOMEPAGE="http://kdiff3.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/kdiff3/kdiff3-0.9.96.tar.gz" -MD5SUM="46b96befddf3448a3cb673f018c6f6f9" +DOWNLOAD="http://downloads.sourceforge.net/kdiff3/kdiff3-0.9.97.tar.gz" +MD5SUM="30a71b474956c369ed7b38c6db080fc4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/kdiff3/slack-desc b/development/kdiff3/slack-desc index 17ac3d3121..713ea8c8fe 100644 --- a/development/kdiff3/slack-desc +++ b/development/kdiff3/slack-desc @@ -1,19 +1,19 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| kdiff3: kdiff3 (A compare and merge tool for KDE) kdiff3: -kdiff3: KDiff3 is a file and directory diff and merge tool which compares and -kdiff3: merges two or three text input files or directories, shows the -kdiff3: differences line by line and character by character, provides an -kdiff3: automatic merge-facility, has an editor for comfortable solving of +kdiff3: KDiff3 is a file and directory diff and merge tool which compares and +kdiff3: merges two or three text input files or directories, shows the +kdiff3: differences line by line and character by character, provides an +kdiff3: automatic merge-facility, has an editor for comfortable solving of kdiff3: merge-conflicts, provides network transparency via KIO, has options to kdiff3: highlight or hide changes in whitespace or comments, supports Unicode, -kdiff3: UTF-8 and other file encodings, prints differences, supports version -kdiff3: control keyword and history merging +kdiff3: UTF-8 and other file encodings, prints differences, supports version +kdiff3: control keyword and history merging kdiff3: -- cgit v1.2.3