diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2003-10-15 10:06:31 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2003-10-15 10:06:31 +0000 |
| commit | 0f273e28680381a3276939b81429a5177c88e159 (patch) | |
| tree | c3249a8088a3314775f5e01794419b624885be6a /dev-util/meld/files | |
| parent | version bump (diff) | |
| download | historical-0f273e28680381a3276939b81429a5177c88e159.tar.gz historical-0f273e28680381a3276939b81429a5177c88e159.tar.bz2 historical-0f273e28680381a3276939b81429a5177c88e159.zip | |
version bump
Diffstat (limited to 'dev-util/meld/files')
| -rw-r--r-- | dev-util/meld/files/digest-meld-0.9.0 | 1 | ||||
| -rw-r--r-- | dev-util/meld/files/meld-0.9.0-gentoo.diff | 56 |
2 files changed, 57 insertions, 0 deletions
diff --git a/dev-util/meld/files/digest-meld-0.9.0 b/dev-util/meld/files/digest-meld-0.9.0 new file mode 100644 index 000000000000..e6312bc7ecd6 --- /dev/null +++ b/dev-util/meld/files/digest-meld-0.9.0 @@ -0,0 +1 @@ +MD5 ade97f490ff61f2a5b85a3cc6d885232 meld-0.9.0.tgz 116391 diff --git a/dev-util/meld/files/meld-0.9.0-gentoo.diff b/dev-util/meld/files/meld-0.9.0-gentoo.diff new file mode 100644 index 000000000000..58c58bc52d98 --- /dev/null +++ b/dev-util/meld/files/meld-0.9.0-gentoo.diff @@ -0,0 +1,56 @@ +--- meld ++++ meld +@@ -52,6 +52,12 @@ + print "Due to incompatible API changes some functions may not operate as expected." + + # ++# Add the library path to the system load path ++# ++import os ++sys.path = [os.curdir, '/usr/lib/meld'] + sys.path ++ ++# + # main + # + import meldapp +--- meld.desktop ++++ meld.desktop +@@ -6,6 +6,6 @@ + Comment=Compare and merge your files. + TryExec=meld + Exec=meld +-Path=./meld + Terminal=false + Categories=GNOME;Application;Development; ++Icon=/usr/share/meld/glade2/pixmaps/icon.png +--- meldapp.py ++++ meldapp.py +@@ -453,7 +453,7 @@ + gnome.url_show("http://meld.sourceforge.net") + + def on_menu_users_manual_activate(self, button): +- gnome.url_show("file:///"+os.path.abspath(misc.appdir("manual/index.html") ) ) ++ gnome.url_show("file:///usr/share/doc/meld-0.9.0/html/index.html") + + def on_menu_about_activate(self, *extra): + about = gtk.glade.XML(misc.appdir("glade2/meld-app.glade"),"about").get_widget("about") +--- misc.py 2003-08-31 23:27:14.172632240 +0200 ++++ misc.py 2003-08-31 23:27:14.172632240 +0200 +@@ -55,14 +55,7 @@ + return ret + + def appdir(pathin): +- """Return where the application is installed. +- """ +- where = os.path.dirname(sys.argv[0]) +- pathout = os.path.join( where, pathin ) +- if not os.path.exists(pathout): +- run_dialog(_("Cannot find '%s'\nI looked in '%s'\n(%s)") % (pathin,where,pathout), None, gtk.MESSAGE_ERROR) +- sys.exit(1) +- return pathout ++ return os.path.join( "/usr/share/meld", pathin ) + + class struct: + """Similar to a dictionary except that members may be accessed as s.member. + + |