summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2003-07-01 20:19:16 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2003-07-01 20:19:16 +0000
commit8a7f7a6cd233eac357b22bd4a66da10a1d2b9a7e (patch)
tree6c14c5c8a478bf7e988ca974d139fe51ac28018d /dev-util/meld/files
parentAdded hppa to KEYWORDS. (diff)
downloadhistorical-8a7f7a6cd233eac357b22bd4a66da10a1d2b9a7e.tar.gz
historical-8a7f7a6cd233eac357b22bd4a66da10a1d2b9a7e.tar.bz2
historical-8a7f7a6cd233eac357b22bd4a66da10a1d2b9a7e.zip
version bump
Diffstat (limited to 'dev-util/meld/files')
-rw-r--r--dev-util/meld/files/digest-meld-0.8.21
-rw-r--r--dev-util/meld/files/meld-0.8.2-gentoo.diff51
2 files changed, 52 insertions, 0 deletions
diff --git a/dev-util/meld/files/digest-meld-0.8.2 b/dev-util/meld/files/digest-meld-0.8.2
new file mode 100644
index 000000000000..9f339fc5c1d7
--- /dev/null
+++ b/dev-util/meld/files/digest-meld-0.8.2
@@ -0,0 +1 @@
+MD5 e547340b3f8271a2135a0cea9c9b1c2f meld-0.8.2.tgz 86388
diff --git a/dev-util/meld/files/meld-0.8.2-gentoo.diff b/dev-util/meld/files/meld-0.8.2-gentoo.diff
new file mode 100644
index 000000000000..b692e36a148b
--- /dev/null
+++ b/dev-util/meld/files/meld-0.8.2-gentoo.diff
@@ -0,0 +1,51 @@
+diff -ur meld-0.8.2.orig/meld meld-0.8.2/meld
+--- meld-0.8.2.orig/meld 2003-07-01 20:06:46.000000000 +0000
++++ meld-0.8.2/meld 2003-07-01 20:08:33.000000000 +0000
+@@ -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
+diff -ur meld-0.8.2.orig/meld.desktop meld-0.8.2/meld.desktop
+--- meld-0.8.2.orig/meld.desktop 2003-07-01 20:06:46.000000000 +0000
++++ meld-0.8.2/meld.desktop 2003-07-01 20:09:17.000000000 +0000
+@@ -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
+diff -ur meld-0.8.2.orig/meldapp.py meld-0.8.2/meldapp.py
+--- meld-0.8.2.orig/meldapp.py 2003-07-01 20:06:46.000000000 +0000
++++ meld-0.8.2/meldapp.py 2003-07-01 20:10:27.000000000 +0000
+@@ -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.8.2/html/index.html")
+
+ def on_menu_about_activate(self, *extra):
+ about = gtk.glade.XML(misc.appdir("glade2/meld-app.glade"),"about").get_widget("about")
+diff -ur meld-0.8.2.orig/misc.py meld-0.8.2/misc.py
+--- meld-0.8.2.orig/misc.py 2003-07-01 20:06:46.000000000 +0000
++++ meld-0.8.2/misc.py 2003-07-01 20:16:42.000000000 +0000
+@@ -49,7 +49,7 @@
+ def appdir(pathin):
+ """Return where the application is installed.
+ """
+- where = os.path.dirname(sys.argv[0])
++ where = /usr/share/meld
+ 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), gtk.MESSAGE_ERROR)