[DRE-commits] [SCM] ruby-hiera.git branch, master, updated. upstream/0.3.0-2-g5dc61ea

Patrick Ringl patrick_ at freenet.de
Sun Jun 17 17:06:20 UTC 2012 

The following commit has been merged in the master branch:
commit 5dc61ea0a11231eb1b4ad14557db994e020a6864
Author: Patrick Ringl <patrick_ at freenet.de>
Date:   Sun Jun 17 19:05:53 2012 +0200

    get ready to rumble! :-)

diff --git a/debian/changelog b/debian/changelog
index 4d5b953..d5bb6b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 ruby-hiera (0.3.0-1) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * Initial release (Closes: #677875)
 
- --  <pari at snoop>  Sun, 17 Jun 2012 19:02:37 +0200
+ -- Patrick Ringl <patrick_ at freenet.de>  Sun, 17 Jun 2012 07:02:21 +0200
diff --git a/debian/control b/debian/control
index a158a17..dfe810c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,21 @@ Source: ruby-hiera
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders:  <>
+Uploaders: Patrick Ringl <patrick_ at freenet.de>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.13~)
-Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-hiera.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-hiera.git;a=summary
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.17~), rake, ruby-rspec, ruby-mocha
+Standards-Version: 3.9.3
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-hiera.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-hiera.git;a=summary
 Homepage: https://github.com/puppetlabs/hiera/
-XS-Ruby-Versions: all
+XS-Ruby-Versions: ruby1.8
 
 Package: ruby-hiera
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8
 Description: Light weight hierarcical data store
- A pluggable data store for hierarcical data
+ ruby-hiera is a simple pluggable hierarchical database. It can be
+ used to store various information and therefor is a good fit for
+ the representation of infrastructure information.
+ It can be used to querying multiple data backends e.g. YAML or Puppet.
diff --git a/debian/copyright b/debian/copyright
index 4704d61..86c35aa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,43 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: hiera
-Source: FIXME <http://example.com/>
+Source: https://github.com/puppetlabs/hiera
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
+Copyright: 2010-2012 R.I.Pienaar <rip at devco.net>
+           2012 Puppet Labs <info at puppetlabs.com>
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
  .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
+ http://www.apache.org/licenses/LICENSE-2.0
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
  .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
+
 
 Files: debian/*
-Copyright: 2012  <>
-License:
- [LICENSE TEXT]
+Copyright: 2012 Patrick Ringl <patrick_ at freenet.de>
+License: GPL-2.0+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
diff --git a/debian/files b/debian/files
new file mode 100644
index 0000000..920d992
--- /dev/null
+++ b/debian/files
@@ -0,0 +1 @@
+ruby-hiera_0.3.0-1_all.deb ruby optional
diff --git a/debian/hiera.1 b/debian/hiera.1
new file mode 100644
index 0000000..d5cbeba
--- /dev/null
+++ b/debian/hiera.1
@@ -0,0 +1,48 @@
+.TH "HIERA" "1" "2012" "hiera" "Utils"
+.SH "NAME"
+hiera \- Lightweight Pluggable Hierarchical Database
+.SH "SYNOPSIS"
+.LP 
+.B hiera [\fBoptions\fR]
+.SH "DESCRIPTION"
+.LP 
+hiera is a simple pluggable hierarchical database.
+.br 
+.SH "OPTIONS"
+.LP
+Mandatory arguments to long options are mandatory for short options too.
+.LP
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Version information
+.TP
+\fB\-d\fR, \fB\-\-debug\fR
+Show debugging information
+.TP
+\fB\-a\fR, \fB\-\-array\fR
+Array search
+.TP
+\fB\-h\fR, \fB\-\-hash\fR
+Hash search
+.TP
+\fB\-c\fR, \fB\-\-config\fR CONFIG
+Configuration file
+.TP
+\fB\-j\fR, \fB\-\-json\fR SCOPE
+JSON format file to load scope from
+.TP
+\fB\-y\fR, \fB\-\-yaml\fR SCOPE
+YAML format file to load scope from
+.TP
+\fB\-m\fR, \fB\-\-mcollective\fR IDENTITY
+Retrieve facts from a node via mcollective as scope
+.HP
+\fB\-i\fR, \fB\-\-inventory_service\fR IDENTITY Retrieve facts for a node via Puppet's inventory service as scope
+.PP
+.br
+.SH "AUTHORS"
+.LP 
+hiera is a part of Puppet Hiera and developed by Puppet Labs <info at puppetlabs.com>, (R.I.Pienaar <rip at devco.net> respectively).
+.LP
+This man page was written by Patrick Ringl <patrick_ at freenet.de> for the Debian
+GNU/Linux distribution (but it may also be used by others).
diff --git a/debian/patches/dont-require-rubygems b/debian/patches/dont-require-rubygems
new file mode 100644
index 0000000..42b0484
--- /dev/null
+++ b/debian/patches/dont-require-rubygems
@@ -0,0 +1,32 @@
+Description: don't require rubygems, as the package is debianized.
+ Removing all calls to the rubygems framework is enforced by the 'pkg-ruby-extra'-team policy.
+Forwarded: not-needed
+Origin: vendor
+Author: Patrick Ringl <patrick_ at freenet.de>
+
+--- ruby-hiera-0.3.0.orig/bin/hiera
++++ ruby-hiera-0.3.0/bin/hiera
+@@ -11,7 +11,6 @@
+ #
+ # $ hiera release 'rel/%{location}' location=dc2 --yaml some.node.yaml
+ 
+-require 'rubygems'
+ require 'hiera'
+ require 'optparse'
+ 
+--- ruby-hiera-0.3.0.orig/lib/hiera.rb
++++ ruby-hiera-0.3.0/lib/hiera.rb
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'yaml'
+ 
+ class Hiera
+--- ruby-hiera-0.3.0.orig/spec/spec_helper.rb
++++ ruby-hiera-0.3.0/spec/spec_helper.rb
+@@ -1,6 +1,5 @@
+ $:.insert(0, File.join([File.dirname(__FILE__), "..", "lib"]))
+ 
+-require 'rubygems'
+ require 'rspec'
+ require 'hiera'
+ require 'rspec/mocks'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..281b00c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dont-require-rubygems
diff --git a/debian/ruby-hiera.manpages b/debian/ruby-hiera.manpages
new file mode 100644
index 0000000..9a261f9
--- /dev/null
+++ b/debian/ruby-hiera.manpages
@@ -0,0 +1 @@
+debian/hiera.1
diff --git a/debian/ruby-hiera.substvars b/debian/ruby-hiera.substvars
new file mode 100644
index 0000000..cecf462
--- /dev/null
+++ b/debian/ruby-hiera.substvars
@@ -0,0 +1,2 @@
+ruby:Versions=ruby1.8
+misc:Depends=
diff --git a/debian/ruby-test-files.yaml b/debian/ruby-test-files.yaml
deleted file mode 100644
index cb3cda0..0000000
--- a/debian/ruby-test-files.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
---- 
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/unit/backend/yaml_backend_spec.rb
-- spec/unit/backend_spec.rb
-- spec/unit/config_spec.rb
-- spec/unit/console_logger_spec.rb
-- spec/unit/hiera_spec.rb
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..34cfd93
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,8 @@
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:test) do |t|
+	t.pattern = 'spec/**/*_spec.rb'
+	t.rspec_opts = File.read("spec/spec.opts").chomp || ""
+end
+
+task :default => [:test]
diff --git a/debian/rules b/debian/rules
index a5e7dc8..9d2cbbb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 #
 # Uncomment to ignore some test failures (but the tests will run anyway).
 # Valid values:
-#export DH_RUBY_IGNORE_TESTS=ruby1.8 ruby1.9.1 require-rubygems
+export DH_RUBY_IGNORE_TESTS=ruby1.9.1
 #
 # If you need to specify the .gemspec (eg there is more than one)
 #export DH_RUBY_GEMSPEC=gem.gemspec
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
diff --git a/debian/watch b/debian/watch
index e0a7ab3..46ca906 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/hiera .*/hiera-(.*).tar.gz
+http://githubredir.debian.net/github/puppetlabs/hiera/ v?(.*).tar.gz

-- 
ruby-hiera.git

More information about the Pkg-ruby-extras-commits mailing list