removed rest of -1.2 + merged changelog from 1.3debian/1.2.2-1

3 files changed, 56 insertions, 17 deletions

diff --git a/debian/changelog b/debian/changelog
index ca0b225e7ad..6635542abab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mongodb-1.2 (1:1.2.2-1) unstable; urgency=low
+mongodb (1:1.2.2-1) unstable; urgency=low
 
   * this commit introduces stable version of MongoDB to Debian, hopefully to
     be included in upcoming stable (Closes: #570148)
@@ -16,8 +16,47 @@ mongodb-1.2 (1:1.2.2-1) unstable; urgency=low
   * [7bec42f] clarification of licensing terms
   * [c74fd7d] bumped standards version
   * [357da67] merged the rest of debian changes from 1.3
-  * [5c6699a] rename package to -1.2
-  * [e97f033] added conflicts with mongodb (which is 1.3)
 
  -- 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/lintian-overrides b/debian/lintian-overrides
index 52c53f39e91..c843e9ecfab 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1,11 +1,11 @@
 # Agreed with upstream, that redefining rpath is necessary as xulrunner used to
 # change API without changing so-name
-mongodb-1.2: binary-or-shlib-defines-rpath ./usr/bin/mongo /usr/lib64/xulrunner-1.9.1
-mongodb-1.2: binary-or-shlib-defines-rpath ./usr/bin/mongod /usr/lib64/xulrunner-1.9.1
-mongodb-1.2: binary-or-shlib-defines-rpath ./usr/bin/mongodump /usr/lib64/xulrunner-1.9.1
-mongodb-1.2: binary-or-shlib-defines-rpath ./usr/bin/mongoexport /usr/lib64/xulrunner-1.9.1
-mongodb-1.2: binary-or-shlib-defines-rpath ./usr/bin/mongofiles /usr/lib64/xulrunner-1.9.1
-mongodb-1.2: binary-or-shlib-defines-rpath ./usr/bin/mongoimport /usr/lib64/xulrunner-1.9.1
-mongodb-1.2: binary-or-shlib-defines-rpath ./usr/bin/mongorestore /usr/lib64/xulrunner-1.9.1
-mongodb-1.2: binary-or-shlib-defines-rpath ./usr/bin/mongos /usr/lib64/xulrunner-1.9.1
-mongodb-1.2: binary-or-shlib-defines-rpath ./usr/bin/mongosniff /usr/lib64/xulrunner-1.9.1
+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/rules b/debian/rules
index 01c5effd4dc..61f8c861a6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,15 +70,15 @@ install: build
 	dh_prep
 	dh_installdirs
 
-	scons --prefix=$(CURDIR)/debian/mongodb-1.2/usr install
+	scons --prefix=$(CURDIR)/debian/mongodb/usr install
 
-	mkdir -p $(CURDIR)/debian/mongodb-1.2/usr/share/lintian/overrides/
+	mkdir -p $(CURDIR)/debian/mongodb/usr/share/lintian/overrides/
 	install -m 644 $(CURDIR)/debian/lintian-overrides \
-		$(CURDIR)/debian/mongodb-1.2/usr/share/lintian/overrides/mongodb-1.2
+		$(CURDIR)/debian/mongodb/usr/share/lintian/overrides/mongodb
 
-	mkdir -p $(CURDIR)/debian/mongodb-1.2/etc
+	mkdir -p $(CURDIR)/debian/mongodb/etc
 	install -m 644 $(CURDIR)/debian/mongodb.conf \
-		$(CURDIR)/debian/mongodb-1.2/etc/mongodb.conf
+		$(CURDIR)/debian/mongodb/etc/mongodb.conf
 
 # Build architecture-independent files here.
 binary-indep: build install