[DRE-commits] [SCM] rails-4.0.git branch, master, updated. debian/4.0.0_rc1-1-1-g4405d7c

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 4405d7c4b84e8fdd232615799c9f75fb60c63a92
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu May 30 17:12:57 2013 -0300

    Migrate to use dh_ruby multi-binary support

diff --git a/debian/control b/debian/control
index 8d69213..e54797d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
 Uploaders: Ondřej Surý <ondrej at debian.org>,
 	   Antonio Terceiro <terceiro at debian.org>,
 Build-Depends: debhelper (>= 9),
-	       gem2deb (>= 0.3.0~)
+	       gem2deb (>= 0.4.0~)
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/rails-4.0.git
 Vcs-Browser: http://anonscm.debian.org/git/?p=pkg-ruby-extras/rails-4.0.git;a=summary
@@ -14,6 +14,7 @@ XS-Ruby-Versions: all
 
 Package: ruby-activesupport-4.0
 Architecture: all
+X-DhRuby-Root: activesupport/
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends},
 	 ${misc:Depends},
@@ -33,6 +34,7 @@ Description: Support and utility classes used by the Rails 4.0 framework
 
 Package: ruby-activerecord-4.0
 Architecture: all
+X-DhRuby-Root: activerecord/
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${misc:Depends},
 	 ruby | ruby-interpreter,
@@ -51,6 +53,7 @@ Description: object-relational mapper framework (part of Rails)
 
 Package: ruby-activemodel-4.0
 Architecture: all
+X-DhRuby-Root: activemodel/
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${misc:Depends},
 	 ruby | ruby-interpreter,
@@ -68,6 +71,7 @@ Description: toolkit for building modeling frameworks (part of Rails)
 
 Package: ruby-actionpack-4.0
 Architecture: all
+X-DhRuby-Root: actionpack/
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${misc:Depends},
 	 ruby | ruby-interpreter,
@@ -86,6 +90,7 @@ Description: web-flow and rendering framework putting the VC in MVC (part of Rai
 
 Package: ruby-actionmailer-4.0
 Architecture: all
+X-DhRuby-Root: actionmailer/
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends},
 	 ${misc:Depends},
@@ -103,6 +108,7 @@ Description: email composition, delivery, and receiving framework (part of Rails
 
 Package: ruby-railties-4.0
 Architecture: all
+X-DhRuby-Root: railties/
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${misc:Depends},
 	 ruby | ruby-interpreter,
@@ -125,6 +131,7 @@ Description: MVC ruby based framework geared for web application development
 
 Package: ruby-rails-4.0
 Architecture: all
+X-DhRuby-Root: ./
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends},
 	 ${misc:Depends},
diff --git a/debian/ruby-actionmailer-4.0.install b/debian/ruby-actionmailer-4.0.install
deleted file mode 100644
index 020e246..0000000
--- a/debian/ruby-actionmailer-4.0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/ruby/vendor_ruby/action_mailer*
-usr/share/rubygems-integration/*/specifications/actionmailer*
diff --git a/debian/ruby-actionpack-4.0.install b/debian/ruby-actionpack-4.0.install
deleted file mode 100644
index f3941a8..0000000
--- a/debian/ruby-actionpack-4.0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/ruby/vendor_ruby/action_pack*
-usr/share/rubygems-integration/*/specifications/actionpack*
diff --git a/debian/ruby-activemodel-4.0.install b/debian/ruby-activemodel-4.0.install
deleted file mode 100644
index 0a5231f..0000000
--- a/debian/ruby-activemodel-4.0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/ruby/vendor_ruby/active_model*
-usr/share/rubygems-integration/*/specifications/activemodel*
diff --git a/debian/ruby-activerecord-4.0.install b/debian/ruby-activerecord-4.0.install
deleted file mode 100644
index 2a9c576..0000000
--- a/debian/ruby-activerecord-4.0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/ruby/vendor_ruby/active_record*
-usr/share/rubygems-integration/*/specifications/activerecord*
diff --git a/debian/ruby-activesupport-4.0.install b/debian/ruby-activesupport-4.0.install
deleted file mode 100644
index 2150f03..0000000
--- a/debian/ruby-activesupport-4.0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/ruby/vendor_ruby/active_support*
-usr/share/rubygems-integration/*/specifications/activesupport*
diff --git a/debian/ruby-railties-4.0.install b/debian/ruby-railties-4.0.install
deleted file mode 100644
index d8c3fa2..0000000
--- a/debian/ruby-railties-4.0.install
+++ /dev/null
@@ -1,14 +0,0 @@
-usr/lib/ruby/vendor_ruby/abstract_controller
-usr/lib/ruby/vendor_ruby/rails
-usr/lib/ruby/vendor_ruby/action_view
-usr/lib/ruby/vendor_ruby/action_dispatch
-usr/lib/ruby/vendor_ruby/action_controller
-usr/bin/generate_tables
-usr/bin/rails
-usr/share/rubygems-integration/*/specifications/railties-*
-usr/share/rubygems-integration/*/specifications/rails-*
-usr/lib/ruby/vendor_ruby/rails.rb
-usr/lib/ruby/vendor_ruby/abstract_controller.rb
-usr/lib/ruby/vendor_ruby/action_controller.rb
-usr/lib/ruby/vendor_ruby/action_dispatch.rb
-usr/lib/ruby/vendor_ruby/action_view.rb
diff --git a/debian/rules b/debian/rules
index f1c4adf..b283ca1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,29 +11,11 @@
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec
 
-export DH_RUBY_USE_DH_AUTO_INSTALL_DESTDIR=yes
-
 UPSTREAM_PACKAGES=actionmailer activerecord activemodel activesupport railties actionpack
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
-override_dh_auto_configure:
-override_dh_auto_build:
-override_dh_auto_clean:
-override_dh_auto_test:
-override_dh_auto_install:
-	CMD=$$(echo $@ | sed -e "s/override_//"); \
-	DH_RUBY_GEMSPEC=rails.gemspec $$CMD; \
-	for pkg in $(UPSTREAM_PACKAGES); do \
-	  ln -s ../debian $${pkg}; \
-	  DH_RUBY_GEMSPEC=$${pkg}.gemspec $$CMD -D$${pkg}; \
-	  rm $${pkg}/debian; \
-	done
-
-override_dh_install:
-	dh_install --fail-missing
-
 override_dh_installexamples:
 	dh_installexamples -Xjquery.min.js -X.gitignore
 	chmod -x \

-- 
rails-4.0.git