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

[Christian Hofstaedtler]

The following commit has been merged in the master branch:
commit ce4330d5ecd41b17b5e715d1fa113a426d348f6a
Author: Christian Hofstaedtler <christian at hofstaedtler.name>
Date:   Mon Oct 22 20:46:41 2012 +0200

    Drop upstream-applied patch 'fix-manpage-warning'

diff --git a/debian/changelog b/debian/changelog
index c996c2b..f0d6cc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 bundler (1.2.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Drop patch 'fix-manpage-warning' as upstream has applied it.
 
  -- Christian Hofstaedtler <christian at hofstaedtler.name>  Mon, 22 Oct 2012 20:44:49 +0200
 
diff --git a/debian/patches/fix-manpage-warning.patch b/debian/patches/fix-manpage-warning.patch
deleted file mode 100644
index aa5db3a..0000000
--- a/debian/patches/fix-manpage-warning.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Gemfile.5 has an example with "..." in a preformatted block.
-Apparently ronn doesn't escape this properly and man will then
-complain about an undefined ".." macro and the "..." is missing the manpage output.
-
-This just adds a "|" in front of the "..." so this doesn't look like a macro to man.
-
-Submitted to upstream as https://github.com/carlhuda/bundler/pull/1739
---- a/man/gemfile.5.ronn
-+++ b/man/gemfile.5.ronn
-@@ -203,7 +203,7 @@
-     | |-actionpack.gemspec    [actionpack gem located here]
-     |~activesupport
-     | |-activesupport.gemspec [activesupport gem located here]
--    ...
-+    |...
- 
- To install a gem located in a git repository, bundler changes to
- the directory containing the gemspec, runs `gem build name.gemspec`
diff --git a/debian/patches/series b/debian/patches/series
index cde7751..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-fix-manpage-warning.patch

-- 
bundler.git