Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F10773537
D141.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
12 KB
Referenced Files
None
Subscribers
None
D141.id.diff
View Options
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : meld
version : 3.16.4
-release : 6
+release : 7
source :
- https://download.gnome.org/sources/meld/3.16/meld-3.16.4.tar.xz : 93c4f928319dae7484135ab292fe6ea4254123e8219549a66d3e2deba6a38e67
license : GPL-2.0
@@ -9,6 +9,7 @@
description: |
Meld is a visual diff and merge tool targeted at developers.
builddeps :
+ - pkgconfig(glib-2.0)
- pkgconfig(gtk+-3.0)
- pkgconfig(gtksourceview-3.0)
- pkgconfig(python-2.7)
@@ -22,7 +23,4 @@
- python-gobject
- python-dbus
install : |
- unset srcdir
- python2 setup.py install --root=%installroot% --no-compile -O0
- rm $installdir/usr/share/glib-2.0/schemas/gschemas.compiled
- rm $installdir/usr/share/icons/hicolor/icon-theme.cache
+ python setup.py --no-compile-schemas --no-update-icon-cache install --root=%installroot%
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>meld</Name>
<Packager>
- <Name>Michael Meinertzhagen</Name>
- <Email>mmeinert@protonmail.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Packager>
<License>GPL-2.0</License>
<PartOf>office</PartOf>
@@ -22,60 +22,113 @@
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld-3.16.4-py2.7.egg-info</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/__init__.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/__init__.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/build_helpers.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/build_helpers.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/conf.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/conf.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/const.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/const.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/diffgrid.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/diffgrid.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/diffmap.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/diffmap.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/diffutil.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/diffutil.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/dirdiff.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/dirdiff.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/filediff.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/filediff.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/filemerge.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/filemerge.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/filters.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/filters.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/gutterrendererchunk.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/gutterrendererchunk.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/linkmap.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/linkmap.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/matchers.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/matchers.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/meldapp.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/meldapp.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/meldbuffer.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/meldbuffer.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/melddoc.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/melddoc.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/meldwindow.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/meldwindow.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/merge.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/merge.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/misc.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/misc.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/newdifftab.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/newdifftab.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/patchdialog.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/patchdialog.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/preferences.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/preferences.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/recent.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/recent.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/settings.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/settings.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/sourceview.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/sourceview.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/task.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/task.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/tree.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/tree.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/__init__.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/__init__.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/emblemcellrenderer.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/emblemcellrenderer.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/findbar.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/findbar.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/gladesupport.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/gladesupport.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/gnomeglade.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/gnomeglade.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/historyentry.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/historyentry.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/listwidget.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/listwidget.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/msgarea.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/msgarea.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/notebooklabel.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/notebooklabel.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/statusbar.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/statusbar.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/util.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/util.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/vcdialogs.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/vcdialogs.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/wraplabel.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/ui/wraplabel.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/undo.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/undo.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/util/__init__.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/util/__init__.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/util/compat.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/util/compat.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/COPYING</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/README</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/__init__.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/__init__.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/_null.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/_null.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/_vc.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/_vc.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/bzr.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/bzr.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/darcs.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/darcs.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/git.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/git.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/mercurial.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/mercurial.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/svn.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/vc/svn.pyc</Path>
<Path fileType="library">/usr/lib/python2.7/site-packages/meld/vcview.py</Path>
+ <Path fileType="library">/usr/lib/python2.7/site-packages/meld/vcview.pyc</Path>
<Path fileType="data">/usr/share/appdata/meld.appdata.xml</Path>
<Path fileType="data">/usr/share/applications/meld.desktop</Path>
<Path fileType="doc">/usr/share/doc</Path>
@@ -201,12 +254,12 @@
</Files>
</Package>
<History>
- <Update release="6">
- <Date>2017-03-14</Date>
+ <Update release="7">
+ <Date>2017-05-18</Date>
<Version>3.16.4</Version>
<Comment>Packaging update</Comment>
- <Name>Michael Meinertzhagen</Name>
- <Email>mmeinert@protonmail.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
May 22 2023, 10:26 PM (11 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5799416
Default Alt Text
D141.id.diff (12 KB)
Attached To
Mode
D141: Fix compare files
Attached
Detach File
Event Timeline
Log In to Comment