[DRE-commits] [ruby-github-markup] 05/13: merge ruby-github-markup and -doc binary packages

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-github-markup.

commit 436f0c55b07dd641223338d0a3d714fc85863872
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Apr 16 16:58:02 2014 +0200

    merge ruby-github-markup and -doc binary packages
---
 debian/control                                     | 28 +---------------------
 debian/github-markup-doc.install                   |  1 -
 debian/github-markup-doc.links                     |  1 -
 ...up-doc.doc-base => ruby-github-markup.doc-base} |  0
 debian/ruby-github-markup.docs                     |  1 +
 debian/ruby-github-markup.links                    |  1 +
 6 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/debian/control b/debian/control
index 00ff94c..6af7d32 100644
--- a/debian/control
+++ b/debian/control
@@ -40,32 +40,8 @@ Depends:
  ruby-redcarpet | ruby-rdiscount | ruby-maruku | ruby-kramdown | ruby-bluecloth,
  ruby-redcloth,
  ruby-wikicloth
-Suggests:
- github-markup-doc
-Description: GitHub Markup rendering
- GitHub Markup converts multiple different rich text files to html.
- .
- The following markups are supported:
- .
-  * Markdown
-  * Textile
-  * RDoc
-  * Emacs org-mode
-  * Creole
-  * MediaWiki
-  * reStructuredText
-  * AsciiDoc
-  * Plain Old Documentation (pod)
-
-Package: github-markup-doc
-Architecture: all
-Section: doc
-Depends:
- ${misc:Depends},
  libjs-jquery
-Suggests:
- github-markup
-Description: GitHub Markup rendering (documentation)
+Description: GitHub Markup rendering
  GitHub Markup converts multiple different rich text files to html.
  .
  The following markups are supported:
@@ -79,5 +55,3 @@ Description: GitHub Markup rendering (documentation)
   * reStructuredText
   * AsciiDoc
   * Plain Old Documentation (pod)
- .
- This package contains the documentation for github-markup.
diff --git a/debian/github-markup-doc.install b/debian/github-markup-doc.install
deleted file mode 100644
index 8dcc276..0000000
--- a/debian/github-markup-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-doc/*   usr/share/doc/github-markup-doc/html/
diff --git a/debian/github-markup-doc.links b/debian/github-markup-doc.links
deleted file mode 100644
index 8297db6..0000000
--- a/debian/github-markup-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/github-markup-doc/html/js/jquery.js
diff --git a/debian/github-markup-doc.doc-base b/debian/ruby-github-markup.doc-base
similarity index 100%
rename from debian/github-markup-doc.doc-base
rename to debian/ruby-github-markup.doc-base
diff --git a/debian/ruby-github-markup.docs b/debian/ruby-github-markup.docs
index b43bf86..b3f4d9c 100644
--- a/debian/ruby-github-markup.docs
+++ b/debian/ruby-github-markup.docs
@@ -1 +1,2 @@
 README.md
+doc/
diff --git a/debian/ruby-github-markup.links b/debian/ruby-github-markup.links
new file mode 100644
index 0000000..68e2ded
--- /dev/null
+++ b/debian/ruby-github-markup.links
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/ruby-github-markup/doc/html/js/jquery.js

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-github-markup.git