[DRE-commits] [SCM] ruby-rdiscount.git branch, master, updated. upstream/1.6.8-7-g60d6da8

[Martin Ueding]

The following commit has been merged in the master branch:
commit 60d6da8f54ec2985057a55c9c8df6249e1b74d75
Author: Martin Ueding <dev at martin-ueding.de>
Date:   Sat Oct 29 14:59:34 2011 +0200

    Do not install markdown.7
    
    libmarkdown2-dev installs the same markdown.7 manual page with the exact same
    content. Therefore, this package does not overwrite it to avoid conflicts.

diff --git a/debian/ruby-rdiscount.manpages b/debian/ruby-rdiscount.manpages
index 9d127cb..7b448ea 100644
--- a/debian/ruby-rdiscount.manpages
+++ b/debian/ruby-rdiscount.manpages
@@ -1,2 +1 @@
 man/rdiscount.1
-man/markdown.7

-- 
ruby-rdiscount.git