# HG changeset patch # User Rich Burridge # Date 1426540253 25200 # Node ID a5f5c603e46465f6c56167095a2f65468f444aae # Parent 0a32d1193656cfbd06aa73dc0bc323485ae29b78 20704082 meld should be updated to version 1.8.6 diff -r 0a32d1193656 -r a5f5c603e464 components/meld/Makefile --- a/components/meld/Makefile Mon Mar 16 14:03:12 2015 -0700 +++ b/components/meld/Makefile Mon Mar 16 14:10:53 2015 -0700 @@ -24,21 +24,24 @@ include ../../make-rules/shared-macros.mk COMPONENT_NAME= meld -COMPONENT_VERSION= 1.4.0 +COMPONENT_VERSION= 1.8.6 COMPONENT_PROJECT_URL= http://meld.sourceforge.net/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) -COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz COMPONENT_ARCHIVE_HASH= \ - sha256:429a0d0408464f623d25e351adc387ff4ed92813b8760d1c16700cb3180f9303 -COMPONENT_ARCHIVE_URL= http://ftp.gnome.org/pub/gnome/sources/meld/1.4/$(COMPONENT_ARCHIVE) + sha256:af96682b8f4bf3ad4221c853b1516218d62a17ff43c38f4a83e7e8ac6736e8a5 +COMPONENT_ARCHIVE_URL= http://ftp.gnome.org/pub/gnome/sources/meld/1.8/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/meld -TPNO= 16990 +TPNO= 21932 include $(WS_MAKE_RULES)/prep.mk include $(WS_MAKE_RULES)/justmake.mk include $(WS_MAKE_RULES)/ips.mk +# Needed to find the GNU version of install. +PATH = /usr/gnu/bin:/usr/bin + PYTHON_VERSION = 2.7 PKG_MACROS += PYVER=$(PYTHON_VERSION) diff -r 0a32d1193656 -r a5f5c603e464 components/meld/meld.p5m --- a/components/meld/meld.p5m Mon Mar 16 14:03:12 2015 -0700 +++ b/components/meld/meld.p5m Mon Mar 16 14:10:53 2015 -0700 @@ -41,53 +41,70 @@ file path=usr/bin/meld \ pkg.depend.runpath=/usr/lib/meld:/usr/lib/python$(PYVER):/usr/lib/python$(PYVER)/vendor-packages/gtk-2.0 \ pkg.depend.bypass-generate=.*/checker.* \ + pkg.depend.bypass-generate=.*/gobject.* \ pkg.depend.bypass-generate=.*/pychecker/__init__.* \ pkg.depend.bypass-generate=.*/pygtk.* file path=usr/lib/meld/meld/__init__.py +file path=usr/lib/meld/meld/dbus_service.py file path=usr/lib/meld/meld/diffmap.py file path=usr/lib/meld/meld/diffutil.py file path=usr/lib/meld/meld/dirdiff.py file path=usr/lib/meld/meld/filediff.py file path=usr/lib/meld/meld/filemerge.py +file path=usr/lib/meld/meld/filters.py +file path=usr/lib/meld/meld/linkmap.py file path=usr/lib/meld/meld/matchers.py file path=usr/lib/meld/meld/meldapp.py +file path=usr/lib/meld/meld/meldbuffer.py file path=usr/lib/meld/meld/melddoc.py +file path=usr/lib/meld/meld/meldwindow.py file path=usr/lib/meld/meld/merge.py file path=usr/lib/meld/meld/misc.py +file path=usr/lib/meld/meld/newdifftab.py +file path=usr/lib/meld/meld/patchdialog.py file path=usr/lib/meld/meld/paths.py file path=usr/lib/meld/meld/preferences.py +file path=usr/lib/meld/meld/recent.py file path=usr/lib/meld/meld/task.py +file path=usr/lib/meld/meld/test_matchers.py file path=usr/lib/meld/meld/tree.py file path=usr/lib/meld/meld/ui/__init__.py +file path=usr/lib/meld/meld/ui/emblemcellrenderer.py file path=usr/lib/meld/meld/ui/findbar.py +file path=usr/lib/meld/meld/ui/gladesupport.py file path=usr/lib/meld/meld/ui/gnomeglade.py file path=usr/lib/meld/meld/ui/historyentry.py +file path=usr/lib/meld/meld/ui/listwidget.py file path=usr/lib/meld/meld/ui/msgarea.py file path=usr/lib/meld/meld/ui/notebooklabel.py +file path=usr/lib/meld/meld/ui/statusbar.py +file path=usr/lib/meld/meld/ui/vcdialogs.py file path=usr/lib/meld/meld/ui/wraplabel.py file path=usr/lib/meld/meld/undo.py file path=usr/lib/meld/meld/util/__init__.py +file path=usr/lib/meld/meld/util/compat.py file path=usr/lib/meld/meld/util/prefs.py file path=usr/lib/meld/meld/util/sourceviewer.py file path=usr/lib/meld/meld/vc/__init__.py file path=usr/lib/meld/meld/vc/_null.py file path=usr/lib/meld/meld/vc/_vc.py file path=usr/lib/meld/meld/vc/bzr.py -file path=usr/lib/meld/meld/vc/cdv.py file path=usr/lib/meld/meld/vc/cvs.py file path=usr/lib/meld/meld/vc/darcs.py +file path=usr/lib/meld/meld/vc/fossil.py file path=usr/lib/meld/meld/vc/git.py file path=usr/lib/meld/meld/vc/mercurial.py file path=usr/lib/meld/meld/vc/monotone.py -file path=usr/lib/meld/meld/vc/rcs.py file path=usr/lib/meld/meld/vc/svk.py file path=usr/lib/meld/meld/vc/svn.py -file path=usr/lib/meld/meld/vc/tla.py +file path=usr/lib/meld/meld/vc/svn_17.py file path=usr/lib/meld/meld/vcview.py +file path=usr/share/appdata/meld.appdata.xml file path=usr/share/applications/meld.desktop file path=usr/share/gnome/help/meld/C/meld.xml file path=usr/share/gnome/help/meld/es/meld.xml file path=usr/share/gnome/help/meld/fr/meld.xml +file path=usr/share/icons/HighContrast/scalable/apps/meld.svg file path=usr/share/icons/hicolor/16x16/apps/meld.png file path=usr/share/icons/hicolor/22x22/apps/meld.png file path=usr/share/icons/hicolor/32x32/apps/meld.png @@ -96,17 +113,22 @@ file path=usr/share/locale/ar/LC_MESSAGES/meld.mo file path=usr/share/locale/bg/LC_MESSAGES/meld.mo file path=usr/share/locale/ca/LC_MESSAGES/meld.mo +file path=usr/share/locale/ca@valencia/LC_MESSAGES/meld.mo file path=usr/share/locale/cs/LC_MESSAGES/meld.mo +file path=usr/share/locale/da/LC_MESSAGES/meld.mo file path=usr/share/locale/de/LC_MESSAGES/meld.mo file path=usr/share/locale/dz/LC_MESSAGES/meld.mo file path=usr/share/locale/el/LC_MESSAGES/meld.mo file path=usr/share/locale/en_CA/LC_MESSAGES/meld.mo file path=usr/share/locale/en_GB/LC_MESSAGES/meld.mo +file path=usr/share/locale/eo/LC_MESSAGES/meld.mo file path=usr/share/locale/es/LC_MESSAGES/meld.mo +file path=usr/share/locale/eu/LC_MESSAGES/meld.mo file path=usr/share/locale/fi/LC_MESSAGES/meld.mo file path=usr/share/locale/fr/LC_MESSAGES/meld.mo file path=usr/share/locale/gl/LC_MESSAGES/meld.mo file path=usr/share/locale/hu/LC_MESSAGES/meld.mo +file path=usr/share/locale/id/LC_MESSAGES/meld.mo file path=usr/share/locale/it/LC_MESSAGES/meld.mo file path=usr/share/locale/ja/LC_MESSAGES/meld.mo file path=usr/share/locale/ko/LC_MESSAGES/meld.mo @@ -115,8 +137,10 @@ file path=usr/share/locale/nl/LC_MESSAGES/meld.mo file path=usr/share/locale/oc/LC_MESSAGES/meld.mo file path=usr/share/locale/pa/LC_MESSAGES/meld.mo +file path=usr/share/locale/pl/LC_MESSAGES/meld.mo file path=usr/share/locale/pt/LC_MESSAGES/meld.mo file path=usr/share/locale/pt_BR/LC_MESSAGES/meld.mo +file path=usr/share/locale/ro/LC_MESSAGES/meld.mo file path=usr/share/locale/ru/LC_MESSAGES/meld.mo file path=usr/share/locale/rw/LC_MESSAGES/meld.mo file path=usr/share/locale/sl/LC_MESSAGES/meld.mo @@ -128,44 +152,43 @@ file path=usr/share/locale/zh_CN/LC_MESSAGES/meld.mo file path=usr/share/locale/zh_TW/LC_MESSAGES/meld.mo file meld.1 path=usr/share/man/man1/meld.1 +file path=usr/share/meld/gtkrc file path=usr/share/meld/icons/button_apply0.xpm file path=usr/share/meld/icons/button_apply1.xpm file path=usr/share/meld/icons/button_copy0.xpm file path=usr/share/meld/icons/button_copy1.xpm file path=usr/share/meld/icons/button_delete.xpm +file path=usr/share/meld/icons/emblem-meld-newer-file.png file path=usr/share/meld/icons/filter-ignored-24.png file path=usr/share/meld/icons/filter-modified-24.png file path=usr/share/meld/icons/filter-nonvc-24.png file path=usr/share/meld/icons/filter-normal-24.png -file path=usr/share/meld/icons/icon.png -file path=usr/share/meld/icons/tree-file-changed.png -file path=usr/share/meld/icons/tree-file-missing.png -file path=usr/share/meld/icons/tree-file-new.png -file path=usr/share/meld/icons/tree-file-newer.png -file path=usr/share/meld/icons/tree-file-normal.png -file path=usr/share/meld/icons/tree-folder-changed.png -file path=usr/share/meld/icons/tree-folder-missing.png -file path=usr/share/meld/icons/tree-folder-new.png -file path=usr/share/meld/icons/tree-folder-normal.png +file path=usr/share/meld/icons/meld-locked.png +file path=usr/share/meld/icons/meld-unlocked.png +file path=usr/share/meld/icons/meld-vc-icon.png file path=usr/share/meld/icons/vc-add-24.png file path=usr/share/meld/icons/vc-checkout-24.png file path=usr/share/meld/icons/vc-commit-24.png file path=usr/share/meld/icons/vc-icon.png +file path=usr/share/meld/icons/vc-push-24.png file path=usr/share/meld/icons/vc-remove-24.png file path=usr/share/meld/icons/vc-resolve-24.png file path=usr/share/meld/icons/vc-update-24.png +file path=usr/share/meld/ui/EditableList.ui file path=usr/share/meld/ui/dirdiff-ui.xml -file path=usr/share/meld/ui/dirdiff.glade +file path=usr/share/meld/ui/dirdiff.ui file path=usr/share/meld/ui/filediff-ui.xml -file path=usr/share/meld/ui/filediff.glade -file path=usr/share/meld/ui/findbar.glade +file path=usr/share/meld/ui/filediff.ui +file path=usr/share/meld/ui/findbar.ui file path=usr/share/meld/ui/meldapp-ui.xml -file path=usr/share/meld/ui/meldapp.glade -file path=usr/share/meld/ui/preferences.glade +file path=usr/share/meld/ui/meldapp.ui +file path=usr/share/meld/ui/patch-dialog.ui +file path=usr/share/meld/ui/preferences.ui +file path=usr/share/meld/ui/tab-placeholder.ui file path=usr/share/meld/ui/vcview-ui.xml -file path=usr/share/meld/ui/vcview.glade +file path=usr/share/meld/ui/vcview.ui +file path=usr/share/mime/packages/meld.xml file path=usr/share/omf/meld/meld-C.omf file path=usr/share/omf/meld/meld-es.omf file path=usr/share/omf/meld/meld-fr.omf -file path=usr/share/pixmaps/meld.png license meld.license license=GPLv2 diff -r 0a32d1193656 -r a5f5c603e464 components/meld/patches/INSTALL.patch --- a/components/meld/patches/INSTALL.patch Mon Mar 16 14:03:12 2015 -0700 +++ b/components/meld/patches/INSTALL.patch Mon Mar 16 14:10:53 2015 -0700 @@ -1,11 +1,11 @@ This patch originated in-house but is not suitable for upstream. ---- meld-1.4.0/INSTALL.~1~ 2010-09-26 15:25:02.000000000 -0700 -+++ meld-1.4.0/INSTALL 2015-03-05 15:13:15.766057260 -0800 -@@ -17,8 +17,8 @@ - ## Now run "/usr/local/bin/meld" +--- meld-1.8.6/INSTALL.orig 2015-03-13 11:10:19.822910199 -0700 ++++ meld-1.8.6/INSTALL 2015-03-13 11:10:40.322859285 -0700 +@@ -33,8 +33,8 @@ ## - ## You can customise the install paths used here: + ## If you need to, you can customise the install paths used here: + ## -PYTHON ?= python -prefix := /usr/local +PYTHON ?= python2.7 diff -r 0a32d1193656 -r a5f5c603e464 components/meld/patches/Makefile.patch --- a/components/meld/patches/Makefile.patch Mon Mar 16 14:03:12 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ ---- meld-1.4.0/Makefile Sun Sep 26 15:25:02 2010 -+++ meld-1.4.0/new.Makefile Thu Apr 21 11:55:26 2011 -@@ -47,7 +47,6 @@ - $(DESTDIR)$(libdir_)/meld/vc \ - $(DESTDIR)$(sharedir_)/ui \ - $(DESTDIR)$(sharedir_)/icons \ -- $(DESTDIR)$(docdir_) \ - $(DESTDIR)$(sharedir)/applications \ - $(DESTDIR)$(sharedir)/pixmaps \ - $(DESTDIR)$(sharedir)/icons/hicolor/16x16/apps \ -@@ -56,43 +55,44 @@ - $(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps \ - $(DESTDIR)$(sharedir)/icons/hicolor/scalable/apps \ - $(DESTDIR)$(helpdir_) -- install -m 755 bin/meld.install \ -+# $(DESTDIR)$(docdir_) -+ ginstall -m 555 bin/meld.install \ - $(DESTDIR)$(bindir)/meld -- install -m 644 meld/*.py \ -+ ginstall -m 444 meld/*.py \ - $(DESTDIR)$(libdir_)/meld -- install -m 644 meld/ui/*.py \ -+ ginstall -m 444 meld/ui/*.py \ - $(DESTDIR)$(libdir_)/meld/ui -- install -m 644 meld/util/*.py \ -+ ginstall -m 444 meld/util/*.py \ - $(DESTDIR)$(libdir_)/meld/util -- install -m 644 meld/vc/*.py \ -+ ginstall -m 444 meld/vc/*.py \ - $(DESTDIR)$(libdir_)/meld/vc -- install -m 644 meld/paths.py.install \ -+ ginstall -m 444 meld/paths.py.install \ - $(DESTDIR)$(libdir_)/meld/paths.py -- install -m 644 data/meld.desktop \ -+ ginstall -m 444 data/meld.desktop \ - $(DESTDIR)$(sharedir)/applications - $(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 \ -+# $(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")' -+ ginstall -m 444 \ - data/ui/*.glade \ - $(DESTDIR)$(sharedir_)/ui -- install -m 644 \ -+ ginstall -m 444 \ - data/ui/*.xml \ - $(DESTDIR)$(sharedir_)/ui -- install -m 644 \ -+ ginstall -m 444 \ - data/icons/*.xpm \ - data/icons/*.png \ - $(DESTDIR)$(sharedir_)/icons -- install -m 644 data/icons/icon.png \ -+ ginstall -m 444 data/icons/icon.png \ - $(DESTDIR)$(sharedir)/pixmaps/meld.png -- install -m 644 data/icons/16x16/meld.png \ -+ ginstall -m 444 data/icons/16x16/meld.png \ - $(DESTDIR)$(sharedir)/icons/hicolor/16x16/apps/meld.png -- install -m 644 data/icons/22x22/meld.png \ -+ ginstall -m 444 data/icons/22x22/meld.png \ - $(DESTDIR)$(sharedir)/icons/hicolor/22x22/apps/meld.png -- install -m 644 data/icons/32x32/meld.png \ -+ ginstall -m 444 data/icons/32x32/meld.png \ - $(DESTDIR)$(sharedir)/icons/hicolor/32x32/apps/meld.png -- install -m 644 data/icons/48x48/meld.png \ -+ ginstall -m 444 data/icons/48x48/meld.png \ - $(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps/meld.png -- install -m 644 data/icons/48x48/meld.svg \ -+ ginstall -m 444 data/icons/48x48/meld.svg \ - $(DESTDIR)$(sharedir)/icons/hicolor/scalable/apps/meld.svg - $(MAKE) -C po install - $(MAKE) -C help install diff -r 0a32d1193656 -r a5f5c603e464 components/meld/patches/help-C-Makefile.patch --- a/components/meld/patches/help-C-Makefile.patch Mon Mar 16 14:03:12 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ ---- meld-1.4.0/help/C/Makefile Sun Sep 26 15:25:02 2010 -+++ meld-1.4.0/help/C/new.Makefile Thu Apr 21 11:06:37 2011 -@@ -2,12 +2,12 @@ - .SUFFIXES : - include ../../INSTALL - --LANG := $(notdir $(CURDIR)) --XML_DIR_ := $(DESTDIR)$(helpdir)/meld/$(LANG) --OMF_NAME := meld-$(LANG).omf -+XLANG := $(notdir $(CURDIR)) -+XML_DIR_ := $(DESTDIR)$(helpdir)/meld/$(XLANG) -+OMF_NAME := meld-$(XLANG).omf - OMF_DIR_ := $(DESTDIR)$(sharedir)/omf/meld - OMF_STATE:= $(DESTDIR)$(localstatedir)/lib/scrollkeeper --INST_XML := $(helpdir_)/$(LANG)/meld.xml -+INST_XML := $(helpdir_)/$(XLANG)/meld.xml - - .PHONY : all - all $(OMF_NAME).install : $(OMF_NAME) -@@ -16,8 +16,8 @@ - .PHONY : install - install : $(OMF_NAME).install - -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) -- install -m 644 meld.xml $(XML_DIR_)/meld.xml -- -install -m 644 $< $(OMF_DIR_)/$(OMF_NAME) -+ ginstall -m 444 meld.xml $(XML_DIR_)/meld.xml -+ -ginstall -m 444 $< $(OMF_DIR_)/$(OMF_NAME) - -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_) - - .PHONY : uninstall diff -r 0a32d1193656 -r a5f5c603e464 components/meld/patches/help-Makefile.patch --- a/components/meld/patches/help-Makefile.patch Mon Mar 16 14:03:12 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- meld-1.4.0/help/Makefile Sun Sep 26 15:25:02 2010 -+++ meld-1.4.0/help/new.Makefile Thu Apr 21 11:16:12 2011 -@@ -1,7 +1,7 @@ - - .SUFFIXES : - --LANGUAGES := C de es fr -+LANGUAGES := C es fr - - .PHONY : all install uninstall clean - diff -r 0a32d1193656 -r a5f5c603e464 components/meld/patches/help-es-Makefile.patch --- a/components/meld/patches/help-es-Makefile.patch Mon Mar 16 14:03:12 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ ---- meld-1.4.0/help/es/Makefile Sun Sep 26 15:25:02 2010 -+++ meld-1.4.0/help/es/new.Makefile Thu Apr 21 11:08:45 2011 -@@ -2,12 +2,12 @@ - .SUFFIXES : - include ../../INSTALL - --LANG := $(notdir $(CURDIR)) --XML_DIR_ := $(DESTDIR)$(helpdir)/meld/$(LANG) --OMF_NAME := meld-$(LANG).omf -+XLANG := $(notdir $(CURDIR)) -+XML_DIR_ := $(DESTDIR)$(helpdir)/meld/$(XLANG) -+OMF_NAME := meld-$(XLANG).omf - OMF_DIR_ := $(DESTDIR)$(sharedir)/omf/meld - OMF_STATE:= $(DESTDIR)$(localstatedir)/lib/scrollkeeper --INST_XML := $(helpdir_)/$(LANG)/meld.xml -+INST_XML := $(helpdir_)/$(XLANG)/meld.xml - - .PHONY : all - all $(OMF_NAME).install : $(OMF_NAME) -@@ -16,8 +16,8 @@ - .PHONY : install - install : $(OMF_NAME).install - -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) -- install -m 644 meld.$(LANG).xml $(XML_DIR_)/meld.xml -- -install -m 644 $< $(OMF_DIR_)/$(OMF_NAME) -+ ginstall -m 444 meld.$(XLANG).xml $(XML_DIR_)/meld.xml -+ -ginstall -m 444 $< $(OMF_DIR_)/$(OMF_NAME) - -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_) - - .PHONY : uninstall diff -r 0a32d1193656 -r a5f5c603e464 components/meld/patches/help-fr-Makefile.patch --- a/components/meld/patches/help-fr-Makefile.patch Mon Mar 16 14:03:12 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ ---- meld-1.4.0/help/fr/Makefile Sun Sep 26 15:25:02 2010 -+++ meld-1.4.0/help/fr/new.Makefile Thu Apr 21 11:10:42 2011 -@@ -2,12 +2,12 @@ - .SUFFIXES : - include ../../INSTALL - --LANG := $(notdir $(CURDIR)) --XML_DIR_ := $(DESTDIR)$(helpdir)/meld/$(LANG) --OMF_NAME := meld-$(LANG).omf -+XLANG := $(notdir $(CURDIR)) -+XML_DIR_ := $(DESTDIR)$(helpdir)/meld/$(XLANG) -+OMF_NAME := meld-$(XLANG).omf - OMF_DIR_ := $(DESTDIR)$(sharedir)/omf/meld - OMF_STATE:= $(DESTDIR)$(localstatedir)/lib/scrollkeeper --INST_XML := $(helpdir_)/$(LANG)/meld.xml -+INST_XML := $(helpdir_)/$(XLANG)/meld.xml - - .PHONY : all - all $(OMF_NAME).install : $(OMF_NAME) -@@ -16,8 +16,8 @@ - .PHONY : install - install : $(OMF_NAME).install - -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) -- install -m 644 meld.$(LANG).xml $(XML_DIR_)/meld.xml -- -install -m 644 $< $(OMF_DIR_)/$(OMF_NAME) -+ ginstall -m 444 meld.$(XLANG).xml $(XML_DIR_)/meld.xml -+ -ginstall -m 444 $< $(OMF_DIR_)/$(OMF_NAME) - -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_) - - .PHONY : uninstall diff -r 0a32d1193656 -r a5f5c603e464 components/meld/patches/meld.es.xml.patch --- a/components/meld/patches/meld.es.xml.patch Mon Mar 16 14:03:12 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ ---- meld-1.4.0/help/es/meld.es.xml Sun Sep 26 15:25:02 2010 -+++ meld-1.4.0/help/es/new.meld.es.xml Thu Apr 21 10:57:46 2011 -@@ -1,6 +1,6 @@ - - -- -+ - Manual del usuario de Meld - - diff -r 0a32d1193656 -r a5f5c603e464 components/meld/patches/meld.fr.xml.patch --- a/components/meld/patches/meld.fr.xml.patch Mon Mar 16 14:03:12 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ ---- meld-1.4.0/help/fr/meld.fr.xml Sun Sep 26 15:25:02 2010 -+++ meld-1.4.0/help/fr/new.meld.fr.xml Thu Apr 21 11:02:39 2011 -@@ -1,6 +1,6 @@ - - -- -+ - Manuel d'utilisation de Meld - - diff -r 0a32d1193656 -r a5f5c603e464 components/meld/patches/meld.patch --- a/components/meld/patches/meld.patch Mon Mar 16 14:03:12 2015 -0700 +++ b/components/meld/patches/meld.patch Mon Mar 16 14:10:53 2015 -0700 @@ -1,7 +1,7 @@ This patch originated in-house but is not suitable for upstream. ---- meld-1.4.0/bin/meld Sun Sep 26 15:25:02 2010 -+++ meld-1.4.0/bin/new.meld Mon May 2 12:00:56 2011 +--- meld-1.8.6/bin/meld.orig 2015-03-13 11:51:14.350881777 -0700 ++++ meld-1.8.6/bin/meld 2015-03-13 11:51:32.147493127 -0700 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python2.7 diff -r 0a32d1193656 -r a5f5c603e464 components/meld/patches/meld.xml.patch --- a/components/meld/patches/meld.xml.patch Mon Mar 16 14:03:12 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- meld-1.4.0/help/C/meld.xml Sun Sep 26 15:25:02 2010 -+++ meld-1.4.0/help/C/new.meld.xml Thu Apr 21 11:01:06 2011 -@@ -1,7 +1,7 @@ - - -- -+ - Meld Users Manual - - diff -r 0a32d1193656 -r a5f5c603e464 components/meld/patches/po-Makefile.patch --- a/components/meld/patches/po-Makefile.patch Mon Mar 16 14:03:12 2015 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ ---- meld-1.4.0/po/Makefile Sun Sep 26 15:25:02 2010 -+++ meld-1.4.0/po/new.Makefile Thu Apr 21 11:14:21 2011 -@@ -30,8 +30,8 @@ - # intltool-update $* - - $(DESTDIR)$(localedir)/%/LC_MESSAGES/meld.mo : %/LC_MESSAGES/meld.mo -- mkdir -m 755 -p $(dir $@) && install -m 644 $< $@ -+ mkdir -m 755 -p $(dir $@) && ginstall -m 444 $< $@ - - %/LC_MESSAGES/meld.mo : %.po -- mkdir -m 755 -p $(dir $@) && msgfmt -c -o $@ $< -+ mkdir -m 755 -p $(dir $@) && msgfmt -o $@ $< -