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

Sun Jun 17 17:40:42 UTC 2012

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

    get ready to rumble! :-)

diff --git a/debian/changelog b/debian/changelog
index 86b1faa..66c718c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 ruby-hiera-puppet (0.3.0-1) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #nnnn)
+  * Initial release (Closes: #677877)
 
- --  <pari at snoop>  Sun, 17 Jun 2012 19:38:04 +0200
+ -- Patrick Ringl <patrick_ at freenet.de>  Sun, 17 Jun 2012 13:47:40 +0200
diff --git a/debian/control b/debian/control
index 0f33bce..7b2e4d5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,20 @@ Source: ruby-hiera-puppet
 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-puppet.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-hiera-puppet.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-puppet.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-hiera-puppet.git;a=summary
 Homepage: https://github.com/puppetlabs/hiera-puppet
-XS-Ruby-Versions: all
+XS-Ruby-Versions: ruby1.8
 
 Package: ruby-hiera-puppet
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-# hiera (~> 0.3.0)
-Description: Puppet query interface and backend for Hiera
- Store and query Hiera data from Puppet
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8, ruby-hiera (>= 0.3.0)
+Description: data backend for ruby-hiera and puppet query function interface
+ ruby-hiera-puppet is a data backend for ruby-hiera that can query the
+ internal Puppet scope for data. It also includes a Puppet function that
+ works like extlookup() but uses the various Hiera backends.
diff --git a/debian/copyright b/debian/copyright
index 96368c3..d0a3a44 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-puppet
-Source: FIXME <http://example.com/>
+Source: https://github.com/puppetlabs/hiera-puppet
 
 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/extlookup2hiera.1 b/debian/extlookup2hiera.1
new file mode 100644
index 0000000..f88a330
--- /dev/null
+++ b/debian/extlookup2hiera.1
@@ -0,0 +1,32 @@
+.TH "EXTLOOKUP2HIERA" "1" "2012" "extlookup2hiera" "Utils"
+.SH "NAME"
+extlookup2hiera \- A 'puppet extlookup'-CSV converter
+.SH "SYNOPSIS"
+.LP 
+.B extlookup2hiera [\fBoptions\fR]
+.SH "DESCRIPTION"
+.LP
+extlookup2hiera is a converter for 'puppet extlookup'-CSV files into 'Hiera'-JSON or -YAML files.
+.LP
+.br 
+.SH "OPTIONS"
+.LP 
+.TP
+\fB\-i\fR, \fB\-\-in\fR FILE
+Input CSV file
+.TP
+\fB\-o\fR, \fB\-\-out\fR FILE
+Output Hiera file
+.TP
+\fB\-j\fR, \fB\-\-json\fR
+Create JSON format file
+.PP
+.LP
+When used without \fB\-j\fR or \fB\-\-json\fR it'll fallback to creating a YAML format file.
+.br
+.SH "AUTHORS"
+.LP 
+extlookup2hiera 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/ruby-hiera-puppet.manpages b/debian/ruby-hiera-puppet.manpages
new file mode 100644
index 0000000..b095122
--- /dev/null
+++ b/debian/ruby-hiera-puppet.manpages
@@ -0,0 +1 @@
+debian/extlookup2hiera.1
diff --git a/debian/ruby-hiera-puppet.substvars b/debian/ruby-hiera-puppet.substvars
new file mode 100644
index 0000000..cecf462
--- /dev/null
+++ b/debian/ruby-hiera-puppet.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 a87c224..0000000
--- a/debian/ruby-test-files.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
---- 
-- spec/spec_helper.rb
-- spec/unit/puppet_backend_spec.rb
-- spec/unit/scope_spec.rb
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
new file mode 100644
index 0000000..2e9a4e9
--- /dev/null
+++ b/debian/ruby-tests.rake
@@ -0,0 +1,7 @@
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:test) do |t|
+	t.pattern = 'spec/**/*_spec.rb'
+end
+
+task :default => [:test]
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 4b064bb..bce18c8 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://pkg-ruby-extras.alioth.debian.org/cgi-bin/gemwatch/hiera-puppet .*/hiera-puppet-(.*).tar.gz
+http://githubredir.debian.net/github/puppetlabs/hiera-puppet/ v?(.*).tar.gz

-- 
ruby-hiera-puppet.git

