Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20715/10.3/unstable/main/finkinfo/gnome
Modified Files: meld.info meld.patch Log Message: new version, now with python2.4 goodness Index: meld.patch =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/meld.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- meld.patch 14 Jul 2005 00:55:09 -0000 1.3 +++ meld.patch 10 Aug 2006 18:08:46 -0000 1.4 @@ -1,24 +1,14 @@ -diff -Nurd -x'*~' meld-0.9.6.orig/GNUmakefile meld-0.9.6/GNUmakefile ---- meld-0.9.6.orig/GNUmakefile 2005-02-18 15:36:37.000000000 -0500 -+++ meld-0.9.6/GNUmakefile 2005-06-24 07:59:20.000000000 -0400 -@@ -52,8 +52,8 @@ +diff -Nurd -x'*~' meld-1.1.4.orig/GNUmakefile meld-1.1.4/GNUmakefile +--- meld-1.1.4.orig/GNUmakefile 2006-06-10 15:52:38.000000000 -0400 ++++ meld-1.1.4/GNUmakefile 2006-08-10 14:00:35.000000000 -0400 +@@ -57,8 +57,8 @@ $(DESTDIR)$(sharedir)/application-registry/meld.applications install -m 644 meld.desktop \ $(DESTDIR)$(sharedir)/applications -- python -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)")' -- python -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)")' +- $(PYTHON) -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)")' +- $(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)")' + $(PYTHON) -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")' + $(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")' install -m 644 \ glade2/*.glade \ $(DESTDIR)$(sharedir_)/glade2 ---- meld-1.0.0.old/po/fr.po 2005-07-03 18:41:20.000000000 -0400 -+++ meld-1.0.0/po/fr.po 2005-07-03 18:40:45.000000000 -0400 -@@ -15,6 +15,7 @@ - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Generated-By: pygettext.py 1.5\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" - - #: ../meld.desktop.in.h:1 - msgid "Compare and merge your files." Index: meld.info =================================================================== RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/meld.info,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- meld.info 14 Jul 2005 00:55:08 -0000 1.6 +++ meld.info 10 Aug 2006 18:08:46 -0000 1.7 @@ -1,5 +1,5 @@ Package: meld -Version: 1.0.0 +Version: 1.1.4 Revision: 1 Description: Visual diff and merge tool DescDetail: << @@ -14,34 +14,27 @@ Patch the main script to use a specific python so that we make sure to have the one that has the needed python libraries and also to understand installation to tempdir %d not ultimate location. - -Patch target executable to use correct python interp. - -Critical po/fr.po patch: http://bugzilla.gnome.org/show_bug.cgi?id=309408 << DescPackaging: << The usual scrollkeeper install-time fix. - -Can't switch to python2.4 because gnome-python2-py24 -don't exist. << Homepage: http://meld.sourceforge.net/ License: GPL Maintainer: Daniel Macks <[EMAIL PROTECTED]> -Depends: x11, python23, gnome-python2-py23, pyorbit2-py23, pygtk2-py23, scrollkeeper -BuildDepends: x11-dev, pygtk2-py23-dev, gettext-bin, gettext-tools, intltool -Source: mirror:gnome:sources/%n/1.0/%n-%v.tar.bz2 -Source-MD5: ccde817f0396d39e9e40f31a3a7611f6 +Depends: x11, python24, gnome-python2-py24, pyorbit2-py24, pygtk2-py24, scrollkeeper +BuildDepends: x11-dev, pygtk2-py24-dev, gettext-bin, gettext-tools, intltool +Source: mirror:gnome:sources/%n/1.1/%n-%v.tar.bz2 +Source-MD5: e780a8f67183acf7f51b13aa4a62ac85 Patch: %n.patch PatchScript: << - perl -pi.bak -e 's|/usr/bin/env python|%p/bin/python2.3|' meld tools/* - perl -ni.bak -e 'print unless /scrollkeeper-install/' help/C/GNUmakefile + perl -pi -e 's|/usr/bin/env python|%p/bin/python2.4|' meld tools/* + perl -ni -e 'print unless /scrollkeeper-update/' help/C/GNUmakefile << CompileScript: << - PYTHON=%p/bin/python2.3 make prefix=%p + PYTHON=%p/bin/python2.4 make prefix=%p << InstallScript: << - PYTHON=%p/bin/python2.3 make prefix=%p install DESTDIR=%d + PYTHON=%p/bin/python2.4 make prefix=%p install DESTDIR=%d << DocFileS: AUTHORS COPYING changelog PostInstScript: << ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits