Revision: 22873
http://sourceforge.net/p/gar/code/22873
Author: opk
Date: 2014-01-23 13:27:36 +0000 (Thu, 23 Jan 2014)
Log Message:
-----------
update meld to 1.8.3
Modified Paths:
--------------
csw/mgar/pkg/meld/trunk/Makefile
csw/mgar/pkg/meld/trunk/checksums
Modified: csw/mgar/pkg/meld/trunk/Makefile
===================================================================
--- csw/mgar/pkg/meld/trunk/Makefile 2014-01-23 12:02:47 UTC (rev 22872)
+++ csw/mgar/pkg/meld/trunk/Makefile 2014-01-23 13:27:36 UTC (rev 22873)
@@ -2,20 +2,29 @@
# TODO (release-critical prefixed with !, non release-critical with *)
#
NAME = meld
-VERSION = 1.5.4
+VERSION = 1.8.3
GARTYPE = v2
DESCRIPTION = Visual diff and merge tool
define BLURB
- Long description
+ Meld is a visual diff and merge tool targeted at developers. Meld
+ helps you compare files, directories and version controlled
+ projects. It provides tow- and three-way comparison of both files
+ and directories and has support for many popular version control
+ systems.
endef
-MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/meld/1.5/
+MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/meld/$(basename
$(VERSION))/
DISTFILES = $(DISTNAME).tar.xz
# PATCHFILES += 0001-Allow-to-use-a-different-install-utility.patch
PATCHFILES += 0001-Use-conditionals-for-installation-places.patch
+REINPLACEMENTS += python
+REINPLACE_MATCH_python = \#!.*python.*
+REINPLACE_WITH_python = \#!$(bindir)/python
+REINPLACE_FILES_python += bin/meld
+
CONFIGURE_SCRIPTS =
BUILD_SCRIPTS =
INSTALL_SCRIPTS = meld
@@ -24,21 +33,10 @@
EXTRA_MERGE_EXCLUDE_FILES = .*\.py[co]
ARCHALL_CSWmeld = 1
-RUNTIME_DEP_PKGS_CSWmeld += CSWpython
+RUNTIME_DEP_PKGS_CSWmeld += CSWpy-gtk CSWpy-gobject
-CHECKPKG_OVERRIDES_CSWmeld +=
file-with-bad-content|/usr/local|root/opt/csw/bin/meld
-CHECKPKG_OVERRIDES_CSWmeld +=
file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/meld/paths.py
-CHECKPKG_OVERRIDES_CSWmeld +=
file-with-bad-content|/usr/local|root/opt/csw/lib/meld/meld/paths.py
-CHECKPKG_OVERRIDES_CSWmeld +=
file-with-bad-content|/usr/local|root/opt/csw/share/omf/meld/meld-fr.omf
-CHECKPKG_OVERRIDES_CSWmeld +=
file-with-bad-content|/usr/local|root/opt/csw/share/omf/meld/meld-C.omf
-CHECKPKG_OVERRIDES_CSWmeld +=
file-with-bad-content|/usr/local|root/opt/csw/share/omf/meld/meld-es.omf
-CHECKPKG_OVERRIDES_CSWmeld +=
file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/scrollkeeper_docs
-CHECKPKG_OVERRIDES_CSWmeld +=
file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/fr/scrollkeeper_cl.xml
-CHECKPKG_OVERRIDES_CSWmeld +=
file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/fr/scrollkeeper_extended_cl.xml
-CHECKPKG_OVERRIDES_CSWmeld +=
file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/es/scrollkeeper_cl.xml
-CHECKPKG_OVERRIDES_CSWmeld +=
file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/es/scrollkeeper_extended_cl.xml
-CHECKPKG_OVERRIDES_CSWmeld +=
file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/C/scrollkeeper_extended_cl.xml
-CHECKPKG_OVERRIDES_CSWmeld +=
file-with-bad-content|/usr/local|root/var/opt/csw/lib/scrollkeeper/C/scrollkeeper_cl.xml
+CHECKPKG_OVERRIDES_CSWmeld += surplus-dependency|CSWpy-gobject
+CHECKPKG_OVERRIDES_CSWmeld += surplus-dependency|CSWpy-gtk
CHECKPKG_OVERRIDES_CSWmeld += pkgname-does-not-start-with-CSWpy-
CHECKPKG_OVERRIDES_CSWmeld += catalogname-does-not-start-with-py_
Modified: csw/mgar/pkg/meld/trunk/checksums
===================================================================
--- csw/mgar/pkg/meld/trunk/checksums 2014-01-23 12:02:47 UTC (rev 22872)
+++ csw/mgar/pkg/meld/trunk/checksums 2014-01-23 13:27:36 UTC (rev 22873)
@@ -1 +1 @@
-2f3929551d876ff45acf21b2c1e3e71a meld-1.5.4.tar.xz
+8254815c9358283e5e6a9d90f6846746 meld-1.8.3.tar.xz
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
