Re: switching libkate1-shlibs to wxpython300-py
Jack Howarth <[email protected]>
| Newsgroups | gmane.os.apple.fink.devel |
|---|---|
| Message-ID | <CAP5Ds0B46nMLWdT3jXv-H+5vZgc5kdtuGaY=Tt=j-tPQzCyiXQ@mail.gmail.com> |
Hanspeter,
Try the attached packaging. It implements the debian
approach for allowing the wxpython 2.8 and 3.0 packages to co-exist as
closely as we can in fink. They use an extra /usr/lib/wx/python
directory, update-alternatives and a dh*py* tool to manage the
symlinks in concert with changes to their python which we don't have.
https://wiki.debian.org/Python/TransitionToDHPython2
In our case, we are able to create the same common 'wxversion'
split-off containing the
lib/python%type_raw[python]/site-packages/wxversion.py* files. However
in the absence of the additional support from their
TransitionToDHPython2 project, we have to explicitly store the symlink
for the correct wx*.pth file in the appropriate -dev split.off. This
does cause some grief in upgrading from the current wxgtk28-py and
wxpython300-py due to the movement of wx.pth file into the -dev
split-off but it is a one time deal and afterwards the two wxpython
packages will freely co-exist.
Packages that currently BuildDepends on wxgtk28-py27 or
wxpython300-py27 now need to use wxgtk28-py27-dev or
wxpython300-py27-dev instead in order to get the correct wx*.pth
symlink. I've tested this with the modified bibus.info and
relax-py.info files. They build fine and can both run with issues when
the wxgtk28-py27-dev and wxpython300-py27-dev packages are
deinstaleld.
Jack
ps The correct wx,path has to be used because the one from
wxgtk28-py27 contains the string "wx-2.8-gtk2-unicode" and the one
from the wxpython300-py27-dev contains the string "wx-3.0-osx_cocoa".
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Fink-devel mailing list
[email protected]
List archive:
http://news.gmane.org/gmane.os.apple.fink.devel
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-devel
wxgtk2.8-py.info
(application/octet-stream, 5.8 KB) - not displayed
wxpython300-py.info
(application/octet-stream, 3.3 KB) - not displayed
wxpython300-py.patch
(application/octet-stream, 1.5 KB)
--- wxPython/src/osx_cocoa/_core.py 2014-10-13 18:37:52.000000000 -0400
+++ wxPython.new/src/osx_cocoa/_core.py 2015-01-31 13:07:01.000000000 -0500
@@ -8579,21 +8579,21 @@
wx.PyApp.__init__(self)
# make sure we can create a GUI
- if not self.IsDisplayAvailable():
-
- if wx.Platform == "__WXMAC__":
- msg = """This program needs access to the screen.
-Please run with a Framework build of python, and only when you are
-logged in on the main display of your Mac."""
-
- elif wx.Platform == "__WXGTK__":
- msg ="Unable to access the X Display, is $DISPLAY set properly?"
-
- else:
- msg = "Unable to create GUI"
- # TODO: more description is needed for wxMSW...
-
- raise SystemExit(msg)
+# if not self.IsDisplayAvailable():
+#
+# if wx.Platform == "__WXMAC__":
+# msg = """This program needs access to the screen.
+# Please run with a Framework build of python, and only when you are
+# logged in on the main display of your Mac."""
+#
+# elif wx.Platform == "__WXGTK__":
+# msg ="Unable to access the X Display, is $DISPLAY set properly?"
+#
+# else:
+# msg = "Unable to create GUI"
+# # TODO: more description is needed for wxMSW...
+#
+# raise SystemExit(msg)
# This has to be done before OnInit
self.SetUseBestVisual(useBestVisual)
relax-py.info
(application/octet-stream, 2.6 KB) - not displayed
relax-py.patch
(application/octet-stream, 2.8 KB)
diff -uNr relax-3.2.3/relax relax-3.2.3.fink/relax
--- relax-3.2.3/relax 2014-07-02 09:53:23.000000000 -0400
+++ relax-3.2.3.fink/relax 2014-07-03 15:06:19.000000000 -0400
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python2.X
# Import the relax module.
import relax
diff -uNr relax-3.3.2/scons/install.py relax-3.3.2.fink/scons/install.py
--- relax-3.3.2/scons/install.py 2014-11-13 11:52:51.000000000 -0500
+++ relax-3.3.2.fink/scons/install.py 2014-11-17 09:57:17.000000000 -0500
@@ -111,11 +111,11 @@
###############
# Run relax to create the *.pyc files.
- print("\nCreating the byte-compiled *.pyc files.")
- python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + repr(sys.version_info[0]) + '.' + repr(sys.version_info[1])
- cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path)
- print(cmd)
- system(cmd)
+ #print("\nCreating the byte-compiled *.pyc files.")
+ #python_path = sys.prefix + path.sep + 'bin' + path.sep + 'python' + repr(sys.version_info[0]) + '.' + repr(sys.version_info[1])
+ #cmd = "cd %s; %s -m compileall . ; %s -O -m compileall ." % (env['RELAX_PATH'], python_path, python_path)
+ #print(cmd)
+ #system(cmd)
# Final printout.
print("\n\n\n")
diff -uNr relax-3.2.3/sconstruct relax-3.2.3.fink/sconstruct
--- relax-3.2.3/sconstruct 2014-07-02 09:53:23.000000000 -0400
+++ relax-3.2.3.fink/sconstruct 2014-07-03 15:08:16.000000000 -0400
@@ -101,7 +101,7 @@
SYS = SYSTEM
# Mac OS X installation path.
- INSTALL_PATH = sys.prefix + sep + 'local'
+ INSTALL_PATH = 'FINK_INSTALL_DIR' + sep + 'lib'
# All other operating systems.
@@ -118,10 +118,10 @@
###############
# Relax installation directory.
-RELAX_PATH = INSTALL_PATH + sep + 'relax'
+RELAX_PATH = INSTALL_PATH + sep + 'relax-py2X'
# Installation path for binaries.
-BIN_PATH = INSTALL_PATH + sep + 'bin'
+BIN_PATH = 'FINK_INSTALL_DIR' + sep + 'bin'
# Symbolic link installation path.
SYMLINK = BIN_PATH + sep + 'relax'
@@ -570,7 +570,7 @@
'relax_fit.c']
# Construct the python include path (for Python.h).
- py_include_minpath = sys.prefix + path.sep + 'include'
+ py_include_minpath = 'FINK_PREFIX' + path.sep + 'include'
py_include_fullpath = py_include_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
# Test if Python.h resides here.
@@ -586,7 +586,7 @@
py_include_fullpath = environ['PYTHON_INCLUDE_DIR']
# Construct the python bin path.
- py_bin_minpath = sys.prefix + path.sep + 'bin'
+ py_bin_minpath = 'FINK_PREFIX' + path.sep + 'bin'
py_bin_fullpath = py_bin_minpath + path.sep + 'python' + `sys.version_info[0]` + '.' + `sys.version_info[1]`
# Relaxation curve fitting build environment.
bibus.info
(application/octet-stream, 2.8 KB) - not displayed
bibus.patch
(application/octet-stream, 19.8 KB)
diff -ruN bibus-1.5.2-orig/CleanDB.py bibus-1.5.2/CleanDB.py
--- bibus-1.5.2-orig/CleanDB.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/CleanDB.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: utf-8 -*-
# generated by wxGlade 0.6.1 on Thu Feb 7 23:20:54 2008
diff -ruN bibus-1.5.2-orig/CodecChoice.py bibus-1.5.2/CodecChoice.py
--- bibus-1.5.2-orig/CodecChoice.py 2011-11-28 15:26:20.000000000 -0500
+++ bibus-1.5.2/CodecChoice.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: ISO-8859-1 -*-
# generated by wxGlade 0.4cvs on Wed Apr 19 23:06:20 2006
diff -ruN bibus-1.5.2-orig/Data/parsePubMedJ.py bibus-1.5.2/Data/parsePubMedJ.py
--- bibus-1.5.2-orig/Data/parsePubMedJ.py 2011-11-28 15:26:20.000000000 -0500
+++ bibus-1.5.2/Data/parsePubMedJ.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
#
# This is an utility file that parse the PubMed list of journal
# <http://www.ncbi.nlm.nih.gov/entrez/query.fcgi?db=journals>
diff -ruN bibus-1.5.2-orig/Docs/html/en/introduction_old.html bibus-1.5.2/Docs/html/en/introduction_old.html
--- bibus-1.5.2-orig/Docs/html/en/introduction_old.html 2011-11-28 15:26:20.000000000 -0500
+++ bibus-1.5.2/Docs/html/en/introduction_old.html 2013-11-02 20:37:01.000000000 -0400
@@ -567,7 +567,7 @@
<p style="margin-bottom: 0cm;">cd to the Bibus directory </p>
</li>
<li>
- <p style="margin-bottom: 0cm;">su -c "/usr/bin/python2.2
+ <p style="margin-bottom: 0cm;">su -c "@FINK_PREFIX@/bin/python2.72.2
Setup/setup.py" </p>
</li>
<li>
diff -ruN bibus-1.5.2-orig/Docs/html/en/usingOOo.html bibus-1.5.2/Docs/html/en/usingOOo.html
--- bibus-1.5.2-orig/Docs/html/en/usingOOo.html 2011-11-28 15:26:20.000000000 -0500
+++ bibus-1.5.2/Docs/html/en/usingOOo.html 2013-11-02 20:33:21.000000000 -0400
@@ -36,8 +36,7 @@
<h1><a class="mozTocH1" name="mozTocId880488"></a>Inserting citations
and bibliography<br>
</h1>
-<img alt="Inserting citation" src="../ScreenShots/OOoConnection.png"
- height="504" width="100%"><br>
+<img alt="Inserting citation" src="../ScreenShots/OOoConnection.png"><br>
<h2><a class="mozTocH3" name="mozTocId241674"></a>Inserting a citation</h2>
<p>You just have to select your citation(s) and insert them
directly at the cursor location. Further explanation shouldnt be
@@ -137,7 +136,7 @@
<p>Creating or editing a new style is very easy. When you select New
the following 'Style editor' will pop up.<br>
<img src="../ScreenShots/style1.png" name="Graphic6" alt="style editor"
- border="0" height="605" width="100%"><br>
+ border="0"><br>
You
start with a style corresponding to the 'default' style of the style
menu. This is a fairly reasonable style and most of the time you just
@@ -152,7 +151,7 @@
easy to understand and correspond to the available choices in
OpenOffice.org.<br>
<img src="../ScreenShots/style2.png" name="Graphic7" alt="style_index"
- border="0" height="688" width="100%"></p>
+ border="0"></p>
<h2><a class="mozTocH4" name="mozTocId961357"></a>Fieds formatting</h2>
<p>This Tab controls the filters that are applied to the record
fields before insertion in OpenOffice.org.<br>
@@ -164,7 +163,7 @@
<p>or</p>
<pre style="margin-left: 1.06cm; margin-bottom: 0.5cm;">Marx G., Marx H., Marx Z., Marx Z. and Marx G.</pre>
<p><img src="../ScreenShots/style3.png" name="Graphic8"
- alt="style_fields" border="0" height="672" width="985"><br>
+ alt="style_fields" border="0"><br>
</p>
<p>On
the left, there is a list of all the available reference types that
@@ -221,7 +220,7 @@
<pre style="margin-bottom: 0.5cm;">Authors. <i>Title.</i> Journal (Year) <b>Volume:</b> pages.</pre>
<p>This can be done in this Tab.<br>
<img src="../ScreenShots/style4.png" name="Graphic9"
- alt="style_ordering" border="0" height="688" width="100%"></p>
+ alt="style_ordering" border="0"></p>
<h2><a class="mozTocH3" name="mozTocId673996"></a>Citation</h2>
<p>Starting with Bibus pre1.0.0, there is a new tab called
citation.<br>
@@ -234,8 +233,7 @@
of your current document.<br>
</p>
<div align="center"><img src="../ScreenShots/style5.png"
- name="Graphic10" alt="citation_formatting" border="0" height="672"
- width="100%"><br>
+ name="Graphic10" alt="citation_formatting" border="0"><br>
</div>
<p>Here
is a short description:<br>
diff -ruN bibus-1.5.2-orig/Docs/packager.txt bibus-1.5.2/Docs/packager.txt
--- bibus-1.5.2-orig/Docs/packager.txt 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/Docs/packager.txt 2013-11-02 20:37:01.000000000 -0400
@@ -49,7 +49,7 @@
3) There is a makefile in Setup than can help you:
a)
-make -f Setup/Makefile install DESTDIR=/usr python=/usr/bin/python
+make -f Setup/Makefile install DESTDIR=/usr python=@FINK_PREFIX@/bin/python2.7
will install:
bibus in /usr/share/bibus/
@@ -57,14 +57,14 @@
locales in /usr/share/locales/
b)
-make -f Setup/Makefile install-doc-en DESTDIR=/usr python=/usr/bin/python
+make -f Setup/Makefile install-doc-en DESTDIR=/usr python=@FINK_PREFIX@/bin/python2.7
will install the doc in /usr/share/doc/bibus/
c)
You can compile all the files (in pyc and pyo) with:
-make -f Setup/Makefile compile DESTDIR=/usr python=/usr/bin/python
+make -f Setup/Makefile compile DESTDIR=/usr python=@FINK_PREFIX@/bin/python2.7
d)
You can make freedesktop compatible .desktop entries with something like:
@@ -81,7 +81,7 @@
#!/bin/sh
export LD_LIBRARY_PATH=/usr/lib/openoffice/program
export PYTHONPATH=/usr/lib/openoffice/program
- /usr/bin/python /usr/share/bibus/bibus.py
+ @FINK_PREFIX@/bin/python2.7 /usr/share/bibus/bibus.py
This should be OK for most distribution except for the OOo directory name.
With modern distributions (debian with OOo2), you don't need to set the PYTHONPATH because
diff -ruN bibus-1.5.2-orig/FirstStart/FirstTimeWizard_DB.py bibus-1.5.2/FirstStart/FirstTimeWizard_DB.py
--- bibus-1.5.2-orig/FirstStart/FirstTimeWizard_DB.py 2011-11-28 15:26:20.000000000 -0500
+++ bibus-1.5.2/FirstStart/FirstTimeWizard_DB.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: ISO-8859-1 -*-
# generated by wxGlade 0.4.1 on Sun Nov 5 14:02:37 2006
diff -ruN bibus-1.5.2-orig/FirstStart/MySQL_Setup.py bibus-1.5.2/FirstStart/MySQL_Setup.py
--- bibus-1.5.2-orig/FirstStart/MySQL_Setup.py 2011-11-28 15:26:20.000000000 -0500
+++ bibus-1.5.2/FirstStart/MySQL_Setup.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: ISO-8859-1 -*-
# generated by wxGlade 0.4cvs on Sat Apr 8 19:34:49 2006
diff -ruN bibus-1.5.2-orig/FirstStart/Wizard_MySQL.py bibus-1.5.2/FirstStart/Wizard_MySQL.py
--- bibus-1.5.2-orig/FirstStart/Wizard_MySQL.py 2011-11-28 15:26:20.000000000 -0500
+++ bibus-1.5.2/FirstStart/Wizard_MySQL.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: ISO-8859-1 -*-
# generated by wxGlade 0.4.1 on Sun Nov 5 21:44:38 2006
diff -ruN bibus-1.5.2-orig/FirstStart/Wizard_SQLite.py bibus-1.5.2/FirstStart/Wizard_SQLite.py
--- bibus-1.5.2-orig/FirstStart/Wizard_SQLite.py 2011-11-28 15:26:20.000000000 -0500
+++ bibus-1.5.2/FirstStart/Wizard_SQLite.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: ISO-8859-1 -*-
# generated by wxGlade 0.4.1 on Sun Nov 5 21:18:09 2006
diff -ruN bibus-1.5.2-orig/Freeze/freeze_bibus.py bibus-1.5.2/Freeze/freeze_bibus.py
--- bibus-1.5.2-orig/Freeze/freeze_bibus.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/Freeze/freeze_bibus.py 2013-11-02 20:37:01.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!@FINK_PREFIX@/bin/python2.7
import sys,os,shutil
# setting environnement
diff -ruN bibus-1.5.2-orig/Makefile bibus-1.5.2/Makefile
--- bibus-1.5.2-orig/Makefile 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/Makefile 2013-11-02 20:39:23.000000000 -0400
@@ -1,6 +1,6 @@
# you presumably will only have to change the three first lines below
-DESTDIR = /usr/local
-python = /usr/bin/python
+DESTDIR = @FINK_PREFIX@
+python = @FINK_PREFIX@/bin/python2.7
oopath = /usr/lib/openoffice/program
ooure = /usr/lib/openoffice.org/basis-link/ure-link/lib
oobasis = /usr/lib/openoffice/basis-link/program
@@ -9,7 +9,7 @@
exec_prefix = $(prefix)
bindir = $(exec_prefix)/bin
datadir = $(prefix)/share
-sysconfdir = /etc
+sysconfdir = $(DESTDIR)/etc
mandir = $(prefix)/share/man
man1dir = $(mandir)/man1
@@ -18,23 +18,23 @@
install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/
#
for dir in Export Format Import StyleEditor FirstStart bibOOo db_models Pixmaps Data LyX Utilities; do \
- find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(datadir)/bibus/'{}' ';' ; \
+ find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' $(datadir)/bibus/'{}' ';' ; \
done
- install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg
+ install -m644 Setup/UnoConnectionListener.odg $(datadir)/bibus/Setup/UnoConnectionListener.odg
# locale files. We look for all the directory in locale/
for dir in $(wildcard locale/*); do \
if [ -d $$dir ] && [ $$dir != "locale/CVS" ]; then \
- install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \
+ install -m644 $$dir/LC_MESSAGES/bibus.mo $(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \
fi; \
done
# bibus.config in /etc
- install -m644 bibus.config -D $(sysconfdir)/bibus.config
+ install -m644 bibus.config $(sysconfdir)/bibus.config
# man page
- install -m644 Setup/bibus.1 -D $(man1dir)/bibus.1
+ install -m644 Setup/bibus.1 $(man1dir)/bibus.1
# freedesktop icon and shortcut
- install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png
- install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop
+ install -m644 Pixmaps/bibus.png $(datadir)/icons/hicolor/48x48/apps/bibus.png
+ install -m644 Setup/bibus.desktop $(datadir)/applications/bibus.desktop
# The following lines are presumably not needed since icons/desktop are in standard locations
#echo 'Exec=$(bindir)/bibus' >> $(datadir)/applications/bibus.desktop
#echo 'Icon=$(datadir)/icons/hicolor/48x48/apps/bibus.png' >> $(datadir)/applications/bibus.desktop
@@ -63,7 +63,7 @@
define install-doc-en
# copying docs in from Docs/html/en/ for bibus-doc-en
cd Docs;\
- find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';'
+ find html/en/* -type f -exec install -m644 '{}' $(datadir)/doc/bibus/'{}' ';'
endef
define compile
@@ -81,7 +81,6 @@
install:
$(install-files)
$(install-doc-en)
- $(compile)
# write uninstaller in $(datadir)/bibus/Setup/uninstall.sh
echo "#!/bin/sh" > $(datadir)/bibus/Setup/uninstall.sh
diff -ruN bibus-1.5.2-orig/Pref_Connection.py bibus-1.5.2/Pref_Connection.py
--- bibus-1.5.2-orig/Pref_Connection.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/Pref_Connection.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: ISO-8859-1 -*-
# generated by wxGlade 0.4cvs on Mon Feb 6 00:01:16 2006
diff -ruN bibus-1.5.2-orig/Pref_DB.py bibus-1.5.2/Pref_DB.py
--- bibus-1.5.2-orig/Pref_DB.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/Pref_DB.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: ISO-8859-1 -*-
# generated by wxGlade 0.3.4 on Sun Jul 24 23:17:28 2005
diff -ruN bibus-1.5.2-orig/Pref_Display.py bibus-1.5.2/Pref_Display.py
--- bibus-1.5.2-orig/Pref_Display.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/Pref_Display.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: ISO-8859-1 -*-
# generated by wxGlade 0.4.1 on Sat Dec 02 22:10:57 2006
diff -ruN bibus-1.5.2-orig/Pref_Duplicates_Base.py bibus-1.5.2/Pref_Duplicates_Base.py
--- bibus-1.5.2-orig/Pref_Duplicates_Base.py 2011-11-28 15:26:20.000000000 -0500
+++ bibus-1.5.2/Pref_Duplicates_Base.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: ISO-8859-1 -*-
# generated by wxGlade 0.3.4 on Sat Jun 18 02:28:48 2005
diff -ruN bibus-1.5.2-orig/Pref_Journals.py bibus-1.5.2/Pref_Journals.py
--- bibus-1.5.2-orig/Pref_Journals.py 2011-11-28 15:26:20.000000000 -0500
+++ bibus-1.5.2/Pref_Journals.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: UTF-8 -*-
# generated by wxGlade 0.4.1 on Wed Jan 31 21:51:50 2007
diff -ruN bibus-1.5.2-orig/Pref_PubMed.py bibus-1.5.2/Pref_PubMed.py
--- bibus-1.5.2-orig/Pref_PubMed.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/Pref_PubMed.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: utf-8 -*-
# generated by wxGlade 0.6.3 on Wed Jun 17 23:30:23 2009
diff -ruN bibus-1.5.2-orig/Pref_Search.py bibus-1.5.2/Pref_Search.py
--- bibus-1.5.2-orig/Pref_Search.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/Pref_Search.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: ISO-8859-1 -*-
# generated by wxGlade 0.4.1 on Sun Dec 03 14:48:19 2006
diff -ruN bibus-1.5.2-orig/RefDisplayDates.py bibus-1.5.2/RefDisplayDates.py
--- bibus-1.5.2-orig/RefDisplayDates.py 2011-11-28 15:26:20.000000000 -0500
+++ bibus-1.5.2/RefDisplayDates.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: iso-8859-1 -*-
# generated by wxGlade 0.5 on Wed Aug 22 22:23:34 2007 from /home/pmartino/Desktop/bibus-cvs/bibus/wxg/RefDisplayDates.wxg
diff -ruN bibus-1.5.2-orig/RefEditor_Files.py bibus-1.5.2/RefEditor_Files.py
--- bibus-1.5.2-orig/RefEditor_Files.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/RefEditor_Files.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: utf-8 -*-
# generated by wxGlade 0.6.1 on Wed Apr 2 22:17:30 2008
diff -ruN bibus-1.5.2-orig/Setup/Makefile bibus-1.5.2/Setup/Makefile
--- bibus-1.5.2-orig/Setup/Makefile 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/Setup/Makefile 2013-11-02 20:41:26.000000000 -0400
@@ -1,6 +1,6 @@
# you presumably will only have to change the three first lines below
-DESTDIR = /usr/local
-python = /usr/bin/python
+DESTDIR = @FINK_PREFIX@
+python = @FINK_PREFIX@/bin/python2.7
oopath = /usr/lib/openoffice/program
ooure = /usr/lib/openoffice.org/basis-link/ure-link/lib
oobasis = /usr/lib/openoffice/basis-link/program
diff -ruN bibus-1.5.2-orig/Setup/bibus.cfg bibus-1.5.2/Setup/bibus.cfg
--- bibus-1.5.2-orig/Setup/bibus.cfg 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/Setup/bibus.cfg 2013-11-02 20:37:01.000000000 -0400
@@ -1,5 +1,5 @@
[PATH]
-python = /usr/bin/python
+python = @FINK_PREFIX@/bin/python2.7
oopath = /usr/lib/openoffice/program
docdir = /usr/local/share/doc/bibus/html
licence = /usr/local/share/doc/bibus/copying
diff -ruN bibus-1.5.2-orig/Setup/bibus.sh bibus-1.5.2/Setup/bibus.sh
--- bibus-1.5.2-orig/Setup/bibus.sh 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/Setup/bibus.sh 2013-11-02 20:37:01.000000000 -0400
@@ -1,4 +1,4 @@
#!/bin/sh
export LD_LIBRARY_PATH=/usr/lib/openoffice/program
export PYTHONPATH=/usr/lib/openoffice/program
-exec /usr/bin/python /usr/local/share/bibus/bibus.py
+exec @FINK_PREFIX@/bin/python2.7 /usr/local/share/bibus/bibus.py
diff -ruN bibus-1.5.2-orig/Setup/setup.py bibus-1.5.2/Setup/setup.py
--- bibus-1.5.2-orig/Setup/setup.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/Setup/setup.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# Copyright 2004,2005 Pierre Martineau <[email protected]>
# This file is part of Bibus, a bibliographic database that can
# work together with OpenOffice.org to generate bibliographic indexes.
diff -ruN bibus-1.5.2-orig/Utilities/open_url.py bibus-1.5.2/Utilities/open_url.py
--- bibus-1.5.2-orig/Utilities/open_url.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/Utilities/open_url.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
'''Utilities for opening files or URLs in the registered default application
and for sending e-mail using the user's preferred composer.
From http://code.activestate.com/recipes/511443/
diff -ruN bibus-1.5.2-orig/Utilities/title_case.py bibus-1.5.2/Utilities/title_case.py
--- bibus-1.5.2-orig/Utilities/title_case.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/Utilities/title_case.py 2013-11-02 20:37:01.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: UTF-8 -*-
# Version 1.0.0
diff -ruN bibus-1.5.2-orig/bibus.cfg bibus-1.5.2/bibus.cfg
--- bibus-1.5.2-orig/bibus.cfg 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/bibus.cfg 2013-11-02 20:37:01.000000000 -0400
@@ -1,5 +1,5 @@
[PATH]
-python = /usr/bin/python
+python = @FINK_PREFIX@/bin/python2.7
oopath = /usr/lib/openoffice/program
ooure = /usr/lib/openoffice.org/basis-link/ure-link/lib
oobasis = /usr/lib/openoffice/basis-link/program
diff -ruN bibus-1.5.2-orig/bibus.py bibus-1.5.2/bibus.py
--- bibus-1.5.2-orig/bibus.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/bibus.py 2013-11-02 20:37:01.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!@FINK_PREFIX@/bin/python2.7
# Copyright 2004 Pierre Martineau <[email protected]>
# This file is part of Bibus, a bibliographic database that can
# work together with OpenOffice.org to generate bibliographic indexes.
diff -ruN bibus-1.5.2-orig/bibus.py~ bibus-1.5.2/bibus.py~
--- bibus-1.5.2-orig/bibus.py~ 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/bibus.py~ 2013-11-02 20:37:01.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!@FINK_PREFIX@/bin/python2.7
# Copyright 2004 Pierre Martineau <[email protected]>
# This file is part of Bibus, a bibliographic database that can
# work together with OpenOffice.org to generate bibliographic indexes.
diff -ruN bibus-1.5.2-orig/bibusStart.py bibus-1.5.2/bibusStart.py
--- bibus-1.5.2-orig/bibusStart.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/bibusStart.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# Copyright 2004,2005 Pierre Martineau <[email protected]>
# This file is part of Bibus, a bibliographic database that can
# work together with OpenOffice.org to generate bibliographic indexes.
diff -ruN bibus-1.5.2-orig/display_panel.py bibus-1.5.2/display_panel.py
--- bibus-1.5.2-orig/display_panel.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/display_panel.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: ISO-8859-1 -*-
# generated by wxGlade 0.4cvs on Sat Jan 28 19:07:42 2006
diff -ruN bibus-1.5.2-orig/lyx_remote.py bibus-1.5.2/lyx_remote.py
--- bibus-1.5.2-orig/lyx_remote.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/lyx_remote.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# lyx-remote -*- coding: iso-8859-1 -*-
# Copyright (c) 2005 Günter Milde
# Released under the terms of the GNU General Public License (ver. 2 or later)
diff -ruN bibus-1.5.2-orig/moveFile.py bibus-1.5.2/moveFile.py
--- bibus-1.5.2-orig/moveFile.py 2011-11-28 15:26:19.000000000 -0500
+++ bibus-1.5.2/moveFile.py 2013-11-02 20:36:31.000000000 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!@FINK_PREFIX@/bin/python2.7
# -*- coding: utf-8 -*-
# generated by wxGlade 0.6.3 on Sun Jun 28 15:24:06 2009