diff -Nru lo-menubar-0.1.0/debian/changelog lo-menubar-0.1.0/debian/changelog --- lo-menubar-0.1.0/debian/changelog 2011-09-09 07:51:06.000000000 +0000 +++ lo-menubar-0.1.0/debian/changelog 2012-02-27 20:23:44.000000000 +0000 @@ -1,3 +1,10 @@ +lo-menubar (0.1.0-0ubuntu4) precise; urgency=low + + * d/p/01-adapt-paths-for-libreoffice-3.5.patch: (LP: #935282) + Libreoffice3.5 dropped the basis link, adjust the patch to fix FTBFS + + -- Andreas Moog Mon, 27 Feb 2012 21:22:59 +0100 + lo-menubar (0.1.0-0ubuntu3) oneiric; urgency=low * Adapt to LibreOffice 3.4 paths to fix FTFBS - LP: #833889 diff -Nru lo-menubar-0.1.0/debian/patches/01-adapt-paths-for-libreoffice-3.4.patch lo-menubar-0.1.0/debian/patches/01-adapt-paths-for-libreoffice-3.4.patch --- lo-menubar-0.1.0/debian/patches/01-adapt-paths-for-libreoffice-3.4.patch 2011-09-09 07:51:06.000000000 +0000 +++ lo-menubar-0.1.0/debian/patches/01-adapt-paths-for-libreoffice-3.4.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -Description: Adapt to LibreOffice 3.4 paths to fix FTFBS - LP: #833889 - ---- lo-menubar-0.1.0.orig/wscript -+++ lo-menubar-0.1.0/wscript -@@ -24,21 +24,21 @@ def options(opt): - def configure(conf): - conf.load('compiler_cxx') - -- uno_sdk_libpath = '%s/basis3.3/sdk/lib' % Options.options.LO_PREFIX -+ uno_sdk_libpath = '%s/basis3.4/sdk/lib' % Options.options.LO_PREFIX - - conf.check_cxx(lib='uno_sal', uselib_store='SALLIB', libpath=uno_sdk_libpath, mandatory=True) - conf.check_cxx(lib='uno_cppu', uselib_store='CPPULIB', libpath=uno_sdk_libpath, mandatory=True) - #conf.check_cc(lib='uno_salhelpergcc3', uselib_store='SALHELPERLIB', mandatory=True) - conf.check_cxx(lib='uno_cppuhelpergcc3', uselib_store='CPPUHELPERLIB', libpath=uno_sdk_libpath, mandatory=True) - -- conf.find_program('cppumaker', var='CPPUMAKER', path_list=[Options.options.LO_PREFIX + '/basis3.3/sdk/bin'], mandatory=True) -+ conf.find_program('cppumaker', var='CPPUMAKER', path_list=[Options.options.LO_PREFIX + '/basis3.4/sdk/bin'], mandatory=True) - - conf.env['TYPES_RDB'] = conf.find_file('types.rdb', - path_list=[Options.options.URE_PREFIX + '/share/misc/'], - mandatory=True) - - conf.env['OFFAPI_RDB'] = conf.find_file('offapi.rdb', -- path_list=[Options.options.LO_PREFIX + '/basis3.3/program'], -+ path_list=[Options.options.LO_PREFIX + '/basis3.4/program'], - mandatory=True) - - conf.check_cfg(package='gio-2.0', uselib_store='GIO', -@@ -202,7 +202,7 @@ def build(bld): - # def post_install (ctx): - # if ctx.cmd != 'install': - # return --# ctx.exec_command ('/usr/lib/ure/bin/regcomp -register -wop="vnd.sun.star.expand:\$OOO_BASE_DIR/program/" -r /usr/lib/libreoffice/basis3.3/program/appmenu.rdb -c /usr/lib/libreoffice/basis3.3/program/%s.uno.so' % 'menubar') -+# ctx.exec_command ('/usr/lib/ure/bin/regcomp -register -wop="vnd.sun.star.expand:\$OOO_BASE_DIR/program/" -r /usr/lib/libreoffice/basis3.4/program/appmenu.rdb -c /usr/lib/libreoffice/basis3.4/program/%s.uno.so' % 'menubar') - # - # bld.add_post_fun (post_install) - diff -Nru lo-menubar-0.1.0/debian/patches/01-adapt-paths-for-libreoffice-3.5.patch lo-menubar-0.1.0/debian/patches/01-adapt-paths-for-libreoffice-3.5.patch --- lo-menubar-0.1.0/debian/patches/01-adapt-paths-for-libreoffice-3.5.patch 1970-01-01 00:00:00.000000000 +0000 +++ lo-menubar-0.1.0/debian/patches/01-adapt-paths-for-libreoffice-3.5.patch 2012-02-27 20:26:06.000000000 +0000 @@ -0,0 +1,40 @@ +Description: Adapt to LibreOffice 3.4 paths to fix FTFBS - LP: #833889 + +Index: lo-menubar-0.1.0/wscript +=================================================================== +--- lo-menubar-0.1.0.orig/wscript 2011-03-21 13:05:23.000000000 +0100 ++++ lo-menubar-0.1.0/wscript 2012-02-27 21:26:03.246574950 +0100 +@@ -24,21 +24,21 @@ + def configure(conf): + conf.load('compiler_cxx') + +- uno_sdk_libpath = '%s/basis3.3/sdk/lib' % Options.options.LO_PREFIX ++ uno_sdk_libpath = '%s/sdk/lib' % Options.options.LO_PREFIX + + conf.check_cxx(lib='uno_sal', uselib_store='SALLIB', libpath=uno_sdk_libpath, mandatory=True) + conf.check_cxx(lib='uno_cppu', uselib_store='CPPULIB', libpath=uno_sdk_libpath, mandatory=True) + #conf.check_cc(lib='uno_salhelpergcc3', uselib_store='SALHELPERLIB', mandatory=True) + conf.check_cxx(lib='uno_cppuhelpergcc3', uselib_store='CPPUHELPERLIB', libpath=uno_sdk_libpath, mandatory=True) + +- conf.find_program('cppumaker', var='CPPUMAKER', path_list=[Options.options.LO_PREFIX + '/basis3.3/sdk/bin'], mandatory=True) ++ conf.find_program('cppumaker', var='CPPUMAKER', path_list=[Options.options.LO_PREFIX + '/sdk/bin'], mandatory=True) + + conf.env['TYPES_RDB'] = conf.find_file('types.rdb', + path_list=[Options.options.URE_PREFIX + '/share/misc/'], + mandatory=True) + + conf.env['OFFAPI_RDB'] = conf.find_file('offapi.rdb', +- path_list=[Options.options.LO_PREFIX + '/basis3.3/program'], ++ path_list=[Options.options.LO_PREFIX + '/program/types/'], + mandatory=True) + + conf.check_cfg(package='gio-2.0', uselib_store='GIO', +@@ -202,7 +202,7 @@ + # def post_install (ctx): + # if ctx.cmd != 'install': + # return +-# ctx.exec_command ('/usr/lib/ure/bin/regcomp -register -wop="vnd.sun.star.expand:\$OOO_BASE_DIR/program/" -r /usr/lib/libreoffice/basis3.3/program/appmenu.rdb -c /usr/lib/libreoffice/basis3.3/program/%s.uno.so' % 'menubar') ++# ctx.exec_command ('/usr/lib/ure/bin/regcomp -register -wop="vnd.sun.star.expand:\$OOO_BASE_DIR/program/" -r /usr/lib/libreoffice/basis3.4/program/appmenu.rdb -c /usr/lib/libreoffice/basis3.4/program/%s.uno.so' % 'menubar') + # + # bld.add_post_fun (post_install) + diff -Nru lo-menubar-0.1.0/debian/patches/series lo-menubar-0.1.0/debian/patches/series --- lo-menubar-0.1.0/debian/patches/series 2011-09-09 07:51:06.000000000 +0000 +++ lo-menubar-0.1.0/debian/patches/series 2012-02-27 20:22:50.000000000 +0000 @@ -1 +1 @@ -01-adapt-paths-for-libreoffice-3.4.patch +01-adapt-paths-for-libreoffice-3.5.patch