[DRE-maint] Ubuntu rbot 0.9.15+post20100705+gitb3aa806-2ubuntu2

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.8
Date: Mon, 12 Jul 2010 19:52:38 +0200
Source: rbot
Binary: rbot rbot-doc
Architecture: source
Version: 0.9.15+post20100705+gitb3aa806-2ubuntu2
Distribution: maverick
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Michael Bienia <geser at ubuntu.com>
Description: 
 rbot       - IRC bot written in ruby
 rbot-doc   - IRC bot written in ruby -- API documentation
Changes: 
 rbot (0.9.15+post20100705+gitb3aa806-2ubuntu2) maverick; urgency=low
 .
   * Fix error from apply the debdiff.
 .
 rbot (0.9.15+post20100705+gitb3aa806-2ubuntu1) maverick; urgency=low
 .
   * Add new rule to the clean target to make pkgstriptranslations happy
Checksums-Sha1: 
 25edaa9e2ed1eeb94eb911f98c56500474af0b5b 1979 rbot_0.9.15+post20100705+gitb3aa806-2ubuntu2.dsc
 f54573255fcca2f1d5c05cf59df8f8524aca0889 6940 rbot_0.9.15+post20100705+gitb3aa806-2ubuntu2.debian.tar.gz
Checksums-Sha256: 
 8e207b6305a9cd481f823453f8534677725f0a2991ae5c75b58ec7c8a2d9f86c 1979 rbot_0.9.15+post20100705+gitb3aa806-2ubuntu2.dsc
 c9ad4295364d736cfe63f0d044c38c6208454ff2a7e70a72c2b0864fa0c98028 6940 rbot_0.9.15+post20100705+gitb3aa806-2ubuntu2.debian.tar.gz
Files: 
 09e98c0cc8824cda6f82cad7d771197b 1979 ruby optional rbot_0.9.15+post20100705+gitb3aa806-2ubuntu2.dsc
 a31ea42acc6025a24be3c9b3a9adfd45 6940 ruby optional rbot_0.9.15+post20100705+gitb3aa806-2ubuntu2.debian.tar.gz
Original-Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
-------------- next part --------------
diff -pruN 0.9.15+post20100705+gitb3aa806-2/debian/changelog 0.9.15+post20100705+gitb3aa806-2ubuntu2/debian/changelog
--- 0.9.15+post20100705+gitb3aa806-2/debian/changelog	2010-07-11 11:56:50.000000000 +0100
+++ 0.9.15+post20100705+gitb3aa806-2ubuntu2/debian/changelog	2010-07-12 18:53:15.000000000 +0100
@@ -1,3 +1,15 @@
+rbot (0.9.15+post20100705+gitb3aa806-2ubuntu2) maverick; urgency=low
+
+  * Fix error from apply the debdiff. 
+
+ -- Michael Bienia <geser at 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 at 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 -pruN 0.9.15+post20100705+gitb3aa806-2/debian/control 0.9.15+post20100705+gitb3aa806-2ubuntu2/debian/control
--- 0.9.15+post20100705+gitb3aa806-2/debian/control	2010-07-11 12:16:15.000000000 +0100
+++ 0.9.15+post20100705+gitb3aa806-2ubuntu2/debian/control	2010-07-12 18:23:45.000000000 +0100
@@ -1,7 +1,8 @@
 Source: rbot
 Section: ruby
 Priority: optional
-Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Build-Depends: cdbs (>= 0.4.53),
  debhelper (>= 7.0.1), ruby (>= 1.8), ruby-pkg-tools, rake, libgettext-ruby1.8
diff -pruN 0.9.15+post20100705+gitb3aa806-2/debian/rules 0.9.15+post20100705+gitb3aa806-2ubuntu2/debian/rules
--- 0.9.15+post20100705+gitb3aa806-2/debian/rules	2010-07-11 11:42:18.000000000 +0100
+++ 0.9.15+post20100705+gitb3aa806-2ubuntu2/debian/rules	2010-07-12 18:52:17.000000000 +0100
@@ -33,4 +33,5 @@ clean::
 	rm -rf data/locale
 	rm -f man/*.1
 	rm -f lib/rbot/pkgconfig.rb
+	find . -empty \( -name '*.pot' -o -name '*.po' \) -delete