Date: Tue, 2 Dec 2008 18:40:57 +0300 (MSK) From: Eygene Ryabinkin <rea-fbsd@codelabs.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/129371: [patch] textproc/meld: update to 1.2.1 Message-ID: <20081202154057.D16F11AF41E@void.codelabs.ru> Resent-Message-ID: <200812021550.mB2Fo15C094024@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 129371 >Category: ports >Synopsis: [patch] textproc/meld: update to 1.2.1 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Dec 02 15:50:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Eygene Ryabinkin >Release: FreeBSD 7.1-PRERELEASE i386 >Organization: Code Labs >Environment: System: FreeBSD 7.1-PRERELEASE i386 >Description: Meld 1.2.1 is out: http://ftp.gnome.org/pub/gnome/sources/meld/1.2/ Many small fixes, added Git support, French translation, 4 new localizations. >How-To-Repeat: http://ftp.gnome.org/pub/gnome/sources/meld/1.2/ >Fix: The following patch updates the port to 1.2.1. I was tested it -- works for me like a charm. --- 1.1.5.1-to-1.2.1.diff begins here --- >From e88ecd37f5cdd31ddb68eb4c52b3d2abe1d71741 Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin <rea-fbsd@codelabs.ru> Date: Tue, 2 Dec 2008 18:34:55 +0300 Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru> --- textproc/meld/Makefile | 5 ++--- textproc/meld/distinfo | 6 +++--- textproc/meld/pkg-plist | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile index 9b0fa02..9c3806f 100644 --- a/textproc/meld/Makefile +++ b/textproc/meld/Makefile @@ -6,11 +6,10 @@ # PORTNAME= meld -PORTVERSION= 1.1.5.1 -PORTREVISION= 2 +PORTVERSION= 1.2.1 CATEGORIES= textproc devel python MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R:R} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} MAINTAINER= ports@FreeBSD.org COMMENT= GNOME 2 visual diff and merge tool diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo index 9393003..ad0f402 100644 --- a/textproc/meld/distinfo +++ b/textproc/meld/distinfo @@ -1,3 +1,3 @@ -MD5 (meld-1.1.5.1.tar.bz2) = d7366b958f9897f22eb867726b217b5a -SHA256 (meld-1.1.5.1.tar.bz2) = 6d415c68670474e2800994bbf4162fa438fca1b1332cc34052d4cb9b8a51bc38 -SIZE (meld-1.1.5.1.tar.bz2) = 602859 +MD5 (meld-1.2.1.tar.bz2) = 78f6084b14ee5334cf3578e62383b341 +SHA256 (meld-1.2.1.tar.bz2) = 8ed7834a40fa10aaea33981bcc8f9862afd073461a258fe008e16b6b0c156394 +SIZE (meld-1.2.1.tar.bz2) = 699861 diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist index e4ab870..d4da349 100644 --- a/textproc/meld/pkg-plist +++ b/textproc/meld/pkg-plist @@ -53,6 +53,9 @@ lib/meld/vc/cvs.pyo lib/meld/vc/darcs.py lib/meld/vc/darcs.pyc lib/meld/vc/darcs.pyo +lib/meld/vc/git.py +lib/meld/vc/git.pyc +lib/meld/vc/git.pyo lib/meld/vc/mercurial.py lib/meld/vc/mercurial.pyc lib/meld/vc/mercurial.pyo @@ -76,8 +79,12 @@ share/gnome/help/meld/C/meld.xml share/gnome/help/meld/es/figures/dirdiff.png share/gnome/help/meld/es/figures/filediff.png share/gnome/help/meld/es/meld.xml +share/gnome/help/meld/fr/figures/dirdiff.png +share/gnome/help/meld/fr/figures/filediff.png +share/gnome/help/meld/fr/meld.xml share/omf/meld/meld-C.omf share/omf/meld/meld-es.omf +share/omf/meld/meld-fr.omf share/pixmaps/meld.png share/locale/ar/LC_MESSAGES/meld.mo share/locale/bg/LC_MESSAGES/meld.mo @@ -85,6 +92,7 @@ share/locale/ca/LC_MESSAGES/meld.mo share/locale/cs/LC_MESSAGES/meld.mo share/locale/de/LC_MESSAGES/meld.mo share/locale/dz/LC_MESSAGES/meld.mo +share/locale/el/LC_MESSAGES/meld.mo share/locale/en_CA/LC_MESSAGES/meld.mo share/locale/en_GB/LC_MESSAGES/meld.mo share/locale/es/LC_MESSAGES/meld.mo @@ -94,13 +102,16 @@ share/locale/hu/LC_MESSAGES/meld.mo share/locale/it/LC_MESSAGES/meld.mo share/locale/ja/LC_MESSAGES/meld.mo share/locale/ko/LC_MESSAGES/meld.mo +share/locale/nb/LC_MESSAGES/meld.mo share/locale/ne/LC_MESSAGES/meld.mo share/locale/nl/LC_MESSAGES/meld.mo +share/locale/oc/LC_MESSAGES/meld.mo share/locale/pa/LC_MESSAGES/meld.mo share/locale/pt/LC_MESSAGES/meld.mo share/locale/pt_BR/LC_MESSAGES/meld.mo share/locale/ru/LC_MESSAGES/meld.mo share/locale/rw/LC_MESSAGES/meld.mo +share/locale/sq/LC_MESSAGES/meld.mo share/locale/sr/LC_MESSAGES/meld.mo share/locale/sr@Latn/LC_MESSAGES/meld.mo share/locale/sv/LC_MESSAGES/meld.mo @@ -108,8 +119,11 @@ share/locale/vi/LC_MESSAGES/meld.mo share/locale/zh_CN/LC_MESSAGES/meld.mo share/locale/zh_TW/LC_MESSAGES/meld.mo %%DATADIR%%/glade2/dirdiff.glade +%%DATADIR%%/glade2/dirdiff-ui.xml +%%DATADIR%%/glade2/filediff-ui.xml %%DATADIR%%/glade2/filediff.glade %%DATADIR%%/glade2/meldapp.glade +%%DATADIR%%/glade2/meldapp-ui.xml %%DATADIR%%/glade2/pixmaps/button_apply0.xpm %%DATADIR%%/glade2/pixmaps/button_apply1.xpm %%DATADIR%%/glade2/pixmaps/button_copy0.xpm @@ -139,12 +153,15 @@ share/locale/zh_TW/LC_MESSAGES/meld.mo %%DATADIR%%/glade2/pixmaps/vc-remove-24.png %%DATADIR%%/glade2/pixmaps/vc-update-24.png %%DATADIR%%/glade2/vcview.glade +%%DATADIR%%/glade2/vcview-ui.xml @dirrm %%DATADIR%%/glade2/pixmaps @dirrm %%DATADIR%%/glade2 @dirrm %%DATADIR%% @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw @dirrm share/omf/meld +@dirrm share/gnome/help/meld/fr/figures +@dirrm share/gnome/help/meld/fr @dirrm share/gnome/help/meld/es/figures @dirrm share/gnome/help/meld/es @dirrm share/gnome/help/meld/C/figures -- 1.6.0.4 --- 1.1.5.1-to-1.2.1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20081202154057.D16F11AF41E>