Replace bundler by dependencies from distribution packages.

diff --git a/rocci-server/debian/control b/rocci-server/debian/control
index ad09cbb..ca40cf2 100644 (file)
--- a/rocci-server/debian/control
+++ b/rocci-server/debian/control
@@ -2,22 +2,19 @@ Source: rocci-server
 Section: ruby
 Priority: optional
 Maintainer: František Dvořák <valtri@civ.zcu.cz>
-Standards-Version: 3.9.4
-Build-Depends:
-    debhelper (>= 8), bundler, ca-certificates, git, libssl-dev, rake,
-    ruby-redcarpet, ruby-dev, ruby-nokogiri, yard
-# gem2deb - not working with local deps
+Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 8), gem2deb (>= 0.6.1~)
 Vcs-Browser: https://github.com/EGI-FCTF/rOCCI-server
 Vcs-Git: git://github.com/EGI-FCTF/rOCCI-server.git
-#XS-Ruby-Versions: ruby1.9.1
+XS-Ruby-Versions: ruby1.9.1
 
 Package: rocci-server
 Architecture: any
-#XB-Ruby-Versions: ${ruby:Versions}
+XB-Ruby-Versions: ${ruby:Versions}
 Pre-Depends: ${misc:Pre-Depends}, adduser
-Depends:
-    bundler, git, memcached, ruby | ruby-interpreter, ruby-nokogiri,
-    ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
+# keystones: openssl-cms-1-9-3/openssl-cms-2-0-0
+# opennebula: erubis, opennebula-4.0
+Depends: git, memcached, ruby | ruby-interpreter, ruby-dalli, ruby-erubis, ruby-hashie, ruby-ice-nine, ruby-jbuilder (>= 2.0.0), ruby-jbuilder (<< 2.1), ruby-kgio, ruby-nokogiri, ruby-occi-core (>= 4.2.10), ruby-logstasher, ruby-occi-core (<< 4.3), ruby-opennebula-4.4, ruby-openssl-cms-1-9-3, ruby-rails-4.0, ruby-rails-api (>= 0.2.0), ruby-rails-api (<< 0.3), ruby-warden, ruby-whenever, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Suggests: rocci-server-apache
 Description: Ruby OCCI Server
  OCCI (the Open Cloud Computing Interface) is a standard by the Open Grid Forum,
@@ -42,20 +39,3 @@ Description: Ruby OCCI Server with configurations for Apache
  .
  This package contains configuration files, setup scripts, and dependencies for
  running rOCCI server in Apache.
-
-Package: rocci-server-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
-Depends:
-    rocci-server (= ${binary:Version}),
-    ${misc:Depends}
-Description: debugging symbols for rocci-server
- OCCI (the Open Cloud Computing Interface) is a standard by the Open Grid Forum,
- specifying a protocol and API to perform various remote management tasks in
- clouds. The rOCCI-server extends cloud managers, which are not OCCI-compliant
- natively, with its own OCCI interface. It is based on the rOCCI (Ruby OCCI)
- Framework.
- .
- This package contains the debugging symbols for rocci-server-dbg.

diff --git a/rocci-server/debian/rules b/rocci-server/debian/rules
index d8c6220..90f407c 100755 (executable)
--- a/rocci-server/debian/rules
+++ b/rocci-server/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
-# not using "dh $@ --setubprb ?? --buildsystem=ruby --with ruby", we want locally deployed deps
-
 p_name=rocci-server
 
 binary:
@@ -15,12 +13,9 @@ binary:
                > debian/occi-ssl
        dh $@
 
-build:
-       bundle install --deployment --without 'test development'
-       dh $@
-
-override_dh_strip:
-       dh_strip --dbg-package=$(p_name)-dbg
+#build:
+#      bundle install --deployment --without 'test development'
+#      dh $@
 
 override_dh_installdocs:
        dh_installdocs --link-doc=$(p_name)
@@ -30,6 +25,6 @@ override_dh_fixperms:
        chmod 0600 debian/rocci-server-apache/etc/apache2/sites-available/occi-ssl
 
 %:
-       dh $@ --fail-missing
+       dh $@ --buildsystem=ruby --with ruby --fail-missing
 
-.PHONY: override_dh_strip override_dh_installdocs override_dh_fixperms
+.PHONY: override_dh_installdocs override_dh_fixperms