diff -rupN aldrin.old/doc/SConscript aldrin/doc/SConscript
--- aldrin.old/doc/SConscript 2009-01-09 16:25:21.000000000 -0500
+++ aldrin/doc/SConscript 2009-02-23 16:22:46.000000000 -0500
@@ -31,4 +31,5 @@ install('${DOC_PATH}/images',
glob.glob('aldrin/images/*.gif')
+ glob.glob('aldrin/images/*.png'))
-
+install('${DOC_PATH}',
+ ['../ChangeLog', '../CREDITS', '../LICENCE'])
diff -rupN aldrin.old/SConstruct aldrin/SConstruct
--- aldrin.old/SConstruct 2009-01-09 16:25:21.000000000 -0500
+++ aldrin/SConstruct 2009-02-23 16:20:14.000000000 -0500
@@ -61,7 +61,7 @@ env['SITE_PACKAGE_PATH'] = distutils.sys
env['APPLICATIONS_PATH'] = '${DESTDIR}${PREFIX}/share/applications'
env['BIN_PATH'] = '${DESTDIR}${PREFIX}/bin'
env['SHARE_PATH'] = '${DESTDIR}${PREFIX}/share/aldrin'
-env['DOC_PATH'] = '${DESTDIR}${PREFIX}/share/doc/aldrin'
+env['DOC_PATH'] = '${DESTDIR}${PREFIX}/share/doc/aldrin-' + VERSION
env['ETC_PATH'] = '${DESTDIR}${ETCDIR}/aldrin'
env['ICONS_ALDRIN_PATH'] = '${DESTDIR}${PREFIX}/share/icons/aldrin'
env['ICONS_HICOLOR_PATH'] = '${DESTDIR}${PREFIX}/share/icons/hicolor'
diff -rupN aldrin.old/src/components/mainwindow.py aldrin/src/components/mainwindow.py
--- aldrin.old/src/components/mainwindow.py 2009-01-09 16:25:22.000000000 -0500
+++ aldrin/src/components/mainwindow.py 2009-02-23 16:33:44.000000000 -0500
@@ -44,7 +44,7 @@ show_preferences = preferences.show_pref
from aldrin.utils import CancelException
import aldrin.com as com
-
+from about import VERSION
def cmp_view(a,b):
a_order = (hasattr(a, '__view__') and a.__view__.get('order',0)) or 0
b_order = (hasattr(b, '__view__') and b.__view__.get('order',0)) or 0
@@ -551,7 +551,7 @@ class AldrinFrame(gtk.Window):
@type event: MenuEvent
"""
import webbrowser
- webbrowser.open_new(filepath('../doc/aldrin/html/index.html'))
+ webbrowser.open_new(filepath('../doc/aldrin'+VERSION.split(" ")[0]+'/html/index.html'))
def on_about(self, *args):
"""
diff -rupN aldrin.old/src/components/rack.py aldrin/src/components/rack.py
--- aldrin.old/src/components/rack.py 2009-01-09 16:25:22.000000000 -0500
+++ aldrin/src/components/rack.py 2009-02-23 17:08:46.000000000 -0500
@@ -30,7 +30,7 @@ from aldrin.utils import prepstr, filepa
get_item_count, question, error, new_listview, add_scrollbars, get_clipboard_text, set_clipboard_text, \
gettext, new_stock_image_button, diff
import zzub
-import sys,os
+import sys,os,glob
import fnmatch
import ctypes
import time
@@ -728,9 +728,10 @@ class ParameterView(gtk.VBox):
"""
uri = filenameify(self.pluginloader.get_uri())
name = filenameify(self.pluginloader.get_name())
+ zzubdocpath = glob.glob("../doc/libzzub-*")[0]
helpfilepaths = [
- filepath('../doc/zzub/plugins/' + uri + '/index.html'),
- filepath('../doc/zzub/plugins/' + name + '/index.html'),
+ filepath(zzubdocpath + '/plugins/' + uri + '/index.html'),
+ filepath(zzubdocpath + '/plugins/' + name + '/index.html'),
]
for path in helpfilepaths:
print "searching for '%s'..." % path