Install also config directory to /usr/lib/ruby. Other improvements: patch out rubygem...

diff --git a/rocci-core/debian/patches/rubygems.patch b/rocci-core/debian/patches/rubygems.patch
new file mode 100644 (file)
index 0000000..1a803f8
--- /dev/null
+++ b/rocci-core/debian/patches/rubygems.patch
@@ -0,0 +1,24 @@
+commit d50d44996e28a148fa4fc148ff536f162a1126c0
+Author: František Dvořák <valtri@civ.zcu.cz>
+Date:   Thu Mar 13 15:50:05 2014 +0100
+
+    Patch out rubygems as required in guidelines.
+
+diff --git a/lib/occi-core.rb b/lib/occi-core.rb
+index 5bfea48..b41248a 100644
+--- a/lib/occi-core.rb
++++ b/lib/occi-core.rb
+@@ -1,5 +1,3 @@
+-require 'rubygems'
+-
+ require 'set'
+ require 'uri'
+ require 'hashie/mash'
+@@ -11,7 +9,6 @@ require 'active_support/notifications'
+ 
+ require 'logger'
+ require 'uuidtools'
+-require 'rubygems/package'
+ require 'zlib'
+ require 'tempfile'
+ require 'settingslogic'

diff --git a/rocci-core/debian/patches/series b/rocci-core/debian/patches/series
new file mode 100644 (file)
index 0000000..7c57a99
--- /dev/null
+++ b/rocci-core/debian/patches/series
@@ -0,0 +1 @@
+rubygems.patch

diff --git a/rocci-core/debian/require-rubygems.overrides b/rocci-core/debian/require-rubygems.overrides
deleted file mode 100644 (file)
index 1081e04..0000000
--- a/rocci-core/debian/require-rubygems.overrides
+++ /dev/null
@@ -1 +0,0 @@
-debian/ruby-occi-core/usr/lib/ruby/vendor_ruby/occi-core.rb

diff --git a/rocci-core/debian/ruby-occi-core.dirs b/rocci-core/debian/ruby-occi-core.dirs
new file mode 100644 (file)
index 0000000..1e84325
--- /dev/null
+++ b/rocci-core/debian/ruby-occi-core.dirs
@@ -0,0 +1 @@
+usr/lib/ruby/config

diff --git a/rocci-core/debian/ruby-occi-core.docs b/rocci-core/debian/ruby-occi-core.docs
index b83c332..0b6e0f3 100644 (file)
--- a/rocci-core/debian/ruby-occi-core.docs
+++ b/rocci-core/debian/ruby-occi-core.docs
@@ -1,3 +1,2 @@
 AUTHORS
-LICENSE
 README.md

diff --git a/rocci-core/debian/ruby-occi-core.install b/rocci-core/debian/ruby-occi-core.install
new file mode 100644 (file)
index 0000000..96ede49
--- /dev/null
+++ b/rocci-core/debian/ruby-occi-core.install
@@ -0,0 +1 @@
+config usr/lib/ruby

diff --git a/rocci-core/gen-rocci-core.sh b/rocci-core/gen-rocci-core.sh
index 3b225fc..0a804f8 100755 (executable)
--- a/rocci-core/gen-rocci-core.sh
+++ b/rocci-core/gen-rocci-core.sh
@@ -31,10 +31,12 @@ p_name="ruby-occi-core"
 if [ -n "$tag" ]; then
        git checkout "$tag"
 fi
-rm -rf .git .gitignore
-tar -cf - ../rOCCI-core | gzip --best > ../${p_name}_$ver.orig.tar.gz
+tar -cf - --exclude .gitignore --exclude .git ../rOCCI-core | gzip --best > ../${p_name}_$ver.orig.tar.gz
 
 cp -rp ../debian .
+if [ x"$tag" = x"v4.2.10" ]; then
+       cp -vp ../rubygems-4.2.10-.patch debian/patches/rubygems.patch
+fi
 cat <<EOF > debian/changelog
 ${p_name} (${ver}-${age}) unstable; urgency=low
 

diff --git a/rocci-core/rubygems-4.2.10-.patch b/rocci-core/rubygems-4.2.10-.patch
new file mode 100644 (file)
index 0000000..f63141a
--- /dev/null
+++ b/rocci-core/rubygems-4.2.10-.patch
@@ -0,0 +1,24 @@
+commit 56e0c2f87fd2817f96f0a702fc0c4c653f9b9411
+Author: František Dvořák <valtri@civ.zcu.cz>
+Date:   Thu Mar 13 15:49:13 2014 +0100
+
+    Patch out rubygems as required in guidelines.
+
+diff --git a/lib/occi-core.rb b/lib/occi-core.rb
+index 340cd90..0eff234 100644
+--- a/lib/occi-core.rb
++++ b/lib/occi-core.rb
+@@ -1,5 +1,3 @@
+-require 'rubygems'
+-
+ require 'set'
+ require 'hashie/mash'
+ 
+@@ -10,7 +8,6 @@ require 'active_support/notifications'
+ 
+ require 'logger'
+ require 'uuidtools'
+-require 'rubygems/package'
+ require 'zlib'
+ require 'tempfile'
+ require 'settingslogic'