[Pkg-mongodb-maintainers] [pkg-mongodb] 42/394: merged changes from debianization from 1.2.4
Apollon Oikonomopoulos
apoikos at moszumanska.debian.org
Wed Sep 21 13:57:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
apoikos pushed a commit to branch master
in repository pkg-mongodb.
commit c1578d995513eccceaf91f1efd1633f50831c6c7
Author: Antonin Kral <a.kral at bobek.cz>
Date: Thu Mar 25 19:42:46 2010 +0100
merged changes from debianization from 1.2.4
---
debian/changelog | 94 +++++++++++++++++++++++++++++++++++++++---------
debian/control | 10 +++---
debian/mongodb.conf | 16 +--------
debian/mongoimportjson.1 | 45 +++++++++++++++++++++++
debian/rules | 12 ++++---
5 files changed, 137 insertions(+), 40 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6da2ed2..41ffce4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,31 +1,93 @@
-mongodb (1.4.0) unstable; urgency=low
+mongodb (1:1.2.4-1) unstable; urgency=low
- * stable release
+ * [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 at 10gen.com> Wed, 22 Mar 2010 16:56:28 -0500
+ -- Antonin Kral <A.Kral at sh.cvut.cz> Wed, 17 Mar 2010 10:18:01 +0100
-mongodb (1.3.5) unstable; urgency=low
+mongodb (1:1.2.2-4) unstable; urgency=low
- * bug fixes
+ * ensure removal of upstart script as upload of repacked source is failing
- -- Richard Kreuter <richard at 10gen.com> Wed, 22 Mar 2010 16:56:28 -0500
+ -- Antonin Kral <A.Kral at sh.cvut.cz> Wed, 10 Mar 2010 07:29:38 +0100
-mongodb (1.3.4) unstable; urgency=low
+mongodb (1:1.2.2-3) unstable; urgency=low
- * bufg fixes
+ * [aced2f4] removed unnecessary dependency (Closes: #572873)
+ * [ce78acd] Added call for tests to ensure correct build
+ (Closes: #570106)
- -- Richard Kreuter <richard at 10gen.com> Wed, 17 Mar 2010 16:56:28 -0500
+ -- Antonin Kral <A.Kral at sh.cvut.cz> Sun, 07 Mar 2010 21:07:37 +0100
-mongodb (1.3.3) unstable; urgency=low
+mongodb (1:1.2.2-2) unstable; urgency=low
- * geo
+ * [49232f8] removed upstart, it is buggy + not supported in Debian
+ (Closes: #572812)
- -- Richard Kreuter <richard at 10gen.com> Fri, 05 Feb 2010 16:56:28 -0500
+ -- Antonin Kral <A.Kral at sh.cvut.cz> Sat, 06 Mar 2010 22:55:17 +0100
-mongodb (1.3.2) unstable; urgency=low
+mongodb (1:1.2.2-1) unstable; urgency=low
- * munged debian files
+ * 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
- -- Richard Kreuter <richard at 10gen.com> Fri, 05 Feb 2010 16:56:28 -0500
+ -- Antonin Kral <A.Kral at 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 at 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 at 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 at 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 at sh.cvut.cz> Fri, 29 Jan 2010 19:48:45 +0100
-mongodb (1.3.1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index fd34a31..cbe17e3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
Source: mongodb
Section: database
Priority: optional
-Maintainer: Richard Kreuter <richard at 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-pr [...]
-Standards-Version: 3.8.0
+Maintainer: Antonin Kral <A.Kral at sh.cvut.cz>
+Build-Depends: debhelper (>= 7), libpcre3, libpcre3-dev, scons, xulrunner-dev (>= 1.9) | xulrunner-1.9-dev | xulrunner-1.9.1-dev, libboost1.40-dev | libboost1.35-dev | libboost1.37-dev | libboost1.38-dev, libboost-thread1.40-dev | libboost-thread1.38-dev | libboost-thread1.37-dev | libboost-thread1.35-dev, libboost-filesystem1.40-dev | libboost-filesystem1.38-dev | libboost-filesystem1.37-dev | libboost-filesystem1.35-dev, libboost-program-options1.40-dev | libboost-program-options1.38-d [...]
+Standards-Version: 3.8.4
Homepage: http://www.mongodb.org
Package: mongodb
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xulrunner-dev
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
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
diff --git a/debian/mongodb.conf b/debian/mongodb.conf
index 9bd2464..195a8a2 100644
--- a/debian/mongodb.conf
+++ b/debian/mongodb.conf
@@ -1,17 +1,3 @@
-<<<<<<< HEAD
-# This is an config file for MongoDB master daemon mongod
-# it is passed to mongod as --config parameter
-
-# Log and DB path are set in init.d script
-# logpath = /var/log/mongodb/mongod.log
-# dbpath = /var/lib/mongodb/
-
-# use 'true' for options that don't take an argument
-logappend = true
-bind_ip = 127.0.0.1
-#noauth = true
-
-=======
# mongodb.conf
# Where to store the data.
@@ -26,6 +12,7 @@ logpath=/var/log/mongodb/mongodb.log
logappend=true
+bind_ip = 127.0.0.1
#port = 27017
@@ -107,4 +94,3 @@ logappend=true
#oplogSize = <MB>
# Size limit for in-memory storage of op ids.
#opIdMem = <bytes>
->>>>>>> upstream/1.4.0
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/rules b/debian/rules
index 0078370..1f86f67 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,10 @@ build-stamp: configure-stamp
#docbook-to-man debian/mongodb.sgml > mongodb.1
ls debian/*.1 > debian/mongodb.manpages
+ #run regression tests
+ scons --prefix=$(CURDIR)/debian/tmp-test smoke
+ rm -rf $(CURDIR)/debian/tmp-test
+
touch $@
clean:
@@ -44,10 +48,10 @@ clean:
dh_testroot
rm -f build-stamp configure-stamp
+ rm -rf $(CURDIR)/debian/mongodb
# FIXME: scons freaks out at the presence of target files
# under debian/mongodb.
- #scons -c
- rm -rf $(CURDIR)/debian/mongodb
+ scons -c
rm -f config.log
rm -f mongo
rm -f mongod
@@ -65,6 +69,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
@@ -74,8 +80,6 @@ install: build
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
mkdir -p $(CURDIR)/debian/mongodb/usr/share/lintian/overrides/
install -m 644 $(CURDIR)/debian/lintian-overrides \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mongodb/pkg-mongodb.git
More information about the Pkg-mongodb-maintainers
mailing list