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

[Takaki Taniguchi]

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

takaki pushed a commit to branch master
in repository adlint.

commit f4ab1f668c3cb01cb7e5de2b1ddfa70d578427e5
Merge: bae6f17 2a832ee
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Fri Jun 6 15:57:05 2014 +0900

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

 debian/changelog | 10 ++++++++--
 debian/control   |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index aaea70d,0829fbe..923d807
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,11 +1,19 @@@
 +adlint (3.2.14-1) unstable; urgency=medium
 +
 +  * Imported Upstream version 3.2.14
 +  * Fix message file path. (Closes: #730533)
 +  * debian/control:
-     + Bump Ruby version to 2.1
-     + Bump Standards-Version 3.9.5.
 +
 + -- TANIGUCHI Takaki <takaki at debian.org>  Fri, 06 Jun 2014 15:52:27 +0900
 +
+ adlint (3.2.0-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Build for all Ruby versions
+   * Bump Standards-Version to 3.9.5 (no changes)
+ 
+  -- Christian Hofstaedtler <zeha at debian.org>  Wed, 09 Apr 2014 20:50:04 +0200
+ 
  adlint (3.2.0-1) unstable; urgency=low
  
    * Imported Upstream version 3.0.10

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