[Lunar-commits] CVS: moonbase/gnome2-apps/meld BUILD, 1.4, 1.5 DETAILS, 1.6, 1.7

Nick Hudson nhudson at lunar-linux.org
Wed Apr 14 14:57:52 GMT 2004


Update of /var/cvs/lunar/moonbase/gnome2-apps/meld
In directory dbguin.lunar-linux.org:/tmp/cvs-serv1216/meld

Modified Files:
	BUILD DETAILS 
Log Message:

Finally meld works again!!!  Updating meld to new version 0.9.2.1 fixing BUILD file to compile and install correctly


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/gnome2-apps/meld/BUILD,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- BUILD	17 Dec 2003 05:02:16 -0000	1.4
+++ BUILD	14 Apr 2004 14:57:50 -0000	1.5
@@ -1,24 +1,4 @@
 ( 
-  INSTDIR=/usr/share/meld &&
-  BIN=/usr/bin/meld &&
-
-if ! [ -e "$INSTDIR" ]; then
-     mkdir -p $INSTDIR
-fi &&
-
-cd $SOURCE_DIRECTORY &&
-
-rm -fr $INSTDIR &&
-mkdir -p $INSTDIR &&
-
-prepare_install &&
-
-cp -R * /usr/share/meld &&
-
-cp $SCRIPT_DIRECTORY/meld /usr/bin &&
-
-chown -R root.root $INSTDIR &&
-chown -R root.root $BIN &&
-chown -R root.root $INSTDIR/meld
-
+  make prefix=/usr &&
+  make prefix=/usr install
 ) > $C_FIFO 2>&1

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/gnome2-apps/meld/DETAILS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DETAILS	14 Sep 2003 20:47:00 -0000	1.6
+++ DETAILS	14 Apr 2004 14:57:50 -0000	1.7
@@ -1,11 +1,11 @@
           MODULE=meld
-         VERSION=0.8.5
-          SOURCE=$MODULE-$VERSION.tgz
+         VERSION=0.9.2.1
+          SOURCE=$MODULE-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-   SOURCE_URL[0]=$SFORGE_URL/$MODULE/$SOURCE
+   SOURCE_URL[0]=$GNOME_URL/sources/$MODULE/0.9/$SOURCE
         WEB_SITE=meld.sourceforge.net
          ENTERED=20021119
-         UPDATED=20030914
+         UPDATED=20040414
            SHORT="Diff Generator for Gnome 2"
 cat << EOF
 Meld is a diff generator for the Gnome 2.x platform



More information about the Lunar-commits mailing list