[DRE-commits] [SCM] ruby-validatable.git branch, master, updated. debian/1.6.7-7-2-g81d780d

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 0a632459a1979f5f50a80d22ff435540dc2fff43
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Wed Jun 13 23:27:44 2012 +0200

    move secondary files to validatable/ subdir

diff --git a/debian/patches/move_some_rb_files_to_lib_validatable.patch b/debian/patches/move_some_rb_files_to_lib_validatable.patch
new file mode 100644
index 0000000..f8e156c
--- /dev/null
+++ b/debian/patches/move_some_rb_files_to_lib_validatable.patch
@@ -0,0 +1,49 @@
+Description: secondary Ruby files moved to validatable/ subdir
+ in order to avoid name clash, e.g. with ruby-dust
+ Require statement are updated accordingly with this patch
+Bug-Debian: http://bugs.debian.org/673738
+Forwarded: not-needed
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Last-Update: 2012-06-13
+
+--- a/lib/validatable.rb
++++ b/lib/validatable.rb
+@@ -1,19 +1,19 @@
+ require 'forwardable'
+-require File.expand_path(File.dirname(__FILE__) + '/object_extension')
+-require File.expand_path(File.dirname(__FILE__) + '/errors')
+-require File.expand_path(File.dirname(__FILE__) + '/validatable_class_methods')
+-require File.expand_path(File.dirname(__FILE__) + '/macros')
+-require File.expand_path(File.dirname(__FILE__) + '/validatable_instance_methods')
+-require File.expand_path(File.dirname(__FILE__) + '/included_validation')
+-require File.expand_path(File.dirname(__FILE__) + '/child_validation')
+-require File.expand_path(File.dirname(__FILE__) + '/understandable')
+-require File.expand_path(File.dirname(__FILE__) + '/requireable')
+-require File.expand_path(File.dirname(__FILE__) + '/validations/validation_base')
+-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_format_of')
+-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_presence_of')
+-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_acceptance_of')
+-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_confirmation_of')
+-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_length_of')
+-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_true_for')
+-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_numericality_of')
+-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_each')
+\ No newline at end of file
++require File.expand_path(File.dirname(__FILE__) + '/validatable/object_extension')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/errors')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/validatable_class_methods')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/macros')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/validatable_instance_methods')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/included_validation')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/child_validation')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/understandable')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/requireable')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/validations/validation_base')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/validations/validates_format_of')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/validations/validates_presence_of')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/validations/validates_acceptance_of')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/validations/validates_confirmation_of')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/validations/validates_length_of')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/validations/validates_true_for')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/validations/validates_numericality_of')
++require File.expand_path(File.dirname(__FILE__) + '/validatable/validations/validates_each')
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c022f6a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+move_some_rb_files_to_lib_validatable.patch
diff --git a/debian/rules b/debian/rules
index a5e7dc8..4bc16e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,5 +11,17 @@
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec
 
+VENDORDIR     = $(CURDIR)/debian/ruby-validatable/usr/lib/ruby/vendor_ruby
+FILES_TO_MOVE=validations *_validation.rb errors.rb macros.rb object_extension.rb requireable.rb understandable.rb validatable_class_methods.rb validatable_instance_methods.rb
+
+
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_install:
+	dh_install
+	mkdir $(VENDORDIR)/validatable
+	for x in $(FILES_TO_MOVE) ; do \
+		mv $(VENDORDIR)/$$x $(VENDORDIR)/validatable/ ; \
+	done
+
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches

-- 
ruby-validatable.git