[Lunar-commits] <moonbase> meld: some tweaks.
Florin Braescu
florin at lunar-linux.org
Sun Apr 11 18:51:48 CEST 2010
commit dcdcb05a920b999ade0065c51720786e2bc14135
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sun Apr 11 19:51:48 2010 +0300
meld: some tweaks.
---
gnome2/apps/meld/BUILD | 4 ++--
gnome2/apps/meld/DEPENDS | 1 +
gnome2/apps/meld/DETAILS | 13 +++++++------
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/gnome2/apps/meld/BUILD b/gnome2/apps/meld/BUILD
index 8bad58e..389055b 100644
--- a/gnome2/apps/meld/BUILD
+++ b/gnome2/apps/meld/BUILD
@@ -3,8 +3,8 @@
# prevent an error with the latest gettext
sedit 's:msgfmt -c:msgfmt:' po/GNUmakefile &&
- make prefix=/usr &&
- prepare_install &&
+ make prefix=/usr &&
+ prepare_install &&
make prefix=/usr install
) > $C_FIFO 2>&1
diff --git a/gnome2/apps/meld/DEPENDS b/gnome2/apps/meld/DEPENDS
index 79257b7..d44ab91 100644
--- a/gnome2/apps/meld/DEPENDS
+++ b/gnome2/apps/meld/DEPENDS
@@ -1,3 +1,4 @@
depends gnome-python
depends libgnomeui
+
optional_depends "pygtksourceview" "" "" "For syntax highlighting"
diff --git a/gnome2/apps/meld/DETAILS b/gnome2/apps/meld/DETAILS
index 52a994f..639de2d 100644
--- a/gnome2/apps/meld/DETAILS
+++ b/gnome2/apps/meld/DETAILS
@@ -1,18 +1,19 @@
MODULE=meld
- VERSION=1.3.1
+ MAJOR=13
+ VERSION=$MAJOR.1
SOURCE=$MODULE-$VERSION.tar.bz2
- SOURCE_URL=$GNOME_URL/sources/$MODULE/1.3/
+ SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR
SOURCE_VFY=sha1:d3ab96a364b73afdfd9f26cc9bec18321f04c9df
WEB_SITE=http://meld.sourceforge.net
ENTERED=20021119
UPDATED=20090814
- SHORT="a visual diff and merge tool"
+ SHORT="A visual diff and merge tool"
cat << EOF
-Meld is a visual diff and merge tool. It integrates especially well
-with CVS. The diff viewer lets you edit files in place (diffs update
+Meld is a visual diff and merge tool. It integrates especially well
+with CVS. The diff viewer lets you edit files in place (diffs update
dynamically), and a middle column shows detailed changes and allows
-merges. The margins show location of changes for easy navigation, and
+merges. The margins show location of changes for easy navigation, and
it also features a tabbed interface that allows you to open many diffs
at once.
EOF
More information about the Lunar-commits
mailing list