[DRE-commits] [SCM] gem2deb.git branch, master, updated. 0.2.13-9-g5892534

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 1d37fdbd3435f40a18f0841b22da971b5e94eb1d
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Jan 16 17:19:57 2012 -0200

    Sane structure for debhelper lib directory

diff --git a/debhelper7/buildsystem/ruby.pm b/debhelper7/Debian/Debhelper/Buildsystem/ruby.pm
similarity index 100%
rename from debhelper7/buildsystem/ruby.pm
rename to debhelper7/Debian/Debhelper/Buildsystem/ruby.pm
diff --git a/debhelper7/buildsystem/rubysetuprb.pm b/debhelper7/Debian/Debhelper/Buildsystem/rubysetuprb.pm
similarity index 100%
rename from debhelper7/buildsystem/rubysetuprb.pm
rename to debhelper7/Debian/Debhelper/Buildsystem/rubysetuprb.pm
diff --git a/debhelper7/sequence/ruby.pm b/debhelper7/Debian/Debhelper/Sequence/ruby.pm
similarity index 100%
rename from debhelper7/sequence/ruby.pm
rename to debhelper7/Debian/Debhelper/Sequence/ruby.pm
diff --git a/test/test_helper.rb b/test/test_helper.rb
index eebbb6c..1ed342a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -129,13 +129,7 @@ class Gem2DebTestCase
   # system-wide installed versions.
   def self.run_command(cmd)
     # setup Perl lib for debhelper7
-    perl5lib = File.join(tmpdir, 'perl5')
-    debhelper_buildsystems = File.join(perl5lib, 'Debian/Debhelper/Buildsystem')
-    FileUtils.mkdir_p debhelper_buildsystems
-    FileUtils.cp "#{GEM2DEB_ROOT_SOURCE_DIR}/debhelper7/buildsystem/ruby.pm", debhelper_buildsystems
-    debhelper_sequences = File.join(perl5lib, 'Debian/Debhelper/Sequence')
-    FileUtils.mkdir_p debhelper_sequences
-    FileUtils.cp "#{GEM2DEB_ROOT_SOURCE_DIR}/debhelper7/sequence/ruby.pm", debhelper_sequences
+    perl5lib = File.join(GEM2DEB_ROOT_SOURCE_DIR, 'debhelper7')
 
     # setup the environment
     ENV['PERL5LIB'] = perl5lib

-- 
gem2deb.git