[DRE-commits] [SCM] bundler.git branch, master, updated. debian/1.1.4-5

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit dc729270d939934a06fd0206dc16d83d9eea30b0
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Thu Aug 16 10:55:14 2012 -0500

    Given dak rejected both my 1.1.4-5 and 1.1.4-6 uploads due to a differing orig.tar.gz, merge them both under 1.1.4-5

diff --git a/debian/changelog b/debian/changelog
index 832863c..3792997 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,10 @@
-bundler (1.1.4-6) unstable; urgency=low
-
-  * Team upload
-  * Revert the 1.1.4-5 changes and add a recommendation on less, as not
-    every sensible-pager supports the "-R" switch (Now really closes:
-    #684798)
-
- -- Gunnar Wolf <gwolf at debian.org>  Tue, 14 Aug 2012 11:07:39 -0500
-
 bundler (1.1.4-5) unstable; urgency=low
 
   * Team upload
-  * Use sensible-pager instead of less for displaying the help (Closes:
-    #684798)
+  * Add a recommendation on less, as not every sensible-pager supports the
+    "-R" switch (Closes: #684798)
 
- -- Gunnar Wolf <gwolf at debian.org>  Mon, 13 Aug 2012 19:05:47 -0500
+ -- Gunnar Wolf <gwolf at debian.org>  Thu, 16 Aug 2012 10:54:13 -0500
 
 bundler (1.1.4-4) unstable; urgency=low
 

-- 
bundler.git