[DRE-commits] [ruby-dep-selector] 01/02: Merge remote-tracking branch 'origin/master'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-dep-selector.

commit b0f77b0058070e7b09293d221b8b591825289448
Merge: da0bfe9 7d8cfa0
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Jul 7 18:14:08 2015 +0200

    Merge remote-tracking branch 'origin/master'

 .gitignore                                         |   19 +
 .rspec                                             |    2 +
 .travis.yml                                        |   13 +
 Gemfile                                            |    2 +
 LICENSE                                            |  201 ++
 README.md                                          |  380 +++
 Rakefile                                           |   64 +
 bin/problem_reader.rb                              |   58 +
 debian/changelog                                   |   25 +-
 debian/control                                     |   15 +-
 debian/copyright                                   |   16 +-
 ...001-Do-not-require-dep-selector-libgecode.patch |   37 +
 .../0002-Port-to-libgecode-4.0-Closes-710104.patch |  108 +
 debian/patches/0003-Do-not-set-rpath.patch         |   47 +
 .../0004-Make-it-solve-2.0-compatible.patch        |   70 +
 .../0005-Make-tests-rspec3-compatible.patch        |   60 +
 debian/patches/series                              |    5 +
 debian/ruby-tests.rake                             |    7 +
 debian/rules                                       |    4 +
 debian/source/options                              |    1 -
 dep_selector.gemspec                               |   29 +
 example/07be9e47-6f42-4a5d-b8b5-1d2eae1ad83b       |  123 +
 example/183998c1-2ada-4214-b308-e480345c42f2       |  946 ++++++++
 example/311a15e7-3378-4c5b-beb7-86a1b9cf0ea9       |  621 +++++
 example/382cfe5b-0ac2-48b8-83d1-717cb4620990       |   79 +
 example/README                                     |   60 +
 example/d3564ef6-6437-41e7-90b6-dbdb849551a6_mod   |  939 ++++++++
 example/ea2d264b-003e-4611-94ed-14efc7732083       |   74 +
 example/example_1.txt                              |  102 +
 example/example_2.txt                              |  101 +
 example/example_3.txt                              |  102 +
 example/example_usage.rb                           |  135 ++
 ext/dep_gecode/define_dummy_init.cxx               |    7 +
 ext/dep_gecode/dep_gecode-all.def                  |   16 +
 ext/dep_gecode/dep_selector_swig.i                 |   12 +-
 ext/dep_gecode/dep_selector_swig_wrap.cxx          | 2498 --------------------
 ext/dep_gecode/dep_selector_to_gecode.cpp          |  775 +++---
 ext/dep_gecode/dep_selector_to_gecode.h            |   24 +-
 .../dep_selector_to_gecode_interface.cpp           |   27 +-
 ext/dep_gecode/dep_selector_to_gecode_interface.h  |    5 +-
 ext/dep_gecode/extconf.rb                          |  261 +-
 ext/dep_gecode/lib/dep_selector_to_gecode.rb       |   11 -
 lib/dep_selector/dep_gecode.rb                     |   89 +
 lib/dep_selector/dep_selector_version.rb           |    2 +-
 lib/dep_selector/dependency.rb                     |    4 +
 lib/dep_selector/dependency_graph.rb               |   27 +-
 .../error_reporter/simple_tree_traverser.rb        |    5 +
 lib/dep_selector/exceptions.rb                     |    5 +
 lib/dep_selector/gecode_wrapper.rb                 |   41 +-
 lib/dep_selector/package.rb                        |    2 +-
 lib/dep_selector/selector.rb                       |   97 +-
 lib/dep_selector/version_constraint.rb             |    5 +-
 metadata.yml                                       |   88 -
 nativecode/simple_dependency.cpp                   |  163 ++
 nativecode/simple_dependency_opt.cpp               |  167 ++
 nativecode/test.cpp                                |  144 ++
 scripts/dep_selector_perf.rb                       |  115 +
 scripts/speed_test.rb                              |   60 +
 scripts/tree_traverser_benchmark.rb                |   96 +
 spec/dep_gecode_spec.rb                            |  348 +++
 spec/dep_selector/densely_packed_set_spec.rb       |  113 +
 spec/dep_selector/dependency_graph_spec.rb         |   79 +
 .../error_reporter/simple_tree_traverser_spec.rb   |  185 ++
 spec/dep_selector/package_spec.rb                  |   88 +
 spec/dep_selector/package_version_spec.rb          |   53 +
 spec/dep_selector/selector_spec.rb                 |  902 +++++++
 spec/dep_selector/solution_constraint_spec.rb      |   57 +
 spec/dep_selector/version_constraint_spec.rb       |  136 ++
 spec/dep_selector/version_spec.rb                  |  194 ++
 spec/solve_integration_spec.rb                     |   69 +
 spec/spec_helper.rb                                |   61 +
 spec/version_constraints.rb                        |  103 +
 72 files changed, 8486 insertions(+), 3093 deletions(-)

diff --cc debian/changelog
index fc7e679,b6fc0dd..e47bbc5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -8,13 -28,7 +28,8 @@@ ruby-dep-selector (0.0.8-2) unstable; u
      + add minimal version 4.0 for libgecode-dev
      + build for all versions supported by gem2deb (currently 1.9.1 and 2.0)
      + improve a little bit the description
 +    + add a debian/source/patch-header file
    * debian/copyright: use DEP5 copyright-format/1.0 official URL
-   * Port to libgecode >= 4.0 (Closes: #710104)
-     - Restart class has been renamed to RBS which needs an Engine (chose DFS)
-     - instances of RBS need a Search::Cutoff (arbitraly chose Geometric)
-     - variable selection are now functions and need brackets
-     - statistics about memory are not available in gecode (by default)
  
   -- Cédric Boutillier <boutil at debian.org>  Tue, 26 Nov 2013 15:26:33 +0100
  

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