Update of /cvsroot/fink/experimental/michga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23499
Added Files:
meld.info meld.patch
Log Message:
New upstream version with python2.4
--- NEW FILE: meld.patch ---
diff -Nurd meld-1.1.3-orig/GNUmakefile meld-1.1.3/GNUmakefile
--- meld-1.1.3-orig/GNUmakefile 2006-01-29 01:17:28.000000000 +0100
+++ meld-1.1.3/GNUmakefile 2006-03-08 21:39:00.000000000 +0100
@@ -56,8 +56,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_)",10,"$(libdir_)")'
+ $(PYTHON) -O -c 'import compileall;
compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")'
install -m 644 \
glade2/*.glade \
$(DESTDIR)$(sharedir_)/glade2
diff -Nurd meld-1.1.3-orig/help/C/GNUmakefile meld-1.1.3/help/C/GNUmakefile
--- meld-1.1.3-orig/help/C/GNUmakefile 2006-01-28 22:43:57.000000000 +0100
+++ meld-1.1.3/help/C/GNUmakefile 2006-03-09 02:39:36.000000000 +0100
@@ -10,7 +10,7 @@
.PHONY : all
all $(OMF_NAME).install : $(OMF_NAME)
- scrollkeeper-preinstall $(INST_XML) $(OMF_NAME) $(OMF_NAME).install
+ scrollkeeper-preinstall $(XML_DIR_)/meld.xml $(OMF_NAME)
$(OMF_NAME).install
.PHONY : install
install : $(OMF_NAME).install
@@ -18,7 +18,6 @@
install -m 644 meld.xml $(XML_DIR_)/meld.xml
install -m 644 figures/*.png $(XML_DIR_)/figures
-install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
.PHONY : uninstall
uninstall :
@@ -27,7 +26,6 @@
$(XML_DIR_)/figures/*.png
-rmdir $(XML_DIR_)/figures \
$(XML_DIR_)
- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
.PHONY : clean
clean :
diff -Nurd meld-1.1.3-orig/help/GNUmakefile meld-1.1.3/help/GNUmakefile
--- meld-1.1.3-orig/help/GNUmakefile 2005-10-19 23:16:50.000000000 +0200
+++ meld-1.1.3/help/GNUmakefile 2006-03-08 10:03:16.000000000 +0100
@@ -1,7 +1,7 @@
.SUFFIXES :
-LANGUAGES := C
+LANGUAGES := C es
.PHONY : all install uninstall clean
diff -Nurd meld-1.1.3-orig/help/es/GNUmakefile meld-1.1.3/help/es/GNUmakefile
--- meld-1.1.3-orig/help/es/GNUmakefile 2006-01-28 22:44:02.000000000 +0100
+++ meld-1.1.3/help/es/GNUmakefile 2006-03-09 02:41:56.000000000 +0100
@@ -10,15 +10,14 @@
.PHONY : all
all $(OMF_NAME).install : $(OMF_NAME)
- scrollkeeper-preinstall $(INST_XML) $(OMF_NAME) $(OMF_NAME).install
+ scrollkeeper-preinstall $(XML_DIR_)/meld.xml $(OMF_NAME)
$(OMF_NAME).install
.PHONY : install
install : $(OMF_NAME).install
-mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) $(XML_DIR_)/figures
- install -m 644 meld.xml $(XML_DIR_)/meld.xml
+ install -m 644 meld.es.xml $(XML_DIR_)/meld.xml
install -m 644 figures/*.png $(XML_DIR_)/figures
-install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
.PHONY : uninstall
uninstall :
@@ -27,7 +26,6 @@
$(XML_DIR_)/figures/*.png
-rmdir $(XML_DIR_)/figures \
$(XML_DIR_)
- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
.PHONY : clean
clean :
--- NEW FILE: meld.info ---
Package: meld
Version: 1.1.3
Revision: 1
Description: Visual diff and merge tool
DescDetail: <<
Meld is a GNOME 2 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 it also features a tabbed interface that allows you to
open many diffs at once.
<<
DescPort: <<
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.
<<
DescPackaging: <<
The usual scrollkeeper install-time fix.
<<
Homepage: http://meld.sourceforge.net/
License: GPL
Maintainer: Daniel Macks <[EMAIL PROTECTED]>
Depends: x11, python24(>= 1:2.4.2-1005), gnome-python2-py24, pyorbit2-py24,
pygtk2-py24, scrollkeeper, desktop-file-utils, 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: b958f6b3b5b849607d952f49eb082cba
Patch: %n.patch
PatchScript: <<
perl -pi.bak -e 's|/usr/bin/env python|%p/bin/python2.4|' meld tools/*
<<
CompileScript: <<
PYTHON=%p/bin/python2.4 make prefix=%p
<<
InstallScript: <<
PYTHON=%p/bin/python2.4 make prefix=%p install DESTDIR=%d
<<
DocFileS: AUTHORS COPYING changelog
PostInstScript: <<
if [ configure = "$1" ]; then
scrollkeeper-update -q
fi
[ -x %p/bin/update-desktop-database ] && update-desktop-database -q || :
<<
PostRmScript: <<
if [ remove != "$1" ]; then
scrollkeeper-update -q
fi
[ -x %p/bin/update-desktop-database ] && update-desktop-database -q || :
<<
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
