[DRE-commits] [ruby-pygments.rb] 02/03: Don't generate seperate doc package

[Axel Wagner]

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

merovius-guest pushed a commit to branch master
in repository ruby-pygments.rb.

commit 4c5e59d29bed4a26274cbf2631beaa572e50d3ec
Author: Axel Wagner <mail at merovius.de>
Date:   Sun Feb 23 02:01:31 2014 +0100

    Don't generate seperate doc package
---
 debian/control                                     | 23 ----------------------
 debian/ruby-pygments.rb-doc.install                |  1 -
 ...s.rb-doc.doc-base => ruby-pygments.rb.doc-base} |  6 +++---
 debian/ruby-pygments.rb.install                    |  1 +
 ...ygments.rb-doc.links => ruby-pygments.rb.links} |  2 +-
 5 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/debian/control b/debian/control
index 8f757e9..f19744d 100644
--- a/debian/control
+++ b/debian/control
@@ -29,8 +29,6 @@ Depends:
  ruby | ruby-interpreter,
  ruby-posix-spawn,
  ruby-yajl
-Suggests:
- ruby-pygments.rb-doc
 Description: pygments wrapper for Ruby
  A Ruby wrapper for the Python pygments syntax highlighter.
  .
@@ -41,24 +39,3 @@ Description: pygments wrapper for Ruby
  Each Ruby process that runs has its own 'personal Python'; for example, 4
  Unicorn workers will have one Python process each.  If a Python process dies,
  a new one will be spawned on the next pygments.rb request.
-
-Package: ruby-pygments.rb-doc
-Section: doc
-Architecture: all
-Depends:
- ${misc:Depends},
- libjs-jquery
-Suggests:
- ruby-pygments.rb
-Description: pygments wrapper for Ruby (doc)
- A Ruby wrapper for the Python pygments syntax highlighter.
- .
- pygments.rb works by talking over a simple pipe to a long-lived Python child
- process. This library replaces albino, as well as a version of pygments.rb
- that used an embedded Python interpreter.
- .
- Each Ruby process that runs has its own 'personal Python'; for example, 4
- Unicorn workers will have one Python process each.  If a Python process dies,
- a new one will be spawned on the next pygments.rb request.
- .
- This contains documentation for ruby-pygments.rb.
diff --git a/debian/ruby-pygments.rb-doc.install b/debian/ruby-pygments.rb-doc.install
deleted file mode 100644
index a9ab4fa..0000000
--- a/debian/ruby-pygments.rb-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-doc/*   /usr/share/doc/ruby-pygments.rb-doc/html/
diff --git a/debian/ruby-pygments.rb-doc.doc-base b/debian/ruby-pygments.rb.doc-base
similarity index 81%
rename from debian/ruby-pygments.rb-doc.doc-base
rename to debian/ruby-pygments.rb.doc-base
index ec912a7..cb2771a 100644
--- a/debian/ruby-pygments.rb-doc.doc-base
+++ b/debian/ruby-pygments.rb.doc-base
@@ -1,4 +1,4 @@
-Document: ruby-pygments.rb-doc
+Document: ruby-pygments.rb
 Title: Debian ruby-pygments.rb Manual
 Author: Aman Gupta, Ted Nyman
 Abstract: pygments wrapper for Ruby
@@ -14,5 +14,5 @@ Abstract: pygments wrapper for Ruby
 Section: Programming/Ruby
 
 Format: HTML
-Index: /usr/share/doc/ruby-pygments.rb-doc/html/index.html
-Files: /usr/share/doc/ruby-pygments.rb-doc/html/*
+Index: /usr/share/doc/ruby-pygments.rb/html/index.html
+Files: /usr/share/doc/ruby-pygments.rb/html/*
diff --git a/debian/ruby-pygments.rb.install b/debian/ruby-pygments.rb.install
index 8fd5311..4c8ccd7 100644
--- a/debian/ruby-pygments.rb.install
+++ b/debian/ruby-pygments.rb.install
@@ -1 +1,2 @@
 lexers usr/share/ruby-pygments.rb/
+doc/*  usr/share/doc/ruby-pygments.rb/html/
diff --git a/debian/ruby-pygments.rb-doc.links b/debian/ruby-pygments.rb.links
similarity index 70%
rename from debian/ruby-pygments.rb-doc.links
rename to debian/ruby-pygments.rb.links
index 37d9308..aed58c2 100644
--- a/debian/ruby-pygments.rb-doc.links
+++ b/debian/ruby-pygments.rb.links
@@ -1 +1 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/ruby-pygments.rb-doc/html/js/jquery.js
+usr/share/javascript/jquery/jquery.js usr/share/doc/ruby-pygments.rb/html/js/jquery.js

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