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

[Takaki Taniguchi]

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

takaki pushed a commit to branch master
in repository ruby-indentation.

commit 2da13e22cbcb952109d6257d5aaf60a51c2568c1
Merge: f78d576 ebc1ec6
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Sun Jun 22 15:20:10 2014 +0900

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-ruby-extras/ruby-indentation
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog            | 11 +++++++++++
 debian/control              | 11 +++++------
 debian/ruby-test-files.yaml |  1 +
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 905f77b,9f58dfc..4bad3c7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,14 +1,22 @@@
 +ruby-indentation (0.1.1-1) unstable; urgency=medium
 +
 +  * Imported Upstream version 0.1.1
 +  * debian/control: Drop DM-Upload-Allowed
 +  * Bump Standards-Version to 3.9.5 (with no changes).
 +
 + -- TANIGUCHI Takaki <takaki at debian.org>  Tue, 24 Dec 2013 10:06:05 +0900
 +
+ ruby-indentation (0.0.7-2) unstable; urgency=low
+ 
+   * Team upload
+   * debian/control: 
+     + remove obsolete DM-Upload-Allowed flag
+     + use canonical URI in Vcs-* fields
+   * debian/ruby-test-files.yaml: add rspec/autorun to the list
+     so that specs are run (Closes: #715013)
+ 
+  -- Cédric Boutillier <boutil at debian.org>  Sat, 13 Jul 2013 01:31:39 +0200
+ 
  ruby-indentation (0.0.7-1) unstable; urgency=low
  
    * update Format URL
diff --cc debian/control
index 0018c3e,6687c3c..f23c2a5
--- a/debian/control
+++ b/debian/control
@@@ -2,11 -2,11 +2,11 @@@ Source: ruby-indentatio
  Section: ruby
  Priority: optional
  Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
- Uploaders:  TANIGUCHI Takaki <takaki at debian.org>
+ Uploaders: TANIGUCHI Takaki <takaki at debian.org>
  Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.12~), ruby-rspec
 -Standards-Version: 3.9.4
 +Standards-Version: 3.9.5
- Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-indentation.git
- Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-indentation.git;a=summary
+ Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-indentation.git
+ Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-indentation.git;a=summary
  Homepage: https://github.com/samueldana/indentation
  XS-Ruby-Versions: all
  

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