[DRE-commits] [ruby-mail-gpg] 01/01: Import Debian patch 0.2.8-1
Georg Faerber
georg-alioth-guest at moszumanska.debian.org
Wed Nov 16 20:16:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
georg-alioth-guest pushed a commit to annotated tag debian/0.2.8-1
in repository ruby-mail-gpg.
commit 7e015c22e09426f54406a7a676a352b4c1b5b033
Merge: 5bb89ff 3a2108a
Author: georg <georg at debian>
Date: Sun Nov 6 16:45:42 2016 +0100
Import Debian patch 0.2.8-1
.gitignore | 1 -
.travis.yml | 22 ++++++----
History.txt | 11 +++++
README.md | 36 +++++++++++++++++
debian/changelog | 4 +-
debian/control | 23 ++++++-----
debian/copyright | 45 +++++++++++----------
debian/gbp.conf | 2 -
...figs_to_make_upstream_tests_work_with_gpg2.diff | 20 ---------
debian/patches/series | 1 -
debian/ruby-tests.rake | 27 ++-----------
lib/mail/gpg.rb | 10 ++---
lib/mail/gpg/inline_decrypted_message.rb | 6 +--
lib/mail/gpg/inline_signed_message.rb | 6 +--
lib/mail/gpg/mime_signed_message.rb | 4 +-
lib/mail/gpg/rails.rb | 2 +
lib/mail/gpg/rails/action_mailer_base_patch.rb | 31 +++++++-------
lib/mail/gpg/version.rb | 2 +-
test/action_mailer_test.rb | 7 +++-
test/gpg_test.rb | 2 +-
test/gpghome/gpg-agent.conf | 2 +
test/gpghome/pubring.gpg | Bin 3088 -> 1853 bytes
test/gpghome/pubring.gpg~ | Bin 1853 -> 1853 bytes
test/gpghome/random_seed | Bin 600 -> 600 bytes
test/message_test.rb | 21 +++++++++-
test/sign_part_test.rb | 2 +
test/test_helper.rb | 41 +++++++++++++++++++
27 files changed, 206 insertions(+), 122 deletions(-)
diff --cc debian/changelog
index 93f10a2,0000000..71fb0e3
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,5 @@@
- ruby-mail-gpg (0.2.6-1) unstable; urgency=medium
++ruby-mail-gpg (0.2.8-1) UNRELEASED; urgency=medium
+
+ * Initial release (Closes: #823771)
+
- -- Georg Faerber <georg at riseup.net> Sun, 08 May 2016 15:30:36 +0000
++ -- georg <georg at debian> Sun, 06 Nov 2016 16:45:42 +0100
diff --cc debian/control
index a194e79,0000000..755dca2
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,29 -1,0 +1,32 @@@
+Source: ruby-mail-gpg
+Section: ruby
+Priority: optional
+Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
- Uploaders: Georg Faerber <georg at riseup.net>
++Uploaders: <>
+Build-Depends: debhelper (>= 9~),
+ gem2deb,
+ rake,
- ruby-gpgme (>= 2.0.2~),
- ruby-mail (>= 2.5.3~),
- ruby-shoulda-context (>= 1.1~),
- ruby-actionmailer (>= 3.2.0~)
++ ruby-gpgme (>= 2.0),
++ ruby-gpgme (>= 2.0.2),
++ ruby-mail (>= 2.5),
++ ruby-mail (>= 2.5.3)
+Standards-Version: 3.9.8
+Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-mail-gpg.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-mail-gpg.git
+Homepage: https://github.com/jkraemer/mail-gpg
+Testsuite: autopkgtest-pkg-ruby
+XS-Ruby-Versions: all
+
+Package: ruby-mail-gpg
+Architecture: all
+XB-Ruby-Versions: ${ruby:Versions}
+Depends: ruby | ruby-interpreter,
- ruby-gpgme (>= 2.0.2~),
- ruby-mail (>= 2.5.3~),
- ${misc:Depends}
++ ruby-gpgme (>= 2.0),
++ ruby-gpgme (>= 2.0.2),
++ ruby-mail (>= 2.5),
++ ruby-mail (>= 2.5.3),
++ ${misc:Depends},
++ ${shlibs:Depends}
+Description: GPG/MIME encryption plugin for the Ruby Mail Library
- This tiny library adds GPG capabilities to Mail::Message and
- ActionMailer::Base. Because privacy matters.
++ GPG/MIME encryption plugin for the Ruby Mail Library
++ This tiny gem adds GPG capabilities to Mail::Message and ActionMailer::Base. Because privacy matters.
diff --cc debian/copyright
index d3907f0,0000000..6298458
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,32 -1,0 +1,35 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: mail-gpg
+Source: https://github.com/jkraemer/mail-gpg
+
+Files: *
- Copyright: 2013 Jens Kraemer <jk at jkraemer.net>
- License: Expat
++Copyright: <years> <put author's name and email here>
++ <years> <likewise for another author>
++License: GPL-2+ (FIXME)
+
+Files: debian/*
- Copyright: 2016 Georg Faerber <georg at riseup.net>
- License: Expat
++Copyright: 2016 <>
++License: GPL-2+ (FIXME)
+Comment: the Debian packaging is licensed under the same terms as the original package.
+
- License: Expat
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
++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.
+ .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
++ 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.
+ .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++ 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
++ .
++ 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'.
diff --cc debian/ruby-tests.rake
index 4aefcf6,0000000..63f3fd6
mode 100644,000000..100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@@ -1,25 -1,0 +1,6 @@@
- require 'rake/testtask'
++require 'gem2deb/rake/testtask'
+
- def setup_gpghome
- ENV['GNUPGHOME'] = File.join File.expand_path("..", ".."), 'build-area', 'ruby-mail-gpg-0.2.6', 'test', 'gpghome'
- ENV['GPG_AGENT_INFO'] = ENV['GNUPGHOME'] + '/S.gpg-agent:0:1'
- sh 'echo $GPG_AGENT_INFO'
- sh 'gpgconf --launch gpg-agent'
- sh 'gpgconf --reload gpg-agent'
- end
-
- task :default => ["mail_gpg:tests:setup", :test]
-
- namespace :mail_gpg do
- namespace :tests do
- task :setup do
- setup_gpghome
- end
- end
- end
-
- Rake::TestTask.new(:test) do |test|
- test.libs << 'test'
- test.test_files = FileList['test/**/*_test.rb']
- test.verbose = true
++Gem2Deb::Rake::TestTask.new do |t|
++ t.libs = ['test']
++ t.test_files = FileList['test/**/*_test.rb'] + FileList['test/**/test_*.rb']
+end
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-mail-gpg.git
More information about the Pkg-ruby-extras-commits
mailing list