[DRE-commits] [ruby-carrierwave] 03/08: Merge branch 'master-0.10' into HEAD

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-carrierwave.

commit b065477048e8871aaf869a833854835689684584
Merge: fc4b0c8 8283d7b
Author: Pirate Praveen <praveen at debian.org>
Date:   Mon Jul 24 17:25:41 2017 +0530

    Merge branch 'master-0.10' into HEAD

 debian/changelog                                           | 14 ++++++++++++++
 debian/control                                             |  4 +---
 ...-tests.rake => ruby-tests.rake.disabled.need.mysql.5.7} |  0
 debian/rules                                               |  6 +++---
 debian/start_mysqld_and_auto_install.sh                    |  2 +-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index 482ec00,4c655ab..8fc66dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,17 +1,31 @@@
 +ruby-carrierwave (1.1.0-1) UNRELEASED; urgency=medium
 +
 +  * Team upload.
 +  * debian/control: add Testsuite field (Closes: #830068)
 +
 + -- Lucas Kanashiro <kanashiro at debian.org>  Wed, 24 May 2017 12:46:29 -0300
 +
 +ruby-carrierwave (0.11.2-1) experimental; urgency=medium
 +
 +  * Team upload
 +  * New upstream release
 +
 + -- Sruthi Chandran <srud at disroot.org>  Sat, 27 Aug 2016 00:16:30 +0530
 +
+ ruby-carrierwave (0.10.0+gh-4) unstable; urgency=high
+ 
+   * Disable tests, --initialize-insecure does not work with mariadb
+    (Closes: #841543)
+ 
+  -- Pirate Praveen <praveen at debian.org>  Tue, 29 Nov 2016 00:44:06 +0530
+ 
+ ruby-carrierwave (0.10.0+gh-3) unstable; urgency=medium
+ 
+   * Use mysqld --initialize instead of mysql_install_db (Closes: #841543)
+     (Thanks to Scott Leggett for figuring out the correct option sequence)
+ 
+  -- Pirate Praveen <praveen at debian.org>  Sun, 06 Nov 2016 18:21:40 +0530
+ 
  ruby-carrierwave (0.10.0+gh-2) unstable; urgency=medium
  
    * Team upload.
diff --cc debian/control
index f247d9c,9d1f98f..9a58307
--- a/debian/control
+++ b/debian/control
@@@ -3,31 -3,29 +3,29 @@@ Maintainer: Debian Ruby Extras Maintain
  Uploaders: Pirate Praveen <praveen at debian.org>
  Section: ruby
  Priority: optional
 -Build-Depends: debhelper (>= 9.0),
 -               gem2deb (>= 0.7.5~),
 +Build-Depends: cucumber,
 +               debhelper (>= 9),
 +               gem2deb,
 +               ghostscript,
-                mysql-server,
 +               rake,
                 ruby-activemodel,
 -               ruby-activesupport (>= 2:3.2~),
                 ruby-activerecord (>=2:3.2~),
 -               rake,
 -               ruby-rspec (>= 2.12~),
 -               ruby-rmagick,
 -               ruby-timecop,
 -               ruby-mini-magick (>= 3.6.0),
 -               cucumber,
 +               ruby-activesupport (>= 2:3.2~),
                 ruby-fog,
 +               ruby-generator-spec,
 +               ruby-json,
 +               ruby-mimemagic (>= 0.3.0), 
 +               ruby-mini-magick (>= 3.6.0),
 +               ruby-mysql2,
 +               ruby-rmagick,
 +               ruby-rspec (>= 2.12~),
                 ruby-sham-rack,
+                default-mysql-server,
 -               ruby-mysql2,
 -               ruby-json,
 -               ghostscript,
 -               ruby-generator-spec
 +               ruby-timecop
  Standards-Version: 3.9.8
- Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-carrierwave.git
- Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-carrierwave.git
 -Vcs-Browser: https://anonscm.debian.org/?p=pkg-ruby-extras/ruby-carrierwave.git;a=summary
 -Vcs-Git: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-carrierwave.git
  Homepage: https://github.com/jnicklas/carrierwave
  XS-Ruby-Versions: all
 +Testsuite: autopkgtest-pkg-ruby
  
  Package: ruby-carrierwave
  Architecture: all
diff --cc debian/rules
index 57e8a65,16760e8..c8b07ba
--- a/debian/rules
+++ b/debian/rules
@@@ -6,9 -15,9 +6,9 @@@ export GEM2DEB_TEST_RUNNER = --check-de
  	dh $@ --buildsystem=ruby --with ruby
  
  # need to start an mysqld instance to run the tests
- override_dh_auto_install:
- 	chmod +x debian/start_mysqld_and_auto_install.sh
- 	debian/start_mysqld_and_auto_install.sh
+ #override_dh_auto_install:
+ #	chmod +x debian/start_mysqld_and_auto_install.sh
+ #	debian/start_mysqld_and_auto_install.sh
  
  override_dh_installchangelogs:
 -	dh_installchangelogs History.txt
 +	dh_installchangelogs CHANGELOG.md

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