[DRE-commits] [shelr] 02/09: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ruby-extras/shelr

[Takaki Taniguchi]

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

takaki pushed a commit to branch master
in repository shelr.

commit c1437305f756ad2d5607504456df364128036c12
Merge: 1d9fb8b cb0681d
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Tue Jul 4 17:20:16 2017 +0900

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ruby-extras/shelr

 debian/compat    |  2 +-
 debian/control   | 21 +++++++++++++++------
 debian/copyright |  1 -
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --cc debian/control
index ed5f30e,d75a34d..eb1a63c
--- a/debian/control
+++ b/debian/control
@@@ -2,11 -2,16 +2,17 @@@ Source: shel
  Section: ruby
  Priority: optional
  Maintainer: Antono Vasiljev <self at antono.info>
 -Uploaders:
 +Uploaders: TANIGUCHI Takaki <takaki at debian.org>
- Build-Depends: debhelper (>= 7.0.50~), bash-completion, gem2deb (>= 0.2.5), ruby-json | libjson-ruby, ruby-rspec | librspec-ruby, ruby-mocha | libmocha-ruby
- Standards-Version: 3.9.3
- Vcs-Git: git://git.debian.org/pkg-ruby-extras/shelr.git
- Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/shelr.git;a=summary
+ Build-Depends: bash-completion,
+                debhelper (>= 9~),
+                gem2deb,
+                ruby-json | libjson-ruby,
+                ruby-mocha | libmocha-ruby,
+                ruby-rspec | librspec-ruby
+ Standards-Version: 3.9.7
+ Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/shelr.git
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/shelr.git
++>>>>>>> cb0681db1ae4ed4a58e52b9e771596e4a5dc29ac
  Homepage: http://shelr.tv/
  XS-Ruby-Versions: all
  

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