More adjustments, including needed file renames, and handling of installation of man pages.

6 files changed, 25 insertions, 23 deletions

diff --git a/debian/mongo-clients.install b/debian/mongo-clients.install
deleted file mode 100644
index eb26f1a..0000000
--- a/debian/mongo-clients.install
+++ /dev/null
@@ -1,18 +0,0 @@
-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.gz
-usr/share/man/man1/mongodump.1.gz
-usr/share/man/man1/mongoexport.1.gz
-usr/share/man/man1/mongofiles.1.gz
-usr/share/man/man1/mongoimport.1.gz
-usr/share/man/man1/mongoimportjson.1.gz
-usr/share/man/man1/mongorestore.1.gz
-usr/share/man/man1/mongosniff.1.gz
-usr/share/man/man1/mongostat.15.gz
-
diff --git a/debian/mongo-clients.dirs b/debian/mongodb-clients.dirs
index e772481..e772481 100644
--- a/debian/mongo-clients.dirs
+++ b/debian/mongodb-clients.dirs
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-server.install b/debian/mongodb-server.install
index 1394d76..840b2f3 100644
--- a/debian/mongodb-server.install
+++ b/debian/mongodb-server.install
@@ -2,6 +2,6 @@ etc
 usr/bin/mongod
 usr/bin/mongos
 usr/share/lintian/overrides/mongodb-server
-usr/share/man/man1/mongod.1.gz
-usr/share/man/man1/mongos.1.gz
+usr/share/man/man1/mongod.1
+usr/share/man/man1/mongos.1
 var
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 bc4a19f..272dc99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,6 @@ build-stamp: configure-stamp
         # Add here commands to compile the package.
 	scons $(DEB_SCONS_FLAGS)
         #docbook-to-man debian/mongodb.sgml > mongodb.1
-	ls debian/*.1 > debian/mongodb.manpages
 
 	#run regression tests
 	scons --prefix=$(CURDIR)/debian/tmp-test smoke
@@ -71,7 +70,6 @@ clean:
 	rm -f buildinfo.cpp
 	rm -rf debian/tmp-test
 	rm -f debian/mongodb.upstart
-	rm -f debian/mongodb.manpages
 	dh_clean debian/files
 
 install: build
@@ -92,6 +90,10 @@ install: build
 	install -m 644 $(CURDIR)/debian/mongodb.conf \
 		$(CURDIR)/debian/tmp/etc/mongodb.conf
 
+        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
 # We have nothing to do by default.