[DRE-commits] [ruby-uglifier] 03/03: new upstream version; packaging updates

[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 c83a2c0c61356e642428df07943facdb69fd3b29
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Jan 3 00:44:09 2014 -0300

    new upstream version; packaging updates
---
 debian/changelog                                   |  8 ++++--
 debian/control                                     |  2 +-
 debian/copyright                                   |  2 +-
 .../run-tests-against-distributed-javascript.patch | 31 ----------------------
 debian/patches/series                              |  1 -
 lib/uglifier.rb                                    | 11 ++++++--
 6 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 337e1e5..4c1f3d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-ruby-uglifier (1.3.0-1) UNRELEASED; urgency=medium
+ruby-uglifier (1.3.0-1) unstable; urgency=medium
 
   * New upstream release
+  * debian/patches/run-tests-against-distributed-javascript.patch: dropped,
+    already applied upstream
+  * Bump Standards-Version to 3.9.5; no changes needed
+  * debian/copyright: fix typo
 
- -- Antonio Terceiro <terceiro at debian.org>  Fri, 03 Jan 2014 00:42:36 -0300
+ -- Antonio Terceiro <terceiro at debian.org>  Fri, 03 Jan 2014 00:51:23 -0300
 
 ruby-uglifier (1.2.5-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 65c435d..b3bc2cf 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Antonio Terceiro <terceiro at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-execjs, ruby-multi-json, ruby-rspec, rake, ruby-yajl
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-uglifier.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-uglifier.git;a=summary
 Homepage: http://github.com/lautis/uglifier
diff --git a/debian/copyright b/debian/copyright
index a686a48..7028eb1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,7 +25,7 @@ License: MIT
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-File: lib/uglify.js
+Files: lib/uglify.js
 Copyright: 2012 Robert Gust-Bardon <http://robert.gust-bardon.org/>.
 License:
  All rights reserved.
diff --git a/debian/patches/run-tests-against-distributed-javascript.patch b/debian/patches/run-tests-against-distributed-javascript.patch
deleted file mode 100644
index 9926177..0000000
--- a/debian/patches/run-tests-against-distributed-javascript.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: run tests against distributed JavaScript file
-Author: Antonio Terceiro <terceiro at debian.org>
-Bug: https://github.com/lautis/uglifier/pull/33
-
---- ruby-uglifier-1.2.5.orig/spec/uglifier_spec.rb
-+++ ruby-uglifier-1.2.5/spec/uglifier_spec.rb
-@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__
- 
- describe "Uglifier" do
-   it "minifies JS" do
--    source = File.open("vendor/uglifyjs/lib/process.js", "r:UTF-8").read
-+    source = File.open("lib/uglify.js", "r:UTF-8").read
-     minified = Uglifier.new.compile(source)
-     minified.length.should < source.length
-     lambda {
-@@ -122,13 +122,13 @@ describe "Uglifier" do
-   describe "Input Formats" do
-     it "handles strings" do
-       lambda {
--        Uglifier.new.compile(File.open("vendor/uglifyjs/lib/process.js", "r:UTF-8").read).should_not be_empty
-+        Uglifier.new.compile(File.open("lib/uglify.js", "r:UTF-8").read).should_not be_empty
-       }.should_not raise_error
-     end
- 
-     it "handles files" do
-       lambda {
--        Uglifier.new.compile(File.open("vendor/uglifyjs/lib/process.js", "r:UTF-8")).should_not be_empty
-+        Uglifier.new.compile(File.open("lib/uglify.js", "r:UTF-8")).should_not be_empty
-       }.should_not raise_error
-     end
-   end
diff --git a/debian/patches/series b/debian/patches/series
index 5b8cd8d..32c144f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 change-javascript-files-path.patch
-run-tests-against-distributed-javascript.patch
diff --git a/lib/uglifier.rb b/lib/uglifier.rb
index 4954bb5..4a5aa72 100644
--- a/lib/uglifier.rb
+++ b/lib/uglifier.rb
@@ -31,8 +31,15 @@ class Uglifier
     }
   }
 
-  SourcePath = File.expand_path("../uglify.js", __FILE__)
-  ES5FallbackPath = File.expand_path("../es5.js", __FILE__)
+  def self.find_asset(filename)
+    [
+      File.expand_path("../" + filename, __FILE__),
+      File.join("/usr/share/javascript/ruby-uglifier", filename)
+    ].find { |f| File.exists?(f) }
+  end
+
+  SourcePath = find_asset("uglify.js")
+  ES5FallbackPath = find_asset("es5.js")
 
   # Minifies JavaScript code using implicit context.
   #

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