[DRE-commits] [trocla] 02/02: Initially rename and configure package

Mon Feb 16 15:57:45 UTC 2015

This is an automated email from the git hooks/post-receive script.

michaelweiser-guest pushed a commit to branch master
in repository trocla.

commit 4fb6d47caf8383f9a93e9b4ddb5f7ed101b1e3bc
Author: Michael Weiser <michael.weiser at gmx.de>
Date:   Mon Feb 16 16:56:04 2015 +0100

    Initially rename and configure package
---
 debian/control                      | 16 +++++++++------
 debian/copyright                    | 39 ++++++++++++++++---------------------
 debian/patches/0001-testsuite.patch | 35 +++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 4 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/debian/control b/debian/control
index 6059c45..95a0c48 100644
--- a/debian/control
+++ b/debian/control
@@ -3,18 +3,22 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Weiser <michael.weiser at gmx.de>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb, ruby-rspec, rake
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 7.0.50~), gem2deb, ruby-rspec, rake, ruby-mocha,
+	ruby-moneta, ruby-highline, ruby-bcrypt
+Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/trocla.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/trocla.git;a=summary
 Homepage: https://tech.immerda.ch/2011/12/trocla-get-hashed-passwords-out-of-puppet-manifests/
-Testsuite: autopkgtest
 XS-Ruby-Versions: all
 
 Package: trocla
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-moneta, ruby-highline, ruby-bcrypt
 # moneta (~> 0.7), highline (>= 0), bcrypt (>= 0), rspec (~> 2.4, development), rdoc (~> 3.8, development), mocha (>= 0, development), jeweler (>= 0, development)
-Description: Trocla a simple password generator and storage
- Trocla helps you to generate random passwords and to store them in various formats (plain, MD5, bcrypt) for later retrival.
+Description: Simple password generator and storage
+ Trocla provides you a simple way to create and store (random) passwords on a
+ central server, which can be retrieved by other applications. An example for
+ such an application is puppet and trocla can help you to not store any
+ plaintext or hashed passwords in your manifests by keeping these passwords only
+ on your puppetmaster.
diff --git a/debian/copyright b/debian/copyright
index e9bb2fc..19908be 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,30 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: trocla
-Source: FIXME <http://example.com/>
+Source: https://github.com/duritong/trocla
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2011-2014 Marcel Haerry <mh+trocla at immerda.ch>
+License: GPL-3
 
 Files: debian/*
 Copyright: 2015 Michael Weiser <michael.weiser at gmx.de>
-License: GPL-2+ (FIXME)
+License: GPL-3
 Comment: the Debian packaging is licensed under the same terms as the original package.
 
-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.
+License: GPL-3
+ 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 3 of the License, or
+ (at your option) any later version.
  .
- 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.
+ 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.
  .
- 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
+ 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 full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/patches/0001-testsuite.patch b/debian/patches/0001-testsuite.patch
new file mode 100644
index 0000000..bcc1b32
--- /dev/null
+++ b/debian/patches/0001-testsuite.patch
@@ -0,0 +1,35 @@
+Fix the testsuite.
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 461a858..cd04768 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -2,6 +2,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+ $LOAD_PATH.unshift(File.dirname(__FILE__))
+ require 'rspec'
+ require 'mocha'
++require 'yaml'
+ require 'trocla'
+ 
+ # Requires supporting files with custom matchers and macros, etc,
+diff --git a/spec/trocla_spec.rb b/spec/trocla_spec.rb
+index 61d9921..71bb41b 100644
+--- a/spec/trocla_spec.rb
++++ b/spec/trocla_spec.rb
+@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+ describe "Trocla" do
+   
+   before(:each) do
+-    Trocla.any_instance.expects(:read_config).returns(test_config)
++    Trocla.any_instance.should_receive(:read_config).and_return(test_config)
+     @trocla = Trocla.new
+   end
+   
+@@ -114,6 +114,7 @@ describe "Trocla" do
+   
+   describe "VERSION" do
+     it "should return a version" do
++      @trocla.password('delete_test3','mysql').should_not be_nil
+       Trocla::VERSION::STRING.should_not be_empty
+     end
+   end
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5214ce1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-testsuite.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/trocla.git

