[DRE-commits] [ruby-uglifier] 07/11: refresh patches

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-uglifier.

commit 77e7a8ee18b4c5b23b934cb617a0a7af658d2f50
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Aug 7 20:30:19 2016 -0300

    refresh patches
---
 debian/changelog                                   |  1 +
 ...just-tests-to-lib-uglify.js-being-dropped.patch | 36 ++++++++++++++++++++++
 debian/patches/0003-Mark-test-as-pending.patch     | 21 +++++++++++++
 debian/patches/series                              |  2 ++
 4 files changed, 60 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ebd82a4..1844f28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ruby-uglifier (2.7.2+dfsg-1) UNRELEASED; urgency=medium
   [ Antonio Terceiro ]
   * Use UglifyJS source from libjs-uglify
     - drop lib/uglify.js from upstream tarball
+    - Use libjs-uglify
   * Refresh pacakging with a new `dh-make-ruby -w` run
 
  -- Cédric Boutillier <boutil at moszumanska.debian.org>  Sun, 07 Aug 2016 10:37:33 -0300
diff --git a/debian/patches/0002-Adjust-tests-to-lib-uglify.js-being-dropped.patch b/debian/patches/0002-Adjust-tests-to-lib-uglify.js-being-dropped.patch
new file mode 100644
index 0000000..cf951ce
--- /dev/null
+++ b/debian/patches/0002-Adjust-tests-to-lib-uglify.js-being-dropped.patch
@@ -0,0 +1,36 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Sun, 7 Aug 2016 18:08:12 -0300
+Subject: Adjust tests to lib/uglify.js being dropped
+
+This patch is Debian-specific
+---
+ spec/source_map_spec.rb | 2 +-
+ spec/uglifier_spec.rb   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/spec/source_map_spec.rb b/spec/source_map_spec.rb
+index bf2aebf..e1d3ec0 100644
+--- a/spec/source_map_spec.rb
++++ b/spec/source_map_spec.rb
+@@ -16,7 +16,7 @@ describe "Uglifier" do
+   end
+ 
+   it "generates source maps" do
+-    source = File.open("lib/uglify.js", "r:UTF-8").read
++    source = File.open("lib/split.js", "r:UTF-8").read
+     minified, map = Uglifier.new.compile_with_map(source)
+     expect(minified.length).to be < source.length
+     expect(map.length).to be > 0
+diff --git a/spec/uglifier_spec.rb b/spec/uglifier_spec.rb
+index 9304d35..55f23bc 100644
+--- a/spec/uglifier_spec.rb
++++ b/spec/uglifier_spec.rb
+@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+ 
+ describe "Uglifier" do
+   it "minifies JS" do
+-    source = File.open("lib/uglify.js", "r:UTF-8").read
++    source = File.open("lib/split.js", "r:UTF-8").read
+     minified = Uglifier.new.compile(source)
+     expect(minified.length).to be < source.length
+     expect { Uglifier.new.compile(minified) }.not_to raise_error
diff --git a/debian/patches/0003-Mark-test-as-pending.patch b/debian/patches/0003-Mark-test-as-pending.patch
new file mode 100644
index 0000000..4c33c68
--- /dev/null
+++ b/debian/patches/0003-Mark-test-as-pending.patch
@@ -0,0 +1,21 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Sun, 7 Aug 2016 20:28:59 -0300
+Subject: Mark test as pending
+
+This patch is Debian-specific
+---
+ spec/source_map_spec.rb | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/spec/source_map_spec.rb b/spec/source_map_spec.rb
+index e1d3ec0..6938d17 100644
+--- a/spec/source_map_spec.rb
++++ b/spec/source_map_spec.rb
+@@ -57,6 +57,7 @@ describe "Uglifier" do
+   end
+ 
+   it "should be able to handle an input source map" do
++    pending "Needs UglifyJS >= 2.5 to work"
+     source = <<-JS
+       function hello () {
+         function world () {
diff --git a/debian/patches/series b/debian/patches/series
index ec5598d..2443a0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 0001-Use-packaged-UglifyJS-and-Source-Map.patch
+0002-Adjust-tests-to-lib-uglify.js-being-dropped.patch
+0003-Mark-test-as-pending.patch

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