[DRE-commits] [SCM] ruby-treetop.git branch, master, updated. upstream/1.4.10-22-g9fb36ef

[Carl Worth]

The following commit has been merged in the master branch:
commit 7450dc5d507c27f6fa76586d212af8ec9e93f93f
Author: Carl Worth <cworth at debian.org>
Date:   Thu Mar 1 09:33:09 2012 -0800

    debian: Split the /usr/bin/tt program out into its own package named treetop.
    
    This way, the ruby-treetop package provides the library
    implementation, while the treetop provides the top-level script for
    converting a .treetop file into ruby code.

diff --git a/debian/control b/debian/control
index c3ccf12..9dd9ee1 100644
--- a/debian/control
+++ b/debian/control
@@ -14,8 +14,22 @@ XS-Ruby-Versions: all
 Package: ruby-treetop
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-polyglot, ruby-i18n
+Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-polyglot, ruby-i18n
+Suggests: treetop
 Description: Ruby-based text parsing and interpretation DSL
  Treetop is a language for describing languages. It provides a ruby
  implementation of a custom language based on parsing expression
  grammars (PEGs).
+ .
+ This package provides the ruby library implementation of treetop.
+
+Package: treetop
+Architecture: all
+XB-Ruby-Versions: ${ruby:Versions}
+Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-treetop
+Description: Ruby-based text parsing and interpretation (command-line utitlity)
+ Treetop is a language for describing languages. It provides a ruby
+ implementation of a custom language based on parsing expression
+ grammars (PEGs).
+ .
+ This package provides the top-level utility script tt.
diff --git a/debian/ruby-treetop.install b/debian/ruby-treetop.install
index 0310246..a3167ab 100644
--- a/debian/ruby-treetop.install
+++ b/debian/ruby-treetop.install
@@ -1 +1,2 @@
 doc/site/* /usr/share/doc/ruby-treetop/manual-html
+usr/lib
diff --git a/debian/rules b/debian/rules
index a5e7dc8..5e2ba4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,5 +11,10 @@
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec
 
+# In order to split the installed files into multiple packages,
+# (ruby-treetop and treetop), we have to tell dh_ruby to respect the
+# install directory being passed to it.
+export DH_RUBY_USE_DH_AUTO_INSTALL_DESTDIR=1
+
 %:
 	dh $@ --buildsystem=ruby --with ruby
diff --git a/debian/treetop.install b/debian/treetop.install
new file mode 100644
index 0000000..626544b
--- /dev/null
+++ b/debian/treetop.install
@@ -0,0 +1 @@
+usr/bin/tt

-- 
ruby-treetop.git