[DRE-commits] [ruby-toml] 04/05: Prepare changelog

Cédric Boutillier boutil at moszumanska.debian.org
Mon Dec 4 17:42:35 UTC 2017


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

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

commit 9697668f533ee89c69b7735b6d7cd2d03273dd67
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Dec 4 11:43:47 2017 +0100

    Prepare changelog
---
 debian/changelog                                   | 12 +++++
 ...01-Drop-RubyGems-And-Bundler-Dependencies.patch |  4 +-
 .../0002-Replace-gemspec-git-execution.patch       |  2 +-
 debian/patches/0003_parslet17.patch                | 54 ----------------------
 debian/patches/series                              |  2 -
 5 files changed, 15 insertions(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ebaa69..5fbdbe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ruby-toml (0.2.0-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream version 0.2.0
+    + support for parslet >= 1.7
+  * https for Homepage
+  * Bump Standards-Version to 4.1.2 (no changes needed)
+  * Bump debhelper compatibility level to 10
+  * Drop 0003_parslet17.patch, fixed upstream
+
+ -- Cédric Boutillier <boutil at debian.org>  Mon, 04 Dec 2017 11:43:05 +0100
+
 ruby-toml (0.1.2-4) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/0001-Drop-RubyGems-And-Bundler-Dependencies.patch b/debian/patches/0001-Drop-RubyGems-And-Bundler-Dependencies.patch
index 72691f2..7302563 100644
--- a/debian/patches/0001-Drop-RubyGems-And-Bundler-Dependencies.patch
+++ b/debian/patches/0001-Drop-RubyGems-And-Bundler-Dependencies.patch
@@ -25,7 +25,7 @@ index 4a1ee37..dfcedfa 100644
  require 'minitest/autorun'
  
 diff --git a/test/test_generator.rb b/test/test_generator.rb
-index 4da5746..a2002f1 100644
+index 92646a0..3af3eec 100644
 --- a/test/test_generator.rb
 +++ b/test/test_generator.rb
 @@ -1,7 +1,4 @@
@@ -38,7 +38,7 @@ index 4da5746..a2002f1 100644
  require 'minitest/autorun'
  
 diff --git a/test/test_parser.rb b/test/test_parser.rb
-index 14137da..b8b0c58 100644
+index 6016070..d80f074 100644
 --- a/test/test_parser.rb
 +++ b/test/test_parser.rb
 @@ -1,7 +1,4 @@
diff --git a/debian/patches/0002-Replace-gemspec-git-execution.patch b/debian/patches/0002-Replace-gemspec-git-execution.patch
index 58da6d7..18e7f97 100644
--- a/debian/patches/0002-Replace-gemspec-git-execution.patch
+++ b/debian/patches/0002-Replace-gemspec-git-execution.patch
@@ -8,7 +8,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/toml.gemspec b/toml.gemspec
-index 420799f..f7b842f 100644
+index ffe2492..ff09594 100644
 --- a/toml.gemspec
 +++ b/toml.gemspec
 @@ -30,7 +30,7 @@ Gem::Specification.new do |s|
diff --git a/debian/patches/0003_parslet17.patch b/debian/patches/0003_parslet17.patch
deleted file mode 100644
index dc90c34..0000000
--- a/debian/patches/0003_parslet17.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: reorder rules in transformation
- Parslet 1.7.1 changed the order of insertion of new rules so that new rules
- have higher priority than older rules.
-Bug: https://github.com/jm/toml/issues/43
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818155
-Forwarded: https://github.com/jm/toml/pull/44
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2016-06-06
-
---- a/lib/toml/transformer.rb
-+++ b/lib/toml/transformer.rb
-@@ -92,23 +92,23 @@
-     # Make key hashes (inside key_groups) just be strings
-     rule(:key => simple(:k)) { k }
- 
--    # Then objectify the key_groups
--    rule(:table => simple(:kg)) {
--      Table.new([kg.to_s])
--    }
--
-     # Captures array-like key-groups
-     rule(:table => subtree(:kg)) {
-       Table.new(kg.map &:to_s)
-     }
-     
--    # Single name table-arrays
--    rule(:table_array => simple(:name)) {
--      TableArray.new([name.to_s])
-+    # Then objectify the key_groups
-+    rule(:table => simple(:kg)) {
-+      Table.new([kg.to_s])
-     }
-+
-     # Multi-part (a.b.c) table-arrays
-     rule(:table_array => subtree(:names)) {
-       TableArray.new(names.map &:to_s)
-     }
-+    # Single name table-arrays
-+    rule(:table_array => simple(:name)) {
-+      TableArray.new([name.to_s])
-+    }
-   end
- end
---- a/toml.gemspec
-+++ b/toml.gemspec
-@@ -26,7 +26,7 @@
-   s.rdoc_options = ["--charset=UTF-8"]
-   s.extra_rdoc_files = %w[README.md LICENSE CHANGELOG.md]
- 
--  s.add_dependency "parslet", "~> 1.5.0"
-+  s.add_dependency "parslet", "~> 1.7.0"
- 
-   s.add_development_dependency "rake"
- 
diff --git a/debian/patches/series b/debian/patches/series
index d16ddc2..dd7af58 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 0001-Drop-RubyGems-And-Bundler-Dependencies.patch
 0002-Replace-gemspec-git-execution.patch
-#parslet17.patch
-0003_parslet17.patch

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



More information about the Pkg-ruby-extras-commits mailing list