# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bratdaking@gmail.com-20130508223339-0fj8xmbn5r3frxhu # target_branch: file:///home/bdekoning/Ontwikkeling/Bibus/trunk/ # testament_sha1: 02c8bf2c9e687bf0a1eedb67bdaf3b624364ff70 # timestamp: 2013-05-09 00:35:05 +0200 # base_revision_id: package-import@ubuntu.com-20120212173309-\ # hx00hnszyyh5141l # # Begin patch === modified file 'Setup/Makefile' --- Setup/Makefile 2011-09-30 22:39:36 +0000 +++ Setup/Makefile 2013-05-08 21:52:34 +0000 @@ -1,9 +1,9 @@ # you presumably will only have to change the three first lines below DESTDIR = /usr/local python = /usr/bin/python -oopath = /usr/lib/openoffice/program -ooure = /usr/lib/openoffice.org/basis-link/ure-link/lib -oobasis = /usr/lib/openoffice/basis-link/program +oopath = /usr/lib/libreoffice/program +ooure = /usr/lib/libreoffice/ure-link/lib +oobasis = /usr/lib/libreoffice/program # prefix = $(DESTDIR) exec_prefix = $(prefix) === modified file 'Setup/bibus.1' --- Setup/bibus.1 2012-02-12 17:33:09 +0000 +++ Setup/bibus.1 2013-05-08 21:52:34 +0000 @@ -43,9 +43,9 @@ .br * on-line PubMed access .br - * OpenOffice.org connectivity: You can + * OpenOffice.org/LibreOffice connectivity: You can .br - - insert references in an opened OpenOffice.org text document + - insert references in an opened OpenOffice.org/LibreOffice text document .br - format the bibliography directly in Bibus .br @@ -55,7 +55,7 @@ .br * import of PubMed (Medline), EndNote/Refer, RIS and BibTeX records. .SH SEE ALSO -.BR openoffice (1) +.BR openoffice(1), libreoffice(1) .br .SH AUTHOR \fBbibus\fP was written by Pierre Martineau === modified file 'Setup/bibus.cfg' --- Setup/bibus.cfg 2009-01-30 13:14:38 +0000 +++ Setup/bibus.cfg 2013-05-08 21:52:34 +0000 @@ -1,6 +1,6 @@ [PATH] python = /usr/bin/python -oopath = /usr/lib/openoffice/program +oopath = /usr/lib/libreoffice/program docdir = /usr/local/share/doc/bibus/html licence = /usr/local/share/doc/bibus/copying localedir = /usr/local/share/locale === modified file 'Setup/bibus.sh' --- Setup/bibus.sh 2009-01-30 13:14:38 +0000 +++ Setup/bibus.sh 2013-05-08 21:52:34 +0000 @@ -1,4 +1,4 @@ #!/bin/sh -export LD_LIBRARY_PATH=/usr/lib/openoffice/program -export PYTHONPATH=/usr/lib/openoffice/program +export LD_LIBRARY_PATH=/usr/lib/libreoffice/program +export PYTHONPATH=/usr/lib/libreoffice/program exec /usr/bin/python /usr/local/share/bibus/bibus.py === modified file 'Setup/setup.py' --- Setup/setup.py 2009-01-30 13:14:38 +0000 +++ Setup/setup.py 2013-05-08 21:52:34 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env python # Copyright 2004,2005 Pierre Martineau # This file is part of Bibus, a bibliographic database that can -# work together with OpenOffice.org to generate bibliographic indexes. +# work together with OpenOffice.org/LibreOffice to generate bibliographic indexes. # # Bibus is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,7 +27,7 @@ os.system( """%r -O -c "import compileall; compileall.compile_dir(%r)" """ % (sys.executable,sourcedir) ) # compile optimized code # try to find the possible OOo path and return a list of path def find_OOpath(): - """Looks for OpenOffice or staroffice directories""" + """Looks for OpenOffice or StarOffice or LibreOffice directories""" if sys.platform.startswith('win'): pathlist = ('C:\\','C:\\Program Files','C:\\Programme') else: @@ -40,7 +40,7 @@ except OSError: filenames = () for filen in filenames: - if filen.lower().startswith('openoffice') or filen.lower().startswith('staroffice') or filen.lower().startswith('ooo'): + if filen.lower().startswith('openoffice') or filen.lower().startswith('staroffice') or filen.lower().startswith('ooo') or filen.lower().startswith('libreoffice'): tmp = os.path.join(path,filen) if os.path.isdir(tmp): OOo_dirs.append(os.path.join(tmp,'program')) # path to the pyuno directory @@ -105,15 +105,15 @@ # asking the user for the OOo path OOpaths = find_OOpath() if OOpaths: - oopath = wx.GetSingleChoice("I found %s OpenOffice.org installations.\nPlease select the correct one,\nOr 'Cancel' to choose another location."%len(OOpaths),\ + oopath = wx.GetSingleChoice("I found %s OpenOffice.org/LibreOffice installations.\nPlease select the correct one,\nOr 'Cancel' to choose another location."%len(OOpaths),\ "OpenOffice.org/program directory",OOpaths) # If no user choice, ask the user if not oopath: wx.MessageBox( \ """ -You did not select a valid path for you OpenOffice.org installation. +You did not select a valid path for you OpenOffice.org/LibreOffice installation. Please click in 'OK' then select the directory 'program' -located in your 'OpenOffice.org' directory. +located in your 'OpenOffice.org'/'LibreOffice' directory. Something like: /opt/OpenOffice.org1.1.3/program under GNU/linux C:\Program Files\OpenOffice.org1.1.3\program under Windows === modified file 'debian/changelog' --- debian/changelog 2012-02-12 17:33:09 +0000 +++ debian/changelog 2013-05-08 22:33:39 +0000 @@ -1,3 +1,10 @@ +bibus (1.5.2-1ubuntu1) unstable; urgency=low + + * Fix for libreoffice + - several fixes to connect to libreoffice + + -- Bart de Koning Tue, 23 Oct 2012 19:20:23 +0200 + bibus (1.5.2-1) unstable; urgency=low * New upstream release # Begin bundle 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 ckU4UJCCX3x9