Merge Debian changes from Antonin Kral.

4 files changed, 67 insertions, 2 deletions

diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 00000000000..c843e9ecfab
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1,11 @@
+# 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/mongod.1 b/debian/mongod.1
new file mode 100644
index 00000000000..7b863590584
--- /dev/null
+++ b/debian/mongod.1
@@ -0,0 +1,16 @@
+.\" Documentation for the MongoDB shell
+.TH MONGOD "1" "June 2009" "10gen" "Mongo Database"
+.SH "NAME"
+mongod \- the Mongo Daemon
+.SH "SYNOPSIS"
+.SH "DESCRIPTION"
+.PP
+\fBmongod\fR
+is a core MongoDB daemon. You are not supposed to call it directly, please refer to the wiki if necessary.
+.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"
+Antonin Kral
diff --git a/debian/mongosniff.1 b/debian/mongosniff.1
new file mode 100644
index 00000000000..b6f1063e096
--- /dev/null
+++ b/debian/mongosniff.1
@@ -0,0 +1,30 @@
+.TH MONGOSNIFF "1" "Jan 2010" "10gen" "Mongo Database"
+.SH "NAME"
+mongosniff \- the Mongo packet analyzer
+.SH "SYNOPSIS"
+\fBmongosniff [\fIOPTIONS\fR] [\fI<port0> <port1> ...\fR]
+.SH "DESCRIPTION"
+.PP
+\fBmongosniff\fR
+is a analyzer tool for analyzing packets coming to your database.
+.PP
+.SH "OPTIONS"
+.TP
+.B \-\-forward
+Forward all parsed request messages to mongod instance at specified host:port
+.TP
+.B \-\-source
+Source of traffic to sniff, either a network interface or a file containing previously captured packets, in pcap format. If no source is specified, mongosniff will attempt to sniff from one of the machine's network interfaces.
+.TP
+.B \-\-help
+print a short help message.
+.TP
+.B <port0>
+These parameters are used to filter sniffing.  By default, only port 27017 is sniffed.
+.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"
+Antonin Kral
diff --git a/debian/rules b/debian/rules
index baeb55515f1..d65daf5f174 100644
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ build-stamp: configure-stamp
         # Add here commands to compile the package.
 	scons 
         #docbook-to-man debian/mongodb.sgml > mongodb.1
+	ls debian/*.1 > debian/mongodb.manpages
 
 	touch $@
 
@@ -49,18 +50,25 @@ clean:
 	rm -rf tools/*.o
 	rm -rf shell/*.o
 	rm -rf .sconf_temp
-	dh_clean 
+	rm -f buildscripts/*.pyc 
+	rm -f *.pyc
+	rm -f buildinfo.cpp
+	dh_clean debian/files
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	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 
 
+	mkdir -p $(CURDIR)/debian/mongodb/usr/share/lintian/overrides/
+	install -m 644 $(CURDIR)/debian/lintian-overrides \
+		$(CURDIR)/debian/mongodb/usr/share/lintian/overrides/mongodb
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.