Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=21db283595be9faf1faea090098b2021f518556b
commit 21db283595be9faf1faea090098b2021f518556b Author: Devil505 <devil505li...@gmail.com> Date: Sun Jul 11 09:54:29 2010 +0200 meld-1.3.2-1-i686 * version bump * removing useless patches diff --git a/source/gnome-extra/meld/FrugalBuild b/source/gnome-extra/meld/FrugalBuild index e8633bb..772fa2d 100644 --- a/source/gnome-extra/meld/FrugalBuild +++ b/source/gnome-extra/meld/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: AlexExtreme <a...@alex-smith.me.uk> pkgname=meld -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc="a visual diff and merge tool" url="http://meld.sourceforge.net/"; @@ -12,21 +12,18 @@ makedepends=('rarian' 'intltool') _F_gnome_desktop="y" _F_gnome_devel="y" _F_gnome_scrollkeeper="y" +_F_gnome_iconcache="y" Finclude gnome gnome-scriptlet -source=(${sour...@]} $pkgname-makefile_fixes.diff \ - http://ftp.frugalware.org/pub/other/sources/$pkgname/meld-scrollkeeper-strip.patch) groups=('gnome-extra') archs=('i686' 'x86_64') -sha1sums=('d3ab96a364b73afdfd9f26cc9bec18321f04c9df' \ - 'b6ec4f7e77e420a962e17dafa61bc7d214949e3c' \ - '3e22a6e2fc0fda1be9124bb93a436ed68b961599') +sha1sums=('1cb5174385365127d5b2e02343c73fc01c8a89ef') build() { Fcd Fpatchall Fbuild_slice_scrollkeeper Fsed "prefix := /usr/local" "prefix := /usr" INSTALL - Fsed "\(.*python.*compile.*\)" "#\1" GNUmakefile +# Fsed "\(.*python.*compile.*\)" "#\1" GNUmakefile Fmake Fmakeinstall Fbuild_gnome_scriptlet diff --git a/source/gnome-extra/meld/meld-makefile_fixes.diff b/source/gnome-extra/meld/meld-makefile_fixes.diff deleted file mode 100644 index ecd3ca6..0000000 --- a/source/gnome-extra/meld/meld-makefile_fixes.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur meld-1.2/help/fr/GNUmakefile meld-1.2.new/help/fr/GNUmakefile ---- meld-1.2/help/fr/GNUmakefile 2008-04-01 02:14:53.000000000 +0530 -+++ meld-1.2.new/help/fr/GNUmakefile 2008-06-29 11:06:06.000000000 +0530 -@@ -17,7 +17,6 @@ - install : $(OMF_NAME).install - -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) $(XML_DIR_)/figures - install -m 644 meld.$(LANG).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_) - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
