diff -Nru mongodb-1.6.3/debian/changelog mongodb-1.6.3/debian/changelog --- mongodb-1.6.3/debian/changelog 2010-09-24 10:05:31.000000000 -0700 +++ mongodb-1.6.3/debian/changelog 2010-10-20 09:33:58.000000000 -0700 @@ -1,3 +1,21 @@ +mongodb (1:1.6.3-1ubuntu1) natty; urgency=low + + * Merge from debian unstable. (LP: #661513) Remaining changes: + - Providing a wrapper for xulrunner + - Moves all binaries under /usr/lib/mongodb + - adds xulwrapper script to mongodb-clients + - Sets up symlinks to xulwrapper in /usr/bin for all binaries in + /usr/lib/mongodb + - Adding dependency on xulrunner-1.9.2 to mongodb-clients as these + binaries require the library as well. + - patched buildscripts/hacks_ubuntu.py: removing rpath + because wrapper is used + - patch renamed to debian/patches/build-process-remove-rpath + - Removing debian/mongodb-server.lintian -- rpath is no longer used + - Removing debian/mongodb-clients.lintian -- rpath is no longer used + + -- Clint Byrum Wed, 20 Oct 2010 09:33:32 -0700 + mongodb (1:1.6.3-1) unstable; urgency=low * [0ad0c09] Imported Upstream version 1.6.3 @@ -37,6 +55,32 @@ -- Antonin Kral Thu, 15 Jul 2010 21:41:49 +0200 +mongodb (1:1.4.4-2ubuntu2) maverick; urgency=low + + * Providing a wrapper for xulrunner (LP: #557024) + - Moves all binaries under /usr/lib/mongodb + - adds xulwrapper script to mongodb-clients + - Sets up symlinks to xulwrapper in /usr/bin for all binaries in + /usr/lib/mongodb + - Adding dependency on xulrunner-1.9.2 to mongodb-clients as these + binaries require the library as well. + - patched SConstruct + buildscripts/hacks_ubuntu.py: removing rpath + because wrapper is used + - Removing debian/mongodb-server.lintian -- rpath is no longer used + - Removing debian/mongodb-clients.lintian -- rpath is no longer used + + -- Clint Byrum Tue, 05 Oct 2010 09:33:47 -0500 + +mongodb (1:1.4.4-2ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #605383). Remaining changes: + - debian/mongodb-server.mongodb.upstart: add upstart job. + - Add dependency on xulrunner-1.9.2 since mongodb requires libmozjs.so. + - Mark mongodb-{server,client,dev} as replacing mongodb to be able to + upgrade from Lucid. + + -- Angel Abad Sat, 10 Jul 2010 06:40:58 +0100 + mongodb (1:1.4.4-2) unstable; urgency=low * [3bd69dc] install libs to /usr/lib not /usr/lib64 (Closes: #588557) @@ -53,6 +97,21 @@ -- Antonin Kral Wed, 30 Jun 2010 09:32:45 +0200 +mongodb (1:1.4.3-2ubuntu1) maverick; urgency=low + + [ Clint Byrum ] + * Merge from Debian unstable (LP: #589566) + Remaining changes: + - debian/mongodb-server.mongodb.upstart: add upstart job. + + [ Mathias Gug ] + * debian/control: + - Add dependency on xulrunner-1.9.2 since mongodb requires libmozjs.so. + - Mark mongodb-{server,client,dev} as replacing mongodb to be able to + upgrade from Lucid. + + -- Mathias Gug Thu, 10 Jun 2010 15:25:34 -0400 + mongodb (1:1.4.3-2) unstable; urgency=low * [64bca3c] Updated copyright information as requested by Richard @@ -151,6 +210,19 @@ -- Antonin Kral Sat, 06 Mar 2010 22:55:17 +0100 +mongodb (1:1.2.2-1ubuntu1) lucid; urgency=low + + [ Richard M Kreuter ] + * debian/mongodb.conf: uncomment lines to support upstart (LP: #564198) + * debian/mongodb.upstart: only execute when available (LP: #564202) + * buildscripts/hacks_ubuntu.py: include nspr in CPPPATH (LP: #557024) + * scripting/engine_spidermonkey.h: include jsobj.h (LP: #557024) + + [ Emmet Hikory ] + * Integrate patches (raw): expecting resync when Debian uses new upstream + + -- Emmet Hikory Fri, 23 Apr 2010 00:43:22 +0900 + mongodb (1:1.2.2-1) unstable; urgency=low * this commit introduces stable version of MongoDB to Debian, hopefully to diff -Nru mongodb-1.6.3/debian/control mongodb-1.6.3/debian/control --- mongodb-1.6.3/debian/control 2010-09-24 10:05:31.000000000 -0700 +++ mongodb-1.6.3/debian/control 2010-10-15 12:09:39.000000000 -0700 @@ -1,7 +1,8 @@ Source: mongodb Section: database Priority: optional -Maintainer: Antonin Kral +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Antonin Kral Uploaders: Roberto C. Sanchez Build-Depends: debhelper (>= 7), libpcre3, libpcre3-dev, scons, xulrunner-dev (>= 1.9) | xulrunner-1.9-dev | xulrunner-1.9.1-dev, libreadline-dev, libboost1.42-dev | libboost1.40-dev | libboost1.35-dev | libboost1.37-dev | libboost1.38-dev, libboost-thread1.42-dev | libboost-thread1.40-dev | libboost-thread1.38-dev | libboost-thread1.37-dev | libboost-thread1.35-dev, libboost-filesystem1.42-dev | libboost-filesystem1.40-dev | libboost-filesystem1.38-dev | libboost-filesystem1.37-dev | libboost-filesystem1.35-dev, libboost-program-options1.42-dev | libboost-program-options1.40-dev | libboost-program-options1.38-dev | libboost-program-options1.37-dev | libboost-program-options1.35-dev, libboost-date-time1.42-dev | libboost-date-time1.40-dev | libboost-date-time1.38-dev | libboost-date-time1.37-dev | libboost-date-time1.35-dev Standards-Version: 3.9.1 @@ -32,7 +33,9 @@ Package: mongodb-server Architecture: i386 amd64 -Depends: mongodb-clients, ${shlibs:Depends}, ${misc:Depends}, adduser +Depends: mongodb-clients, ${shlibs:Depends}, ${misc:Depends}, adduser, + xulrunner-1.9.2 +Replaces: mongodb (<= 1:1.4.2-2) Description: An object/document-oriented database (server package) MongoDB is a high-performance, open source, schema-free document-oriented data store that's easy to deploy, manage @@ -55,7 +58,9 @@ Package: mongodb-clients Architecture: i386 amd64 -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, + xulrunner-1.9.2 +Replaces: mongodb (<= 1:1.4.2-2) Description: An object/document-oriented database (client apps) MongoDB is a high-performance, open source, schema-free document-oriented data store that's easy to deploy, manage @@ -80,6 +85,7 @@ Section: libdevel Architecture: i386 amd64 Depends: mongodb-server, ${shlibs:Depends}, ${misc:Depends} +Replaces: mongodb (<= 1:1.4.2-2) Description: An object/document-oriented database (development) MongoDB is a high-performance, open source, schema-free document-oriented data store that's easy to deploy, manage diff -Nru mongodb-1.6.3/debian/copyright mongodb-1.6.3/debian/copyright --- mongodb-1.6.3/debian/copyright 2010-09-24 10:05:31.000000000 -0700 +++ mongodb-1.6.3/debian/copyright 2010-10-06 02:15:38.000000000 -0700 @@ -228,3 +228,24 @@ L. Peter Deutsch ghost@aladdin.com + +Files: debian/xulwrapper +Copyright: Copyright (c) 2010, Canonical Ltd. +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + . + On Debian systems the full text of the license is available at + /usr/share/common-licenses/GPL-2 diff -Nru mongodb-1.6.3/debian/mongodb-clients.install mongodb-1.6.3/debian/mongodb-clients.install --- mongodb-1.6.3/debian/mongodb-clients.install 2010-09-24 10:05:31.000000000 -0700 +++ mongodb-1.6.3/debian/mongodb-clients.install 2010-10-06 02:15:38.000000000 -0700 @@ -1,11 +1,11 @@ -usr/bin/mongo -usr/bin/mongodump -usr/bin/mongoexport -usr/bin/mongofiles -usr/bin/mongoimport -usr/bin/mongorestore -usr/bin/mongostat -usr/share/lintian/overrides/mongodb-clients +usr/bin/mongo usr/lib/mongodb +usr/bin/mongodump usr/lib/mongodb +usr/bin/mongoexport usr/lib/mongodb +usr/bin/mongofiles usr/lib/mongodb +usr/bin/mongoimport usr/lib/mongodb +usr/bin/mongorestore usr/lib/mongodb +usr/bin/mongostat usr/lib/mongodb +debian/xulwrapper usr/lib/mongodb usr/share/man/man1/mongo.1 usr/share/man/man1/mongodump.1 usr/share/man/man1/mongoexport.1 diff -Nru mongodb-1.6.3/debian/mongodb-clients.lintian mongodb-1.6.3/debian/mongodb-clients.lintian --- mongodb-1.6.3/debian/mongodb-clients.lintian 2010-09-24 10:05:31.000000000 -0700 +++ mongodb-1.6.3/debian/mongodb-clients.lintian 1969-12-31 16:00:00.000000000 -0800 @@ -1,9 +0,0 @@ -# Agreed with upstream, that redefining rpath is necessary as xulrunner used to -# change API without changing so-name -mongodb-clients: binary-or-shlib-defines-rpath ./usr/bin/mongo /usr/lib64/xulrunner-1.9.1 -mongodb-clients: binary-or-shlib-defines-rpath ./usr/bin/mongodump /usr/lib64/xulrunner-1.9.1 -mongodb-clients: binary-or-shlib-defines-rpath ./usr/bin/mongoexport /usr/lib64/xulrunner-1.9.1 -mongodb-clients: binary-or-shlib-defines-rpath ./usr/bin/mongofiles /usr/lib64/xulrunner-1.9.1 -mongodb-clients: binary-or-shlib-defines-rpath ./usr/bin/mongoimport /usr/lib64/xulrunner-1.9.1 -mongodb-clients: binary-or-shlib-defines-rpath ./usr/bin/mongorestore /usr/lib64/xulrunner-1.9.1 -mongodb-clients: binary-or-shlib-defines-rpath ./usr/bin/mongostat /usr/lib64/xulrunner-1.9.1 diff -Nru mongodb-1.6.3/debian/mongodb-server.install mongodb-1.6.3/debian/mongodb-server.install --- mongodb-1.6.3/debian/mongodb-server.install 2010-09-24 10:05:31.000000000 -0700 +++ mongodb-1.6.3/debian/mongodb-server.install 2010-10-06 02:15:38.000000000 -0700 @@ -1,6 +1,5 @@ etc -usr/bin/mongod -usr/bin/mongos -usr/share/lintian/overrides/mongodb-server +usr/bin/mongod usr/lib/mongodb +usr/bin/mongos usr/lib/mongodb usr/share/man/man1/mongod.1 usr/share/man/man1/mongos.1 diff -Nru mongodb-1.6.3/debian/mongodb-server.lintian mongodb-1.6.3/debian/mongodb-server.lintian --- mongodb-1.6.3/debian/mongodb-server.lintian 2010-09-24 10:05:31.000000000 -0700 +++ mongodb-1.6.3/debian/mongodb-server.lintian 1969-12-31 16:00:00.000000000 -0800 @@ -1,4 +0,0 @@ -# Agreed with upstream, that redefining rpath is necessary as xulrunner used to -# change API without changing so-name -mongodb-server: binary-or-shlib-defines-rpath ./usr/bin/mongod /usr/lib64/xulrunner-1.9.1 -mongodb-server: binary-or-shlib-defines-rpath ./usr/bin/mongos /usr/lib64/xulrunner-1.9.1 diff -Nru mongodb-1.6.3/debian/mongodb-server.mongodb.upstart mongodb-1.6.3/debian/mongodb-server.mongodb.upstart --- mongodb-1.6.3/debian/mongodb-server.mongodb.upstart 1969-12-31 16:00:00.000000000 -0800 +++ mongodb-1.6.3/debian/mongodb-server.mongodb.upstart 2010-08-12 21:02:15.000000000 -0700 @@ -0,0 +1,15 @@ +# Ubuntu upstart file at /etc/init/mongodb.conf + +pre-start script + mkdir -p /var/lib/mongodb/ + mkdir -p /var/log/mongodb/ +end script + +start on runlevel [2345] +stop on runlevel [06] + +script + ENABLE_MONGODB="yes" + if [ -f /etc/default/mongodb ]; then . /etc/default/mongodb; fi + if [ "x$ENABLE_MONGODB" = "xyes" ]; then exec start-stop-daemon --start --quiet --chuid mongodb --exec /usr/bin/mongod -- --config /etc/mongodb.conf; fi +end script diff -Nru mongodb-1.6.3/debian/patches/build-process-remove-rpath mongodb-1.6.3/debian/patches/build-process-remove-rpath --- mongodb-1.6.3/debian/patches/build-process-remove-rpath 1969-12-31 16:00:00.000000000 -0800 +++ mongodb-1.6.3/debian/patches/build-process-remove-rpath 2010-10-20 09:32:54.000000000 -0700 @@ -0,0 +1,33 @@ +Description: Remove rpath from buildscripts/hacks_ubuntu.py + With the xulwrapper change, rpath has been removed from all aspects + and buildscripts/hacks_ubuntu.py has been changed to make the tests + work in a similar manner to the xulwrapper script. +Author: Clint Byrum +Bug-Ubuntu: https://bugs.launchpad.net/bugs/557024 + +--- + +--- mongodb-1.6.3.orig/buildscripts/hacks_ubuntu.py ++++ mongodb-1.6.3/buildscripts/hacks_ubuntu.py +@@ -36,7 +36,6 @@ def foundxulrunner( env , options ): + return False + + env.Prepend( LIBPATH=[ libroot ] ) +- env.Prepend( RPATH=[ libroot ] ) + + env.Prepend( CPPPATH=[ incroot + "stable/" , + incroot + "unstable/" , +@@ -44,6 +43,13 @@ def foundxulrunner( env , options ): + env.Prepend( CPPPATH=[ "/usr/include/nspr/" ] ) + + env.Append( CPPDEFINES=[ "XULRUNNER" , "OLDJS" ] ) ++ ++ # Needed to run tests ++ env.AppendENVPath('LD_LIBRARY_PATH', libroot) ++ ++ # Needed to run tests ++ env.AppendENVPath('LD_LIBRARY_PATH', libroot) ++ + if best.find( "1.9.0" ) >= 0 or best.endswith("1.9"): + if best.endswith( "1.9.1.9" ): + pass diff -Nru mongodb-1.6.3/debian/patches/series mongodb-1.6.3/debian/patches/series --- mongodb-1.6.3/debian/patches/series 2010-09-24 11:16:31.000000000 -0700 +++ mongodb-1.6.3/debian/patches/series 2010-10-20 09:28:56.000000000 -0700 @@ -1 +1,2 @@ debian-changes-1:1.6.3-1 +build-process-remove-rpath diff -Nru mongodb-1.6.3/debian/rules mongodb-1.6.3/debian/rules --- mongodb-1.6.3/debian/rules 2010-09-24 10:05:31.000000000 -0700 +++ mongodb-1.6.3/debian/rules 2010-10-06 02:15:38.000000000 -0700 @@ -70,6 +70,7 @@ rm -f buildinfo.cpp rm -rf debian/tmp-test rm -f debian/mongodb.upstart + chmod -x debian/xulwrapper dh_clean debian/files install: build @@ -80,12 +81,6 @@ scons --prefix=$(CURDIR)/debian/tmp/usr --full install - mkdir -p $(CURDIR)/debian/tmp/usr/share/lintian/overrides/ - install -m 644 $(CURDIR)/debian/mongodb-server.lintian \ - $(CURDIR)/debian/tmp/usr/share/lintian/overrides/mongodb-server - install -m 644 $(CURDIR)/debian/mongodb-clients.lintian \ - $(CURDIR)/debian/tmp/usr/share/lintian/overrides/mongodb-clients - mkdir -p $(CURDIR)/debian/tmp/etc install -m 644 $(CURDIR)/debian/mongodb.conf \ $(CURDIR)/debian/tmp/etc/mongodb.conf @@ -93,6 +88,8 @@ mkdir -p $(CURDIR)/debian/tmp/usr/share/man/man1 install -m 644 $(CURDIR)/debian/*.1 \ $(CURDIR)/debian/tmp/usr/share/man/man1 + chmod +x debian/xulwrapper + # Build architecture-independent files here. binary-indep: build install @@ -115,6 +112,8 @@ dh_installinit -pmongodb-server --name=mongodb # dh_installinfo dh_installman + for i in `ls debian/mongodb-server/usr/lib/mongodb` ; do dh_link -p mongodb-server usr/lib/mongodb/xulwrapper usr/bin/$$i ; done + for i in `ls debian/mongodb-clients/usr/lib/mongodb` ; do if [ "$$i" != "xulwrapper" ] ; then dh_link -p mongodb-clients usr/lib/mongodb/xulwrapper usr/bin/$$i ; fi ; done dh_link dh_strip dh_compress diff -Nru mongodb-1.6.3/debian/xulwrapper mongodb-1.6.3/debian/xulwrapper --- mongodb-1.6.3/debian/xulwrapper 1969-12-31 16:00:00.000000000 -0800 +++ mongodb-1.6.3/debian/xulwrapper 2010-10-03 22:52:24.000000000 -0700 @@ -0,0 +1,32 @@ +#!/bin/sh +# xulwrapper - a tiny wrapper for starting mongodb +# +# Copyright (c) 2010, Canonical Ltd. +# Author: Clint Byrum +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. +# +# This wrapper is necessary as xulrunner does not follow normal library sematics +# Please see https://bugs.launchpad.net/ubuntu/+source/xulrunner-1.9.2/+bug/286906 +# for more information. +# +export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/usr/lib/xulrunner-`xulrunner-1.9.2 --gre-version` +bname=`basename $0` +if [ "$bname" = "xulwrapper" ] ; then + echo xulwrapper must not be used to wrap itself. Paradox avoided. + exit 1 +fi +exec "/usr/lib/mongodb/$bname" "$@"