diff -Nru rbot-0.9.15+post20100705+gitb3aa806/debian/changelog rbot-0.9.15+post20100705+gitb3aa806/debian/changelog
--- rbot-0.9.15+post20100705+gitb3aa806/debian/changelog	2012-01-04 03:41:50.000000000 +0530
+++ rbot-0.9.15+post20100705+gitb3aa806/debian/changelog	2012-06-18 19:28:51.000000000 +0530
@@ -1,3 +1,12 @@
+rbot (0.9.15+post20100705+gitb3aa806-3ubuntu1) quantal; urgency=low
+
+  * Merge from Debian Unstable (LP: #1014652). Remaining Changes:
+    - Fix error from apply the debdiff.
+    - Add new rule to the clean target to make pkgstriptranslations happy
+  * Add gem2deb to build-depends 
+
+ -- Vibhav Pant <vibhavp@gmail.com>  Mon, 18 Jun 2012 19:28:11 +0530
+
 rbot (0.9.15+post20100705+gitb3aa806-3) unstable; urgency=low
 
   * Switched to gem2deb packaging style.
@@ -8,6 +17,18 @@
 
  -- Marc Dequènes (Duck) <Duck@DuckCorp.org>  Tue, 03 Jan 2012 21:36:00 +0100
 
+rbot (0.9.15+post20100705+gitb3aa806-2ubuntu2) maverick; urgency=low
+
+  * Fix error from apply the debdiff. 
+
+ -- Michael Bienia <geser@ubuntu.com>  Mon, 12 Jul 2010 19:52:38 +0200
+
+rbot (0.9.15+post20100705+gitb3aa806-2ubuntu1) maverick; urgency=low
+
+  * Add new rule to the clean target to make pkgstriptranslations happy
+
+ -- Rohan Garg <rohangarg@ubuntu.com>  Mon, 12 Jul 2010 21:52:32 +0530
+
 rbot (0.9.15+post20100705+gitb3aa806-2) unstable; urgency=medium
 
   * Fixed FTBFS and other cleanups (Closes: 588657).
diff -Nru rbot-0.9.15+post20100705+gitb3aa806/debian/control rbot-0.9.15+post20100705+gitb3aa806/debian/control
--- rbot-0.9.15+post20100705+gitb3aa806/debian/control	2012-01-04 07:28:05.000000000 +0530
+++ rbot-0.9.15+post20100705+gitb3aa806/debian/control	2012-06-18 19:19:21.000000000 +0530
@@ -1,11 +1,12 @@
 Source: rbot
 Section: ruby
 Priority: optional
-Maintainer: Marc Dequènes (Duck) <Duck@DuckCorp.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Marc Dequènes (Duck) <Duck@DuckCorp.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~),
- rake, libgettext-ruby1.8, libgettext-ruby1.9.1
+ rake, libgettext-ruby1.8, libgettext-ruby1.9.1, gem2deb
 Build-Depends-Indep: xsltproc, docbook-xml, docbook-xsl, graphviz
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/rbot.git
diff -Nru rbot-0.9.15+post20100705+gitb3aa806/debian/rules rbot-0.9.15+post20100705+gitb3aa806/debian/rules
--- rbot-0.9.15+post20100705+gitb3aa806/debian/rules	2012-01-04 03:47:14.000000000 +0530
+++ rbot-0.9.15+post20100705+gitb3aa806/debian/rules	2012-06-18 19:06:59.000000000 +0530
@@ -41,4 +41,5 @@
 	rm -rf data/locale
 	rm -f man/*.1
 	rm -f lib/rbot/pkgconfig.rb
+	find . -empty \( -name '*.pot' -o -name '*.po' \) -delete