SERVER-3579 replace 10gen with mongodb

2 files changed, 62 insertions, 62 deletions

diff --git a/debian/control b/debian/control
index e6e070284dd..cef8dcba39a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: mongodb-10gen-unstable
+Source: mongodb-org-unstable
 Section: devel
 Priority: optional
 Maintainer: Richard Kreuter <richard@10gen.com>
@@ -6,10 +6,10 @@ Build-Depends:
 Standards-Version: 3.8.0
 Homepage: http://www.mongodb.org
 
-Package: mongodb-10gen-unstable
+Package: mongodb-org-unstable
 Conflicts: mongodb, mongodb-stable, mongodb-nightly, mongodb-10gen, mongodb-10gen-unstable
 Architecture: any
-Depends: libc6 (>= 2.3.2), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.1.1), mongodb-10gen-unstable-shell, mongodb-10gen-unstable-server, mongodb-10gen-unstable-mongos, mongodb-10gen-unstable-tools
+Depends: libc6 (>= 2.3.2), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.1.1), mongodb-org-unstable-shell, mongodb-org-unstable-server, mongodb-org-unstable-mongos, mongodb-org-unstable-tools
 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
@@ -29,8 +29,8 @@ Description: An object/document-oriented database
  functionality are the goals for the project.
 
 
-Package: mongodb-10gen-unstable-shell
-Conflicts: mongodb-10gen-shell, mongodb-10gen-enterprise-shell
+Package: mongodb-org-unstable-shell
+Conflicts: mongodb-10gen-shell, mongodb-10gen-enterprise-shell, mongodb-org-shell, mongodb-enterprise-shell
 Architecture: any
 Depends: libc6 (>= 2.3.2), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.1.1)
 Description: An object/document-oriented database
@@ -53,8 +53,8 @@ Description: An object/document-oriented database
  .
  This Debian package installs the mongo shell.
 
-Package: mongodb-10gen-unstable-server
-Conflicts: mongodb-10gen-server, mongodb-10gen-enterprise-server
+Package: mongodb-org-unstable-server
+Conflicts: mongodb-10gen-server, mongodb-10gen-enterprise-server, mongodb-org-server, mongodb-enterprise-server
 Architecture: any
 Depends: libc6 (>= 2.3.2), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.1.1)
 Description: An object/document-oriented database
@@ -77,8 +77,8 @@ Description: An object/document-oriented database
  .
  This Debian package installs the mongod server. 
 
-Package: mongodb-10gen-unstable-mongos
-Conflicts: mongodb-10gen-mongos, mongodb-10gen-enterprise-mongos
+Package: mongodb-org-unstable-mongos
+Conflicts: mongodb-10gen-mongos, mongodb-10gen-enterprise-mongos, mongodb-org-mongos, mongodb-enterprise-mongos
 Architecture: any
 Depends: libc6 (>= 2.3.2), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.1.1)
 Description: An object/document-oriented database
@@ -101,8 +101,8 @@ Description: An object/document-oriented database
  .
  This Debian package installs the mongos program. 
 
-Package: mongodb-10gen-unstable-tools
-Conflicts: mongodb-10gen-tools, mongodb-10gen-enterprise-tools
+Package: mongodb-org-unstable-tools
+Conflicts: mongodb-10gen-tools, mongodb-10gen-enterprise-tools, mongodb-org-tools, mongodb-enterprise-tools
 Architecture: any
 Depends: libc6 (>= 2.3.2), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.1.1)
 Description: An object/document-oriented database
diff --git a/debian/rules b/debian/rules
index 21e3ffe8757..32ecf463888 100644
--- a/debian/rules
+++ b/debian/rules
@@ -27,21 +27,21 @@ build-stamp: configure-stamp
 # THE FOLLOWING LINE IS INTENTIONALLY COMMENTED. 
 	# scons 
         #docbook-to-man debian/mongodb.sgml > mongodb.1
-	echo debian/bsondump.1 > debian/mongodb-10gen-unstable-tools.manpages
-	echo debian/mongodump.1 >> debian/mongodb-10gen-unstable-tools.manpages
-	echo debian/mongoexport.1 >> debian/mongodb-10gen-unstable-tools.manpages
-	echo debian/mongofiles.1 >> debian/mongodb-10gen-unstable-tools.manpages
-	echo debian/mongoimport.1 >> debian/mongodb-10gen-unstable-tools.manpages
-	echo debian/mongooplog.1 >> debian/mongodb-10gen-unstable-tools.manpages
-	echo debian/mongoperf.1 >> debian/mongodb-10gen-unstable-tools.manpages
-	echo debian/mongorestore.1 >> debian/mongodb-10gen-unstable-tools.manpages
-	echo debian/mongosniff.1 >> debian/mongodb-10gen-unstable-tools.manpages
-	echo debian/mongostat.1 >> debian/mongodb-10gen-unstable-tools.manpages
-	echo debian/mongotop.1 >> debian/mongodb-10gen-unstable-tools.manpages
-
-	echo debian/mongo.1 > debian/mongodb-10gen-unstable-shell.manpages
-	echo debian/mongod.1 > debian/mongodb-10gen-unstable-server.manpages
-	echo debian/mongos.1 > debian/mongodb-10gen-unstable-mongos.manpages
+	echo debian/bsondump.1 > debian/mongodb-org-unstable-tools.manpages
+	echo debian/mongodump.1 >> debian/mongodb-org-unstable-tools.manpages
+	echo debian/mongoexport.1 >> debian/mongodb-org-unstable-tools.manpages
+	echo debian/mongofiles.1 >> debian/mongodb-org-unstable-tools.manpages
+	echo debian/mongoimport.1 >> debian/mongodb-org-unstable-tools.manpages
+	echo debian/mongooplog.1 >> debian/mongodb-org-unstable-tools.manpages
+	echo debian/mongoperf.1 >> debian/mongodb-org-unstable-tools.manpages
+	echo debian/mongorestore.1 >> debian/mongodb-org-unstable-tools.manpages
+	echo debian/mongosniff.1 >> debian/mongodb-org-unstable-tools.manpages
+	echo debian/mongostat.1 >> debian/mongodb-org-unstable-tools.manpages
+	echo debian/mongotop.1 >> debian/mongodb-org-unstable-tools.manpages
+
+	echo debian/mongo.1 > debian/mongodb-org-unstable-shell.manpages
+	echo debian/mongod.1 > debian/mongodb-org-unstable-server.manpages
+	echo debian/mongos.1 > debian/mongodb-org-unstable-mongos.manpages
 
 	touch $@
 
@@ -56,11 +56,11 @@ clean:
 
 	rm -f debian/*.manpages
 
-	rm -rf $(CURDIR)/debian/mongodb-10gen-unstable
-	rm -rf $(CURDIR)/debian/mongodb-10gen-unstable-shell
-	rm -rf $(CURDIR)/debian/mongodb-10gen-unstable-server
-	rm -rf $(CURDIR)/debian/mongodb-10gen-unstable-mongos
-	rm -rf $(CURDIR)/debian/mongodb-10gen-unstable-tools
+	rm -rf $(CURDIR)/debian/mongodb-org-unstable
+	rm -rf $(CURDIR)/debian/mongodb-org-unstable-shell
+	rm -rf $(CURDIR)/debian/mongodb-org-unstable-server
+	rm -rf $(CURDIR)/debian/mongodb-org-unstable-mongos
+	rm -rf $(CURDIR)/debian/mongodb-org-unstable-tools
 	rm -f config.log
 	rm -f mongo
 	rm -f mongod
@@ -88,36 +88,36 @@ install: build
 
 # THE FOLLOWING LINE IS INTENTIONALLY COMMENTED.
 	# scons --prefix=$(CURDIR)/debian/mongodb/usr install
-	mkdir -p $(CURDIR)/debian/mongodb-10gen-unstable-shell/usr/bin
-	mkdir -p $(CURDIR)/debian/mongodb-10gen-unstable-server/usr/bin
-	mkdir -p $(CURDIR)/debian/mongodb-10gen-unstable-mongos/usr/bin
-	mkdir -p $(CURDIR)/debian/mongodb-10gen-unstable-tools/usr/bin
-	cp -v $(CURDIR)/BINARIES/usr/bin/mongo $(CURDIR)/debian/mongodb-10gen-unstable-shell/usr/bin
-	cp -v $(CURDIR)/BINARIES/usr/bin/mongod $(CURDIR)/debian/mongodb-10gen-unstable-server/usr/bin
-	cp -v $(CURDIR)/BINARIES/usr/bin/mongos $(CURDIR)/debian/mongodb-10gen-unstable-mongos/usr/bin
-
-	cp -v $(CURDIR)/BINARIES/usr/bin/bsondump $(CURDIR)/debian/mongodb-10gen-unstable-tools/usr/bin
-	cp -v $(CURDIR)/BINARIES/usr/bin/mongodump $(CURDIR)/debian/mongodb-10gen-unstable-tools/usr/bin
-	cp -v $(CURDIR)/BINARIES/usr/bin/mongoexport $(CURDIR)/debian/mongodb-10gen-unstable-tools/usr/bin
-	cp -v $(CURDIR)/BINARIES/usr/bin/mongofiles $(CURDIR)/debian/mongodb-10gen-unstable-tools/usr/bin
-	cp -v $(CURDIR)/BINARIES/usr/bin/mongoimport $(CURDIR)/debian/mongodb-10gen-unstable-tools/usr/bin
-	cp -v $(CURDIR)/BINARIES/usr/bin/mongooplog $(CURDIR)/debian/mongodb-10gen-unstable-tools/usr/bin
-	cp -v $(CURDIR)/BINARIES/usr/bin/mongoperf $(CURDIR)/debian/mongodb-10gen-unstable-tools/usr/bin
-	cp -v $(CURDIR)/BINARIES/usr/bin/mongorestore $(CURDIR)/debian/mongodb-10gen-unstable-tools/usr/bin
-	cp -v $(CURDIR)/BINARIES/usr/bin/mongostat $(CURDIR)/debian/mongodb-10gen-unstable-tools/usr/bin
-	cp -v $(CURDIR)/BINARIES/usr/bin/mongotop $(CURDIR)/debian/mongodb-10gen-unstable-tools/usr/bin
-
-	mkdir -p $(CURDIR)/debian/mongodb-10gen-unstable-server/etc
-	cp $(CURDIR)/debian/mongodb.conf $(CURDIR)/debian/mongodb-10gen-unstable-server/etc/mongodb.conf 
-
-	mkdir -p $(CURDIR)/debian/mongodb-10gen-unstable-shell/usr/share/lintian/overrides/
-	mkdir -p $(CURDIR)/debian/mongodb-10gen-unstable-server/usr/share/lintian/overrides/
-	mkdir -p $(CURDIR)/debian/mongodb-10gen-unstable-mongos/usr/share/lintian/overrides/
-	mkdir -p $(CURDIR)/debian/mongodb-10gen-unstable-tools/usr/share/lintian/overrides/
-	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-10gen-unstable-shell/usr/share/lintian/overrides/mongodb-10gen-unstable-shell
-	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-10gen-unstable-server/usr/share/lintian/overrides/mongodb-10gen-unstable-server
-	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-10gen-unstable-mongos/usr/share/lintian/overrides/mongodb-10gen-unstable-mongos
-	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-10gen-unstable-tools/usr/share/lintian/overrides/mongodb-10gen-unstable-tools
+	mkdir -p $(CURDIR)/debian/mongodb-org-unstable-shell/usr/bin
+	mkdir -p $(CURDIR)/debian/mongodb-org-unstable-server/usr/bin
+	mkdir -p $(CURDIR)/debian/mongodb-org-unstable-mongos/usr/bin
+	mkdir -p $(CURDIR)/debian/mongodb-org-unstable-tools/usr/bin
+	cp -v $(CURDIR)/BINARIES/usr/bin/mongo $(CURDIR)/debian/mongodb-org-unstable-shell/usr/bin
+	cp -v $(CURDIR)/BINARIES/usr/bin/mongod $(CURDIR)/debian/mongodb-org-unstable-server/usr/bin
+	cp -v $(CURDIR)/BINARIES/usr/bin/mongos $(CURDIR)/debian/mongodb-org-unstable-mongos/usr/bin
+
+	cp -v $(CURDIR)/BINARIES/usr/bin/bsondump $(CURDIR)/debian/mongodb-org-unstable-tools/usr/bin
+	cp -v $(CURDIR)/BINARIES/usr/bin/mongodump $(CURDIR)/debian/mongodb-org-unstable-tools/usr/bin
+	cp -v $(CURDIR)/BINARIES/usr/bin/mongoexport $(CURDIR)/debian/mongodb-org-unstable-tools/usr/bin
+	cp -v $(CURDIR)/BINARIES/usr/bin/mongofiles $(CURDIR)/debian/mongodb-org-unstable-tools/usr/bin
+	cp -v $(CURDIR)/BINARIES/usr/bin/mongoimport $(CURDIR)/debian/mongodb-org-unstable-tools/usr/bin
+	cp -v $(CURDIR)/BINARIES/usr/bin/mongooplog $(CURDIR)/debian/mongodb-org-unstable-tools/usr/bin
+	cp -v $(CURDIR)/BINARIES/usr/bin/mongoperf $(CURDIR)/debian/mongodb-org-unstable-tools/usr/bin
+	cp -v $(CURDIR)/BINARIES/usr/bin/mongorestore $(CURDIR)/debian/mongodb-org-unstable-tools/usr/bin
+	cp -v $(CURDIR)/BINARIES/usr/bin/mongostat $(CURDIR)/debian/mongodb-org-unstable-tools/usr/bin
+	cp -v $(CURDIR)/BINARIES/usr/bin/mongotop $(CURDIR)/debian/mongodb-org-unstable-tools/usr/bin
+
+	mkdir -p $(CURDIR)/debian/mongodb-org-unstable-server/etc
+	cp $(CURDIR)/debian/mongodb.conf $(CURDIR)/debian/mongodb-org-unstable-server/etc/mongodb.conf 
+
+	mkdir -p $(CURDIR)/debian/mongodb-org-unstable-shell/usr/share/lintian/overrides/
+	mkdir -p $(CURDIR)/debian/mongodb-org-unstable-server/usr/share/lintian/overrides/
+	mkdir -p $(CURDIR)/debian/mongodb-org-unstable-mongos/usr/share/lintian/overrides/
+	mkdir -p $(CURDIR)/debian/mongodb-org-unstable-tools/usr/share/lintian/overrides/
+	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-org-unstable-shell/usr/share/lintian/overrides/mongodb-org-unstable-shell
+	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-org-unstable-server/usr/share/lintian/overrides/mongodb-org-unstable-server
+	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-org-unstable-mongos/usr/share/lintian/overrides/mongodb-org-unstable-mongos
+	install -m 644 $(CURDIR)/debian/lintian-overrides 		$(CURDIR)/debian/mongodb-org-unstable-tools/usr/share/lintian/overrides/mongodb-org-unstable-tools
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -137,7 +137,7 @@ binary-arch: build install
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
-	dh_installinit -pmongodb-10gen-unstable-server --name=mongodb
+	dh_installinit -pmongodb-org-unstable-server --name=mongodb
 #	dh_installinfo
 	dh_installman
 	dh_link