[DRE-commits] [ruby-jquery-rails] 01/02: use embedded copies of jquery and jquery2

[Antonio Terceiro]

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

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

commit 0729d1e81dce8e87023b5c7ac25da364dc0f94f2
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Dec 1 09:32:05 2016 -0200

    use embedded copies of jquery and jquery2
---
 debian/changelog                 | 6 +++---
 debian/ruby-jquery-rails.install | 1 +
 debian/ruby-jquery-rails.links   | 3 ---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ba38bcd..cc62d92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 ruby-jquery-rails (4.2.1-2) UNRELEASED; urgency=medium
 
-  * Use embedded copy of jQuery 1.x to provide jquery.*, since libjs-jquery is
-    providing jQuery 3.x.. jquery2.* and jquery*.js are still provided by
-    libjs-jquery
+  * Use embedded copies of jQuery 1.x and jQuery 2.x to provide jquery.* and
+    jquery2.*, since libjs-jquery is providing jQuery 3.x.
+    - jquery3*.js is still provided by libjs-jquery
   * debian/copyright: update info about vendor/assets/javascripts/*
 
  -- Antonio Terceiro <terceiro at debian.org>  Wed, 30 Nov 2016 14:23:28 -0200
diff --git a/debian/ruby-jquery-rails.install b/debian/ruby-jquery-rails.install
index 52cf7ec..beebac8 100644
--- a/debian/ruby-jquery-rails.install
+++ b/debian/ruby-jquery-rails.install
@@ -1,2 +1,3 @@
 vendor/assets/javascripts/jquery_ujs.js usr/share/ruby-jquery-rails/vendor/assets/javascripts
+vendor/assets/javascripts/jquery.* usr/share/ruby-jquery-rails/vendor/assets/javascripts
 vendor/assets/javascripts/jquery2.* usr/share/ruby-jquery-rails/vendor/assets/javascripts
diff --git a/debian/ruby-jquery-rails.links b/debian/ruby-jquery-rails.links
index ddba6b3..3a7f732 100644
--- a/debian/ruby-jquery-rails.links
+++ b/debian/ruby-jquery-rails.links
@@ -1,6 +1,3 @@
-usr/share/javascript/jquery/jquery.js             usr/share/ruby-jquery-rails/vendor/assets/javascripts/jquery.js
-usr/share/javascript/jquery/jquery.min.js         usr/share/ruby-jquery-rails/vendor/assets/javascripts/jquery.min.js
-usr/share/javascript/jquery/jquery.min.map         usr/share/ruby-jquery-rails/vendor/assets/javascripts/jquery.min.map
 usr/share/javascript/jquery/jquery.js             usr/share/ruby-jquery-rails/vendor/assets/javascripts/jquery3.js
 usr/share/javascript/jquery/jquery.min.js         usr/share/ruby-jquery-rails/vendor/assets/javascripts/jquery3.min.js
 usr/share/javascript/jquery/jquery.min.map         usr/share/ruby-jquery-rails/vendor/assets/javascripts/jquery3.min.map

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