diff options
25 files changed, 591 insertions, 103 deletions
@@ -553,7 +553,7 @@ elif "linux2" == os.sys.platform: if os.uname()[4] == "x86_64" and not force32: linux64 = True - nixLibPrefix = "lib64" + nixLibPrefix = "lib" env.Append( LIBPATH=["/usr/lib64" , "/lib64" ] ) env.Append( LIBS=["pthread"] ) diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..2d2b506 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,17 @@ +MongoDB for Debian +------------------ + +Binds only to localhost + + As mongo needs some tuning to become secure, it binds to localhost by + default. You can change this behavior in /etc/mongodb.conf by + editing/removing/commenting out bind_ip line. + +Why only for x86 and amd64? + + The mongodb server depends on both little-endianness and unaligned memory + access, which I believe means it can only work on i386 and amd64. We believe + that the mongodb will be useful even it is not available for all Debian + supported platforms. + +-- Antonin Kral <A.Kral@sh.cvut.cz>, Fri, 12 Feb 2010 09:19, +0100 diff --git a/debian/changelog b/debian/changelog index 529c796..397d246 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,98 +1,190 @@ -mongodb (1.6.0) unstable; urgency=low +mongodb (1:1.6.0-1) unstable; urgency=low - * replica_sets some fixes - * sharding some fixes with rs - * full change log http://jira.mongodb.org/browse/SERVER/fixforversion/10183 + * [7645618] Imported Upstream version 1.6.0 + * [7ae74af] install libs to /usr/lib not /usr/lib64 + * [45c6766] use prefix and smokedbprefix -mongodb (1.6.0) unstable; urgency=low + -- Antonin Kral <A.Kral@sh.cvut.cz> Wed, 11 Aug 2010 13:19:25 +0200 - * sharding stable - * replica_sets stable +mongodb (1:1.4.4-3) unstable; urgency=low -mongodb (1.5.8) unstable; urgency=low + * [1576744] added libreadline-dev to build-deps (Closes: #589163) - * sharding lots of changes - * replica_sets lots of changes + -- Antonin Kral <A.Kral@sh.cvut.cz> Thu, 15 Jul 2010 21:41:49 +0200 +mongodb (1:1.4.4-2) unstable; urgency=low -mongodb (1.5.7) unstable; urgency=low + * [3bd69dc] install libs to /usr/lib not /usr/lib64 (Closes: #588557) - * sharding lots of changes - * replica_sets lots of changes + -- Antonin Kral <A.Kral@sh.cvut.cz> Fri, 09 Jul 2010 21:26:05 +0200 - -- Richard Kreuter <richard@10gen.com> Fri, 30 Jul 2010 16:56:28 -0500 +mongodb (1:1.4.4-1) unstable; urgency=low + * [5c6a221] Imported Upstream version 1.4.4 + * upstream change log is at + http://jira.mongodb.org/browse/SERVER/fixforversion/10166 + * [68c73c3] removed not needed files from upstream + * [c1546df] debian policy to 3.9.0 -mongodb (1.5.6) unstable; urgency=low + -- Antonin Kral <A.Kral@sh.cvut.cz> Wed, 30 Jun 2010 09:32:45 +0200 - * sharding lots of changes, see http://jira.mongodb.org/browse/SERVER/fixforversion/10179 +mongodb (1:1.4.3-2) unstable; urgency=low - -- Richard Kreuter <richard@10gen.com> Sat, 24 Jul 2010 16:56:28 -0500 + * [64bca3c] Updated copyright information as requested by Richard + Kreuter -mongodb (1.5.5) unstable; urgency=low + -- Antonin Kral <A.Kral@sh.cvut.cz> Mon, 07 Jun 2010 08:27:36 +0200 - * sharding lots of changes, see http://jira.mongodb.org/browse/SERVER/fixforversion/10157 +mongodb (1:1.4.3-1) unstable; urgency=low - -- Richard Kreuter <richard@10gen.com> Fri, 16 Jul 2010 16:56:28 -0500 + * New upstream version 1.4.3 + * Change log 1.4.3 + http://jira.mongodb.org/browse/SERVER/fixforversion/10156 + * added log to dirs to fix piuparts error -mongodb (1.5.4) unstable; urgency=low + -- Antonin Kral <A.Kral@sh.cvut.cz> Sun, 30 May 2010 10:14:05 +0200 - * sharding lots of changes, see http://jira.mongodb.org/browse/SERVER/fixforversion/10157 +mongodb (1:1.4.2-3) unstable; urgency=low - -- Richard Kreuter <richard@10gen.com> Fri, 2 Jul 2010 16:56:28 -0500 + * Clean up debian/copyright + * Fix various typos + * Generally make lintian happy + * Change section of mongodb-dev from database to libdevel (now matches + archive override file) + * Properly express copyrights + * Fix typo in manpage + * Remove unused lintian override. + * Install usr/lib64 instead of usr/lib in mongodb-dev + * updated watch file to actually work and report available + stable releases -mongodb (1.5.3) unstable; urgency=low + -- Antonin Kral <A.Kral@sh.cvut.cz> Tue, 11 May 2010 22:21:13 +0200 - * sharding lots of changes, see http://jira.mongodb.org/browse/SERVER/fixforversion/10157 +mongodb (1:1.4.2-2) unstable; urgency=low - -- Richard Kreuter <richard@10gen.com> Thu, 17 Jun 2010 16:56:28 -0500 + * Split single binary package into mongodb-server, mongodb-dev, and + mongodb-clients. -mongodb (1.5.2) unstable; urgency=low + -- Roberto C. Sanchez <roberto@connexer.com> Thu, 06 May 2010 21:20:52 -0400 - * sharding lots of changes, see http://jira.mongodb.org/browse/SERVER/fixforversion/10143 +mongodb (1:1.4.2-1) unstable; urgency=low - -- Richard Kreuter <richard@10gen.com> Wed, 27 May 2010 16:56:28 -0500 + * [4770a09] New upstream version 1.4.2 + * changelog for 1.4.1 + http://jira.mongodb.org/browse/SERVER/fixforversion/10144 + * changelog for 1.4.2 + http://jira.mongodb.org/browse/SERVER/fixforversion/10155 -mongodb (1.5.1) unstable; urgency=low + -- Antonin Kral <A.Kral@sh.cvut.cz> Tue, 27 Apr 2010 19:55:04 +0200 - * sharding lots of changes, see http://jira.mongodb.org/browse/SERVER/fixforversion/10142 +mongodb (1:1.4.0-2) unstable; urgency=low - -- Richard Kreuter <richard@10gen.com> Wed, 3 May 2010 16:56:28 -0500 + * added Roberto C. Sanchez as co-maintainer -mongodb (1.5.0) unstable; urgency=low + -- Antonin Kral <A.Kral@sh.cvut.cz> Fri, 09 Apr 2010 21:40:49 +0200 - * replication w & real-time, see http://jira.mongodb.org/browse/SERVER/fixforversion/10125 +mongodb (1:1.4.0-1) unstable; urgency=low - -- Richard Kreuter <richard@10gen.com> Wed, 22 Mar 2010 16:56:28 -0500 + * [0ca01a9] Imported Upstream version 1.4.0 + * [76c18ea] removed not needed files for debian + * [c1578d9] merged changes from debianization from 1.2.4 + * full upstream changelog + http://jira.mongodb.org/secure/IssueNavigator.jspa?requestId=10080 + * upstream release notes + http://www.mongodb.org/display/DOCS/1.4+Release+Notes + -- Antonin Kral <A.Kral@sh.cvut.cz> Thu, 25 Mar 2010 19:44:59 +0100 -mongodb (1.3.5) unstable; urgency=low +mongodb (1:1.2.4-1) unstable; urgency=low - * bug fixes + * [c3803a1] Imported Upstream version 1.2.4 + * [ab4e0c8] removal of unnecessary files for Debian from upstream + source + * changelog for upstream at + http://jira.mongodb.org/browse/SERVER/fixforversion/10130 - -- Richard Kreuter <richard@10gen.com> Wed, 22 Mar 2010 16:56:28 -0500 + -- Antonin Kral <A.Kral@sh.cvut.cz> Wed, 17 Mar 2010 10:18:01 +0100 -mongodb (1.3.4) unstable; urgency=low +mongodb (1:1.2.2-4) unstable; urgency=low - * bufg fixes + * ensure removal of upstart script as upload of repacked source is failing - -- Richard Kreuter <richard@10gen.com> Wed, 17 Mar 2010 16:56:28 -0500 + -- Antonin Kral <A.Kral@sh.cvut.cz> Wed, 10 Mar 2010 07:29:38 +0100 -mongodb (1.3.3) unstable; urgency=low +mongodb (1:1.2.2-3) unstable; urgency=low - * geo + * [aced2f4] removed unnecessary dependency (Closes: #572873) + * [ce78acd] Added call for tests to ensure correct build + (Closes: #570106) - -- Richard Kreuter <richard@10gen.com> Fri, 05 Feb 2010 16:56:28 -0500 + -- Antonin Kral <A.Kral@sh.cvut.cz> Sun, 07 Mar 2010 21:07:37 +0100 -mongodb (1.3.2) unstable; urgency=low +mongodb (1:1.2.2-2) unstable; urgency=low - * munged debian files + * [49232f8] removed upstart, it is buggy + not supported in Debian + (Closes: #572812) - -- Richard Kreuter <richard@10gen.com> Fri, 05 Feb 2010 16:56:28 -0500 + -- Antonin Kral <A.Kral@sh.cvut.cz> Sat, 06 Mar 2010 22:55:17 +0100 -mongodb (1.3.1) unstable; urgency=low +mongodb (1:1.2.2-1) unstable; urgency=low - * Initial release + * this commit introduces stable version of MongoDB to Debian, hopefully to + be included in upcoming stable (Closes: #570148) + * [2fede57] Upstream release 1.2.2, based on commit + fc3d3acafc253da085f7d0cdcd91059cc9bcd8e3 + * [d21668d] versionString changed from "1.2.3-" to "1.2.2" + * [5a8e160] removed debian/files + * [26f3ec2] removed empty preinst + * [5d12fec] removed unnecessary jars + * [978f619] removed unused lib + * [7157b84] Changed maintainer of the package + * [0a939b5] mongo should build only on i386 and amd64 + * [f3e7db5] generate list of manpages + * [bcd0d12] database section is probably more appropriate + * [7bec42f] clarification of licensing terms + * [c74fd7d] bumped standards version + * [357da67] merged the rest of debian changes from 1.3 - -- Kristina Chodorow <kristina@10gen.com> Tue, 07 Apr 2009 10:18:58 -0400 + -- Antonin Kral <A.Kral@sh.cvut.cz> Wed, 17 Feb 2010 08:50:07 +0100 + +mongodb (1.3.1-3) unstable; urgency=low + + * [ff792f5] Reordered Build-Depends to enable automated with buildd + (Closes: #570072) + * [4d5a2c1] Added support of nostrip and debug DEB_BUILD_OPTIONS + (Closes: #570077) + * [cbc4e8b] Describe why is mongodb available for some architectures + only (Closes: #570076) + + -- Antonin Kral <A.Kral@sh.cvut.cz> Tue, 16 Feb 2010 21:59:56 +0100 + +mongodb (1.3.1-2) unstable; urgency=low + + * [efabc21] change order of build deps of xul-runner to fix sbuild + (Closes: #569417) + * [55e3c9b] added support for mongod config file + * [88a7135] added README.Debian with note about bind_ip set to + localhost + + -- Antonin Kral <A.Kral@sh.cvut.cz> Fri, 12 Feb 2010 09:37:23 +0100 + +mongodb (1.3.1-1) unstable; urgency=low + + * Initial release (Closes: #523937) + * [5cd4d87] rebuild original sources to remove debian/files + * [4a84263] Removed empty preinst + * [9698ffb] Changed maintainer of the package + * [4486a47] mongo should build only on i386 and amd64 + * [5842c04] no need for creating home-dir for mongo user + * [f47e39e] Added missing manpages + * [987cd73] generate list of manpages + * [e3336d8] used more specific build-depeneds, thanks to Richard + Kreuter <richard@10gen.com> + * [ba8697c] removed unnecessary jars dir with its content + * [91fe1cf] cover licensing terms of used components + * [d59c02f] init.d cleanup + * [78d712b] cover licensing terms of utils/md5.[ch] + * [a696359] removed lib/ from upstream + + -- Antonin Kral <A.Kral@sh.cvut.cz> Fri, 29 Jan 2010 19:48:45 +0100 diff --git a/debian/control b/debian/control index 2aef1c3..8e22de7 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,16 @@ Source: mongodb -Section: devel +Section: database Priority: optional -Maintainer: Richard Kreuter <richard@10gen.com> -Build-Depends: debhelper (>= 7), libpcre3, libpcre3-dev, scons, xulrunner-dev, libboost1.35-dev | libboost1.37-dev | libboost1.38-dev | libboost1.40-dev, libboost-thread1.35-dev | libboost-thread1.37-dev | libboost-thread1.38-dev | libboost-thread1.40-dev, libboost-filesystem1.35-dev | libboost-filesystem1.37-dev | libboost-filesystem1.38-dev | libboost-filesystem1.40-dev, libboost-program-options1.35-dev | libboost-program-options1.37-dev | libboost-program-options1.38-dev | libboost-program-options1.40-dev, libboost-date-time1.35-dev | libboost-date-time1.37-dev | libboost-date-time1.38-dev | libboost-date-time1.40-dev, libpcap-dev, libreadline-dev -Standards-Version: 3.8.0 +Maintainer: Antonin Kral <A.Kral@sh.cvut.cz> +Uploaders: Roberto C. Sanchez <roberto@connexer.com> +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 Homepage: http://www.mongodb.org Package: mongodb -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, xulrunner-dev -Description: An object/document-oriented database +Architecture: i386 amd64 +Depends: mongodb-server, mongodb-dev, ${shlibs:Depends}, ${misc:Depends} +Description: An object/document-oriented database (metapackage) MongoDB is a high-performance, open source, schema-free document-oriented data store that's easy to deploy, manage and use. It's network accessible, written in C++ and offers @@ -26,4 +27,76 @@ Description: An object/document-oriented database . High performance, scalability, and reasonable depth of functionality are the goals for the project. + . + This is a metapackage that depends on all the mongodb parts. + +Package: mongodb-server +Architecture: i386 amd64 +Depends: mongodb-clients, ${shlibs:Depends}, ${misc:Depends}, adduser +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 + and use. It's network accessible, written in C++ and offers + the following features : + . + * Collection oriented storage - easy storage of object- + style data + * Full index support, including on inner objects + * Query profiling + * Replication and fail-over support + * Efficient storage of binary data including large + objects (e.g. videos) + * Auto-sharding for cloud-level scalability (Q209) + . + High performance, scalability, and reasonable depth of + functionality are the goals for the project. + . + This package contains the server itself. + +Package: mongodb-clients +Architecture: i386 amd64 +Depends: ${shlibs:Depends}, ${misc:Depends} +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 + and use. It's network accessible, written in C++ and offers + the following features : + . + * Collection oriented storage - easy storage of object- + style data + * Full index support, including on inner objects + * Query profiling + * Replication and fail-over support + * Efficient storage of binary data including large + objects (e.g. videos) + * Auto-sharding for cloud-level scalability (Q209) + . + High performance, scalability, and reasonable depth of + functionality are the goals for the project. + . + This package contains the various client applications. + +Package: mongodb-dev +Section: libdevel +Architecture: i386 amd64 +Depends: mongodb-server, ${shlibs:Depends}, ${misc:Depends} +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 + and use. It's network accessible, written in C++ and offers + the following features : + . + * Collection oriented storage - easy storage of object- + style data + * Full index support, including on inner objects + * Query profiling + * Replication and fail-over support + * Efficient storage of binary data including large + objects (e.g. videos) + * Auto-sharding for cloud-level scalability (Q209) + . + High performance, scalability, and reasonable depth of + functionality are the goals for the project. + . + Development headers and libraries. diff --git a/debian/copyright b/debian/copyright index 478c6f9..2a9aea5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,6 @@ -This package was debianized by Kristina Chodorow <kristina@10gen.com> on -Tue, 07 Apr 2009 10:18:58 -0400. +This package was debianized + by Kristina Chodorow <kristina@10gen.com> + and Antonin Kral <A.Kral@bobek.cz> It was downloaded from http://www.mongodb.org @@ -11,13 +12,219 @@ Upstream Authors: Michael Dirolf Kristina Chodorow +Debian Maintainers: + + Antonin Kral + Roberto C. Sanchez + Copyright: - 2009 10gen + Copyright (c) 2009 10gen License: - AGPL + Apache License 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + On a Debian system, the license can be found at + /usr/share/common-licenses/Apache-2.0 + + AGPL 3.0 + http://www.fsf.org/licensing/licenses/agpl-3.0.html + +The Debian packaging is Copyright (c) 2009, 2010, Kristina Chodorow <kristina@10gen.com>, Antonin Kral <A.Kral@bobek.cz> and Roberto C. Sanchez <roberto@connexer.com>. It is licensed under the AGPL, but will be relicensed under Apache License 2.0. + +Some parts of MongoDB are licensed under the AGPL, others are Apache 2.0. Please see individual source files for details. + +MongoDB uses third-party libraries or other resources that may be distributed under licenses different than the MongoDB software. Feel free to open a bug report if you find component which has different license and is not covered here. Your use of the source code for the these components is subject to the terms and conditions of the following licenses. + +License Notice for SCONS +------------------------ + +/usr/share/common-licenses/GPL-2 + +SCONS and it components, generated code and utilities (e.g. gch.py) are + licensed under GPL 2. + + +License Notice for Boost +------------------------ + + +http://www.boost.org/LICENSE_1_0.txt + + Boost Software License - Version 1.0 - August 17th, 2003 + + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + +License Notice for V8 +--------------------- + +http://code.google.com/p/v8/source/browse/trunk/LICENSE + + This license applies to all parts of V8 that are not externally + maintained libraries. The externally maintained libraries used by V8 + are: + + - Jscre, located under third_party/jscre. This code is copyrighted + by the University of Cambridge and Apple Inc. and released under a + 2-clause BSD license. + + - Dtoa, located under third_party/dtoa. This code is copyrighted by + David M. Gay and released under an MIT license. + + - Strongtalk assembler, the basis of the files assembler-arm-inl.h, + assembler-arm.cc, assembler-arm.h, assembler-ia32-inl.h, + assembler-ia32.cc, assembler-ia32.h, assembler.cc and assembler.h. + This code is copyrighted by Sun Microsystems Inc. and released + under a 3-clause BSD license. + + These libraries have their own licenses; we recommend you read them, + as their terms may differ from the terms below. + + Copyright 2006-2008, Google Inc. All rights reserved. + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License Notice for PCRE +----------------------- + +http://www.pcre.org/licence.txt + + PCRE LICENCE + ------------ + + PCRE is a library of functions to support regular expressions whose syntax + and semantics are as close as possible to those of the Perl 5 language. + + Release 7 of PCRE is distributed under the terms of the "BSD" licence, as + specified below. The documentation for PCRE, supplied in the "doc" + directory, is distributed under the same terms as the software itself. + + The basic library functions are written in C and are freestanding. Also + included in the distribution is a set of C++ wrapper functions. + + + THE BASIC LIBRARY FUNCTIONS + --------------------------- + + Written by: Philip Hazel + Email local part: ph10 + Email domain: cam.ac.uk + + University of Cambridge Computing Service, + Cambridge, England. + + Copyright (c) 1997-2008 University of Cambridge + All rights reserved. + + + THE C++ WRAPPER FUNCTIONS + ------------------------- + + Contributed by: Google Inc. + + Copyright (c) 2007-2008, Google Inc. + All rights reserved. + + + THE "BSD" LICENCE + ----------------- + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the name of Google + Inc. nor the names of their contributors may be used to endorse or + promote products derived from this software without specific prior + written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + +License for md5 implementation +------------------------------ + + md5 algorithm implementation (utils/md5.[ch]) is licensed under modified BSD + License. + + Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved. + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. -The Debian packaging is (C) 2009, Kristina Chodorow <kristina@10gen.com> and -is licensed under the AGPL, see `http://www.fsf.org/licensing/licenses/agpl-3.0.html'. + L. Peter Deutsch + ghost@aladdin.com diff --git a/debian/lintian-overrides b/debian/lintian-overrides deleted file mode 100644 index c843e9e..0000000 --- a/debian/lintian-overrides +++ /dev/null @@ -1,11 +0,0 @@ -# Agreed with upstream, that redefining rpath is necessary as xulrunner used to -# change API without changing so-name -mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongo /usr/lib64/xulrunner-1.9.1 -mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongod /usr/lib64/xulrunner-1.9.1 -mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongodump /usr/lib64/xulrunner-1.9.1 -mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongoexport /usr/lib64/xulrunner-1.9.1 -mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongofiles /usr/lib64/xulrunner-1.9.1 -mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongoimport /usr/lib64/xulrunner-1.9.1 -mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongorestore /usr/lib64/xulrunner-1.9.1 -mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongos /usr/lib64/xulrunner-1.9.1 -mongodb: binary-or-shlib-defines-rpath ./usr/bin/mongosniff /usr/lib64/xulrunner-1.9.1 diff --git a/debian/mongodb-clients.dirs b/debian/mongodb-clients.dirs new file mode 100644 index 0000000..e772481 --- /dev/null +++ b/debian/mongodb-clients.dirs @@ -0,0 +1 @@ +usr/bin diff --git a/debian/mongodb-clients.install b/debian/mongodb-clients.install new file mode 100644 index 0000000..ed4208b --- /dev/null +++ b/debian/mongodb-clients.install @@ -0,0 +1,18 @@ +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/share/man/man1/mongo.1 +usr/share/man/man1/mongodump.1 +usr/share/man/man1/mongoexport.1 +usr/share/man/man1/mongofiles.1 +usr/share/man/man1/mongoimport.1 +usr/share/man/man1/mongoimportjson.1 +usr/share/man/man1/mongorestore.1 +usr/share/man/man1/mongosniff.1 +usr/share/man/man1/mongostat.1 + diff --git a/debian/mongodb-clients.lintian b/debian/mongodb-clients.lintian new file mode 100644 index 0000000..05cea14 --- /dev/null +++ b/debian/mongodb-clients.lintian @@ -0,0 +1,9 @@ +# 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 --git a/debian/mongodb-dev.dirs b/debian/mongodb-dev.dirs new file mode 100644 index 0000000..da07fdd --- /dev/null +++ b/debian/mongodb-dev.dirs @@ -0,0 +1,2 @@ +usr/include +usr/lib diff --git a/debian/mongodb-dev.install b/debian/mongodb-dev.install new file mode 100644 index 0000000..da07fdd --- /dev/null +++ b/debian/mongodb-dev.install @@ -0,0 +1,2 @@ +usr/include +usr/lib diff --git a/debian/dirs b/debian/mongodb-server.dirs index a7b6e78..3baae15 100644 --- a/debian/dirs +++ b/debian/mongodb-server.dirs @@ -1,3 +1,4 @@ +etc usr/bin -usr/sbin var/lib/mongodb +var/log/mongodb diff --git a/debian/mongodb-server.install b/debian/mongodb-server.install new file mode 100644 index 0000000..4b08534 --- /dev/null +++ b/debian/mongodb-server.install @@ -0,0 +1,6 @@ +etc +usr/bin/mongod +usr/bin/mongos +usr/share/lintian/overrides/mongodb-server +usr/share/man/man1/mongod.1 +usr/share/man/man1/mongos.1 diff --git a/debian/mongodb-server.lintian b/debian/mongodb-server.lintian new file mode 100644 index 0000000..982b78d --- /dev/null +++ b/debian/mongodb-server.lintian @@ -0,0 +1,4 @@ +# 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 --git a/debian/init.d b/debian/mongodb-server.mongodb.init index 47a10a0..34e8c0f 100644 --- a/debian/init.d +++ b/debian/mongodb-server.mongodb.init @@ -86,8 +86,7 @@ DIETIME=10 # Time to wait for the server to die, in seconds # 'restart' will not work DAEMONUSER=${DAEMONUSER:-mongodb} -DAEMON_OPTS=${DAEMON_OPTS:-"--dbpath $DATA --logpath $LOGFILE run"} -DAEMON_OPTS="$DAEMON_OPTS --config $CONF" +DAEMON_OPTS=${DAEMON_OPTS:-"--dbpath $DATA --logpath $LOGFILE --config $CONF run"} set -e diff --git a/debian/postinst b/debian/mongodb-server.postinst index 4d0e786..4d0e786 100644 --- a/debian/postinst +++ b/debian/mongodb-server.postinst diff --git a/debian/postrm b/debian/mongodb-server.postrm index 4bbb708..4bbb708 100644 --- a/debian/postrm +++ b/debian/mongodb-server.postrm diff --git a/debian/prerm b/debian/mongodb-server.prerm index 9507ade..9507ade 100644 --- a/debian/prerm +++ b/debian/mongodb-server.prerm diff --git a/debian/mongodb.conf b/debian/mongodb.conf index 6a5de05..195a8a2 100644 --- a/debian/mongodb.conf +++ b/debian/mongodb.conf @@ -12,6 +12,7 @@ logpath=/var/log/mongodb/mongodb.log logappend=true +bind_ip = 127.0.0.1 #port = 27017 diff --git a/debian/mongoimport.1 b/debian/mongoimport.1 index 4b6c3de..a1d3751 100644 --- a/debian/mongoimport.1 +++ b/debian/mongoimport.1 @@ -35,7 +35,7 @@ be more verbose (include multiple times for more verbosity e.g. \fB\-vvvvv\fR) .TP .B \-f, \-\-fields NAMES -comma seperated list of field names e.g. \fB\-f\fR name,age +comma separated list of field names e.g. \fB\-f\fR name,age .TP .B \-\-fieldFile FILE file with fields names \- 1 per line diff --git a/debian/mongoimportjson.1 b/debian/mongoimportjson.1 new file mode 100644 index 0000000..5f3f450 --- /dev/null +++ b/debian/mongoimportjson.1 @@ -0,0 +1,45 @@ +.\" Documentation for the MongoDB shell +.TH MONGOIMPORTJSON "1" "June 2009" "10gen" "Mongo Database" +.SH "NAME" +mongoimportjson \- the Mongo import tool +.SH "SYNOPSIS" +\fBmongoimportjson [\fIOPTIONS\fR]\fR +.SH "DESCRIPTION" +.PP +\fBmongoimportjson\fR +is a tool to import JSON documents into MongoDB. This utility takes a single file that contains one JSON string per line and inserts it. A databaase and collection must be specified. +.SH "OPTIONS" +.TP +.B \-\-help +show usage information +.TP +.B \-h, \-\-host HOST +server to connect to (default HOST=localhost) +.TP +.B \-d, \-\-db DATABASE +database to use +.TP +.B \-c, \-\-c COLLECTION +collection to use +.TP +.B \-\-file FILE +file from which to import +.TP +.B \-\-dbpath PATH +directly access mongod data files in this path, instead of connecting to a mongod instance +.TP +.B \-\-idbefore +create id index before importing +.TP +.B \-\-id +create id index after importing (recommended) +.TP +.B \-\-drop +drop collection before importing +.SH "COPYRIGHT" +.PP +Copyright 2007\-2009 10gen +.SH "SEE ALSO" +For more information, please refer to the MongoDB wiki, available at http://www.mongodb.org. +.SH "AUTHOR" +Kristina Chodorow diff --git a/debian/mongostat.1 b/debian/mongostat.1 index 5828104..e219060 100644 --- a/debian/mongostat.1 +++ b/debian/mongostat.1 @@ -1,5 +1,5 @@ .\" Documentation for the MongoDB shell -.TH MONGOSTAT "15" "March 2010" "10gen" "Mongo Database" +.TH MONGOSTAT "1" "March 2010" "10gen" "Mongo Database" .SH "NAME" mongostat \- view statistics on a running mongod instance .SH "SYNOPSIS" diff --git a/debian/rules b/debian/rules index 2afdfdb..61118b1 100644..100755 --- a/debian/rules +++ b/debian/rules @@ -9,11 +9,20 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# debug and nostrip is effectively equivalent for current version of scons +# build system in current mongodb revision +DEB_SCONS_FLAGS := +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + DEB_SCONS_FLAGS := --d=DEBUGBUILD +endif +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + DEB_SCONS_FLAGS := --d=DEBUGBUILD +endif configure: configure-stamp configure-stamp: dh_testdir - # Add here commands to configure the package. + # Add here commands to configure the package. touch configure-stamp @@ -23,10 +32,13 @@ build: build-stamp build-stamp: configure-stamp dh_testdir - # Add here commands to compile the package. - scons - #docbook-to-man debian/mongodb.sgml > mongodb.1 - ls debian/*.1 > debian/mongodb.manpages + # Add here commands to compile the package. + scons $(DEB_SCONS_FLAGS) + #docbook-to-man debian/mongodb.sgml > mongodb.1 + + #run regression tests + scons --smokedbprefix=$(CURDIR)/debian/tmp-test smoke + rm -rf $(CURDIR)/debian/tmp-test touch $@ @@ -35,10 +47,10 @@ clean: dh_testroot rm -f build-stamp configure-stamp + rm -rf $(CURDIR)/debian/tmp # FIXME: scons freaks out at the presence of target files - # under debian/mongodb. - #scons -c - rm -rf $(CURDIR)/debian/mongodb + # under debian/tmp. + scons -c rm -f config.log rm -f mongo rm -f mongod @@ -56,6 +68,8 @@ clean: rm -f buildscripts/*.pyc rm -f *.pyc rm -f buildinfo.cpp + rm -rf debian/tmp-test + rm -f debian/mongodb.upstart dh_clean debian/files install: build @@ -64,13 +78,21 @@ install: build dh_prep dh_installdirs - scons --prefix=$(CURDIR)/debian/mongodb/usr install - mkdir -p $(CURDIR)/debian/mongodb/etc - cp $(CURDIR)/debian/mongodb.conf $(CURDIR)/debian/mongodb/etc/mongodb.conf + 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 - mkdir -p $(CURDIR)/debian/mongodb/usr/share/lintian/overrides/ - install -m 644 $(CURDIR)/debian/lintian-overrides \ - $(CURDIR)/debian/mongodb/usr/share/lintian/overrides/mongodb + mkdir -p $(CURDIR)/debian/tmp/usr/share/man/man1 + install -m 644 $(CURDIR)/debian/*.1 \ + $(CURDIR)/debian/tmp/usr/share/man/man1 # Build architecture-independent files here. binary-indep: build install @@ -83,14 +105,14 @@ binary-arch: build install dh_installchangelogs dh_installdocs dh_installexamples -# dh_install + dh_install # dh_installmenu # dh_installdebconf # dh_installlogrotate # dh_installemacsen # dh_installpam # dh_installmime - dh_installinit + dh_installinit -pmongodb-server --name=mongodb # dh_installinfo dh_installman dh_link diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch index 08ce42b..fe69ebb 100644 --- a/debian/watch +++ b/debian/watch @@ -1,10 +1,9 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - # Compulsory line, this is a version 3 file version=3 -# examine a Webserver directory -http://downloads.mongodb.org/linux/mongodb-linux-(.*)\.tar\.gz +# examine the content of the downloads page as the directory listing +# is not allowed anymore +# +# Forced regexp to match only to the current stable release +http://www.mongodb.org/display/DOCS/Downloads \ + http://downloads\.mongodb\.org/src/mongodb-src-r(1\.4[\d\.]+)\.tar\.gz |