[DRE-commits] [ruby-wikicloth] 04/04: Merge -doc package into binary package

[Per Andersson]

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

avtobiff-guest pushed a commit to branch master
in repository ruby-wikicloth.

commit 87b8b7457d3b2f981e7b5672abda65797fc080ec
Author: Per Andersson <avtobiff at gmail.com>
Date:   Tue Aug 13 23:14:45 2013 +0200

    Merge -doc package into binary package
---
 debian/control                                     |   24 +-------------------
 ...icloth-doc.doc-base => ruby-wikicloth.doc-base} |    0
 ...-wikicloth-doc.docs => ruby-wikicloth.examples} |    2 +-
 ...ikicloth-doc.install => ruby-wikicloth.install} |    0
 ...by-wikicloth-doc.links => ruby-wikicloth.links} |    0
 debian/rules                                       |    2 +-
 6 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/debian/control b/debian/control
index b75a602..cc9aa9f 100644
--- a/debian/control
+++ b/debian/control
@@ -26,13 +26,12 @@ XB-Ruby-Versions: ${ruby:Versions}
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
+ libjs-jquery,
  ruby | ruby-interpreter,
  ruby-builder,
  ruby-expression-parser,
  ruby-i18n,
  ruby-rinku
-Suggests:
- ruby-wikicloth-doc
 Description: MediaWiki markup language parser for Ruby
  A parser for the MediaWiki markup language for Ruby.
  .
@@ -43,24 +42,3 @@ Description: MediaWiki markup language parser for Ruby
   * Disabling parsing markup
   * References
   * HTML sanitization
-
-Package: ruby-wikicloth-doc
-Section: doc
-Architecture: all
-Depends:
- ${misc:Depends},
- libjs-jquery
-Suggests:
- ruby-wikicloth
-Description: MediaWiki markup language parser for Ruby (documentation)
- A parser for the MediaWiki markup language for Ruby.
- .
- Supports:
-  * Variables and Templates
-  * Links
-  * MediaWiki markup
-  * Disabling parsing markup
-  * References
-  * HTML sanitization
- .
- This package contains documentation and sample documents for ruby-wikicloth.
diff --git a/debian/ruby-wikicloth-doc.doc-base b/debian/ruby-wikicloth.doc-base
similarity index 100%
rename from debian/ruby-wikicloth-doc.doc-base
rename to debian/ruby-wikicloth.doc-base
diff --git a/debian/ruby-wikicloth-doc.docs b/debian/ruby-wikicloth.examples
similarity index 60%
rename from debian/ruby-wikicloth-doc.docs
rename to debian/ruby-wikicloth.examples
index 53c786b..55d4a0a 100644
--- a/debian/ruby-wikicloth-doc.docs
+++ b/debian/ruby-wikicloth.examples
@@ -1,2 +1,2 @@
-examples
+examples/*
 sample_documents
diff --git a/debian/ruby-wikicloth-doc.install b/debian/ruby-wikicloth.install
similarity index 100%
rename from debian/ruby-wikicloth-doc.install
rename to debian/ruby-wikicloth.install
diff --git a/debian/ruby-wikicloth-doc.links b/debian/ruby-wikicloth.links
similarity index 100%
rename from debian/ruby-wikicloth-doc.links
rename to debian/ruby-wikicloth.links
diff --git a/debian/rules b/debian/rules
index a396c65..1b29c87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,4 +28,4 @@ override_dh_auto_install:
 	# remove extra license file
 	rm -f debian/ruby-wikicloth/usr/lib/ruby/vendor_ruby/wikicloth/extensions/lua/COPYING
 	# remove bundled jquery.js
-	rm -f debian/ruby-wikicloth-doc/usr/share/doc/ruby-wikicloth-doc/html/js/jquery.js
+	rm -f debian/ruby-wikicloth/usr/share/doc/ruby-wikicloth-doc/html/js/jquery.js

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