Packaging updates and improvements based on gem2deb origin.

diff --git a/rocci-api/debian/control b/rocci-api/debian/control
index dcd2379..cdede88 100644 (file)
--- a/rocci-api/debian/control
+++ b/rocci-api/debian/control
@@ -2,11 +2,11 @@ Source: ruby-occi-api
 Section: ruby
 Priority: optional
 Maintainer: František Dvořák <valtri@civ.zcu.cz>
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.6.1~),git
 Standards-Version: 3.9.5
-Build-Depends:
- debhelper (>= 8), gem2deb, git
-Vcs-Browser: https://github.com/EGI-FCTF/rOCCI-api
-Vcs-Git: git://github.com/EGI-FCTF/rOCCI-api.git
+#Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-occi-api.git
+#Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-occi-api.git;a=summary
+Homepage: https://github.com/gwdg/rOCCI-api
 XS-Ruby-Versions: all
 
 Package: ruby-occi-api
@@ -14,7 +14,7 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends:
  ${misc:Depends}, ruby | ruby-interpreter,
- ruby-occi-core (>= 4.2.11), ruby-occi-core (<< 4.3),
+ ruby-occi-core (>= 4.2.12), ruby-occi-core (<< 4.3),
  ruby-httparty, ruby-json
 Description: Ruby OCCI API
  OCCI (the Open Cloud Computing Interface) is a standard by the Open Grid Forum,

diff --git a/rocci-api/debian/copyright b/rocci-api/debian/copyright
index 4e84c4f..ef61101 100644 (file)
--- a/rocci-api/debian/copyright
+++ b/rocci-api/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: rOCCI-api
 
 Files: *
-Copyright: Copyright (c) 2012 GWDG
+Copyright: 2012 GWDG
 License: Apache 2.0
 
 Files: debian/*

diff --git a/rocci-api/debian/ruby-occi-api.examples b/rocci-api/debian/ruby-occi-api.examples
new file mode 100644 (file)
index 0000000..e39721e
--- /dev/null
+++ b/rocci-api/debian/ruby-occi-api.examples
@@ -0,0 +1 @@
+examples/*

diff --git a/rocci-api/debian/rules b/rocci-api/debian/rules
index 5df7f46..82ddc0c 100755 (executable)
--- a/rocci-api/debian/rules
+++ b/rocci-api/debian/rules
@@ -1,5 +1,15 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
+#
+# Uncomment to ignore all test failures (but the tests will run anyway)
+#export DH_RUBY_IGNORE_TESTS=all
+#
+# Uncomment to ignore some test failures (but the tests will run anyway).
+# Valid values:
+#export DH_RUBY_IGNORE_TESTS=ruby1.9.1 ruby2.0 require-rubygems
+#
+# If you need to specify the .gemspec (eg there is more than one)
+#export DH_RUBY_GEMSPEC=gem.gemspec
 
 %:
        dh $@ --buildsystem=ruby --with ruby

diff --git a/rocci-api/debian/watch b/rocci-api/debian/watch
new file mode 100644 (file)
index 0000000..bd06636
--- /dev/null
+++ b/rocci-api/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/occi-api .*/occi-api-(.*).tar.gz

diff --git a/rocci-cli/debian/control b/rocci-cli/debian/control
index e4942a7..3584bec 100644 (file)
--- a/rocci-cli/debian/control
+++ b/rocci-cli/debian/control
@@ -2,18 +2,19 @@ Source: rocci-cli
 Section: ruby
 Priority: optional
 Maintainer: František Dvořák <valtri@civ.zcu.cz>
-Build-Depends: debhelper (>= 8), gem2deb, git
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.6.1~), git
 Standards-Version: 3.9.5
-Vcs-Browser: https://github.com/EGI-FCTF/rOCCI-cli
-Vcs-Git: git://github.com/EGI-FCTF/rOCCI-cli.git
+#Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-occi-cli.git
+#Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-occi-cli.git;a=summary
+Homepage: https://github.com/gwdg/rOCCI-cli
 XS-Ruby-Versions: all
 
 Package: rocci-cli
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-json,
- ruby-occi-api (>= 4.2.1), ruby-occi-api (<< 4.3), ruby-highline
-Description: rOCCI client
+ ruby-occi-api (>= 4.2.2), ruby-occi-api (<< 4.3), ruby-highline
+Description: Executable Ruby OCCI client
  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-cli is OCCI client based on the rOCCI (Ruby OCCI) Framework.

diff --git a/rocci-cli/debian/rules b/rocci-cli/debian/rules
index 5df7f46..82ddc0c 100755 (executable)
--- a/rocci-cli/debian/rules
+++ b/rocci-cli/debian/rules
@@ -1,5 +1,15 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
+#
+# Uncomment to ignore all test failures (but the tests will run anyway)
+#export DH_RUBY_IGNORE_TESTS=all
+#
+# Uncomment to ignore some test failures (but the tests will run anyway).
+# Valid values:
+#export DH_RUBY_IGNORE_TESTS=ruby1.9.1 ruby2.0 require-rubygems
+#
+# If you need to specify the .gemspec (eg there is more than one)
+#export DH_RUBY_GEMSPEC=gem.gemspec
 
 %:
        dh $@ --buildsystem=ruby --with ruby

diff --git a/rocci-core/debian/control b/rocci-core/debian/control
index 1f30969..8374aa7 100644 (file)
--- a/rocci-core/debian/control
+++ b/rocci-core/debian/control
@@ -2,11 +2,11 @@ Source: ruby-occi-core
 Section: ruby
 Priority: optional
 Maintainer: František Dvořák <valtri@civ.zcu.cz>
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.6.1~), git
 Standards-Version: 3.9.5
-Build-Depends:
-    debhelper (>= 8), gem2deb, git
-Vcs-Browser: https://github.com/EGI-FCTF/rOCCI-core
-Vcs-Git: git://github.com/EGI-FCTF/rOCCI-core.git
+#Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-occi-core.git
+#Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-occi-core.git;a=summary
+Homepage: https://github.com/gwdg/rOCCI-core
 XS-Ruby-Versions: all
 
 Package: ruby-occi-core
@@ -17,4 +17,6 @@ Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-activesupport-4.0,
 Description: Ruby OCCI Core
  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. This package provides Core of the rOCCI (Ruby OCCI) Framework.
+ clouds.
+ .
+ This package provides Core of the rOCCI (Ruby OCCI) Framework.

diff --git a/rocci-core/debian/copyright b/rocci-core/debian/copyright
index d10a268..f606fd9 100644 (file)
--- a/rocci-core/debian/copyright
+++ b/rocci-core/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: rOCCI-core
 
 Files: *
-Copyright: Copyright (c) 2012 GWDG
+Copyright: 2012 GWDG
 License: Apache 2.0
 
 Files: debian/*

diff --git a/rocci-core/debian/rules b/rocci-core/debian/rules
index 5df7f46..82ddc0c 100755 (executable)
--- a/rocci-core/debian/rules
+++ b/rocci-core/debian/rules
@@ -1,5 +1,15 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
+#
+# Uncomment to ignore all test failures (but the tests will run anyway)
+#export DH_RUBY_IGNORE_TESTS=all
+#
+# Uncomment to ignore some test failures (but the tests will run anyway).
+# Valid values:
+#export DH_RUBY_IGNORE_TESTS=ruby1.9.1 ruby2.0 require-rubygems
+#
+# If you need to specify the .gemspec (eg there is more than one)
+#export DH_RUBY_GEMSPEC=gem.gemspec
 
 %:
        dh $@ --buildsystem=ruby --with ruby

diff --git a/rocci-core/debian/watch b/rocci-core/debian/watch
new file mode 100644 (file)
index 0000000..a9c09cb
--- /dev/null
+++ b/rocci-core/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/occi-core .*/occi-core-(.*).tar.gz

diff --git a/rocci-server/debian/copyright b/rocci-server/debian/copyright
index cdbe005..660c69c 100644 (file)
--- a/rocci-server/debian/copyright
+++ b/rocci-server/debian/copyright
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: rOCCI-server
 
 Files: *
-Copyright: Copyright (c) 2013 GWDG, CESNET
+Copyright: 2013 GWDG, CESNET
 License: Apache 2.0
 
 Files: debian/*