[DRE-commits] [SCM] ruby-bluecloth.git branch, master, updated. debian/2.1.0-1-11-g7580dde

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit bdf258cfb9676065febbd1c453979f1cbe287948
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Wed Dec 21 23:47:52 2011 +0100

    use upstream manpage

diff --git a/debian/bluecloth_man.pod b/debian/bluecloth_man.pod
deleted file mode 100644
index 2d23d61..0000000
--- a/debian/bluecloth_man.pod
+++ /dev/null
@@ -1,38 +0,0 @@
-=encoding UTF-8
-
-=head1 NAME
-
-bluecloth - convert Markdown input to HTLM
-
-=head1 SYNOPSIS
-
-B<bluecloth> [I<OPTIONS>] I<FILES>
-
-=head1 DESCRIPTION
-
-B<bluecloth> converts input files, supposed to be written in the Markdown
-markup language. If no file is given, then it will read from the standard
-input. B<bluecloth> then writes to the standard output a HTML file by
-converting Mardown syntax using bluecloth ruby library.
-
-
-=head1 OPTIONS
-
-=over
-
-=item   B<-d>, B<--debug>
-
-Turn debugging output on
-
-=item B<-f>, B<--fragment>
-
-Output HTML fragments instead of whole documents
-
-=back
-
-=head1 AUTHORS
-
-B<bluecloth> has been developed by Michael Granger. 
-
-This manual page has been written for the Debian Project by Cédric Boutillier (but
-may used by others). 
diff --git a/debian/changelog b/debian/changelog
index 1f0778c..6543181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-bluecloth (2.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Upstream now ships a manpage. Using it instead of generating one.
+
+ -- Cédric Boutillier <cedric.boutillier at gmail.com>  Wed, 21 Dec 2011 23:47:29 +0100
+
 ruby-bluecloth (2.1.0-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/ruby-bluecloth.manpages b/debian/ruby-bluecloth.manpages
index 432f9de..dc7050f 100644
--- a/debian/ruby-bluecloth.manpages
+++ b/debian/ruby-bluecloth.manpages
@@ -1 +1 @@
-man/bluecloth.1
+man/man1/bluecloth.1
diff --git a/debian/rules b/debian/rules
index 04dacc0..acd84eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,15 +15,6 @@ export DH_RUBY_IGNORE_TESTS=ruby1.9.1
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
-override_dh_installman:
-	mkdir man
-	pod2man --center "" --release "" --utf8 debian/bluecloth_man.pod man/bluecloth.1
-	dh_installman
-
-override_dh_auto_clean:
-	rm -rf man
-	dh_auto_clean
-
 override_dh_installchangelogs:
 	dh_installchangelogs History.md
 

-- 
ruby-bluecloth.git