diff -crB mongodb-mongo-aa8b12e/buildscripts/hacks_ubuntu.py mongodb-mongo-1.1.3-debbuild/buildscripts/hacks_ubuntu.py *** mongodb-mongo-aa8b12e/buildscripts/hacks_ubuntu.py 2009-11-11 03:00:43.000000000 +1100 --- mongodb-mongo-1.1.3-debbuild/buildscripts/hacks_ubuntu.py 2009-11-13 11:02:59.000000000 +1100 *************** *** 10,24 **** def foundxulrunner( env , options ): best = None ! for x in os.listdir( "/usr/include" ): ! if x.find( "xulrunner" ) != 0: ! continue ! if x == "xulrunner": best = x break - best = x - if best is None: print( "warning: using ubuntu without xulrunner-dev. we reccomend installing it" ) return False --- 10,22 ---- def foundxulrunner( env , options ): best = None ! d = os.listdir( "/usr/include" ) ! d.sort(reverse=True) ! for x in d: ! if x.find( "xulrunner" ) >= 0: best = x break if best is None: print( "warning: using ubuntu without xulrunner-dev. we reccomend installing it" ) return False *************** *** 43,46 **** --- 41,52 ---- env.Append( CPPDEFINES=[ "XULRUNNER" , "OLDJS" ] ) if best.find( "1.9.0" ) >= 0: env.Append( CPPDEFINES=[ "XULRUNNER190" ] ) + elif os.path.isfile( "/usr/lib/pkgconfig/libxul.pc" ): + # This is actually a debian specific hack rather than ubuntu + for line in open( "/usr/lib/pkgconfig/libxul.pc" ): + if "Version:" in line and line.find( "1.9.0" ) >= 0: + print( "notice: using xulrunner 1.9.0 " ) + env.Append( CPPDEFINES=[ "XULRUNNER190" ] ) + break + return True diff -crB mongodb-mongo-aa8b12e/debian/control mongodb-mongo-1.1.3-debbuild/debian/control *** mongodb-mongo-aa8b12e/debian/control 2009-11-11 03:00:43.000000000 +1100 --- mongodb-mongo-1.1.3-debbuild/debian/control 2009-11-13 10:28:29.000000000 +1100 *************** *** 2,14 **** Section: devel Priority: optional Maintainer: Kristina Chodorow ! Build-Depends: debhelper (>= 7), libboost-dev, libpcre3, libpcre3-dev, scons, xulrunner-1.9-dev, libboost-thread-dev, libboost-filesystem-dev, libboost-program-options-dev, libboost-date-time-dev Standards-Version: 3.8.0 Homepage: http://www.mongodb.org Package: mongodb Architecture: any ! Depends: ${shlibs:Depends}, ${misc:Depends}, xulrunner-1.9-dev Description: An object/document-oriented database MongoDB is a high-performance, open source, schema-free document-oriented data store that's easy to deploy, manage --- 2,14 ---- Section: devel Priority: optional Maintainer: Kristina Chodorow ! Build-Depends: debhelper (>= 7), libboost-dev, libpcre3, libpcre3-dev, scons, xulrunner-1.9-dev | xulrunner-dev (>= 1.9.0), libboost-thread-dev, libboost-filesystem-dev, libboost-program-options-dev, libboost-date-time-dev Standards-Version: 3.8.0 Homepage: http://www.mongodb.org Package: mongodb Architecture: any ! Depends: ${shlibs:Depends}, ${misc:Depends}, xulrunner-1.9-dev | xulrunner-dev (>= 1.9.0) Description: An object/document-oriented database MongoDB is a high-performance, open source, schema-free document-oriented data store that's easy to deploy, manage