[Pkg-javascript-commits] [backbone] 05/11: Rewrite the patch to use Debian-packaged libraries

Sat Aug 27 11:47:09 UTC 2016

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

jpuydt-guest pushed a commit to branch master
in repository backbone.

commit 60644a6416531cecc3b97dbb2cafde48ade1c1d5
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Sat Aug 27 11:18:23 2016 +0200

    Rewrite the patch to use Debian-packaged libraries
---
 debian/changelog                        |  1 +
 debian/patches/2001_use_system_js.patch | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a14b4c4..e345add 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ backbone (1.3.3-1) UNRELEASED; urgency=medium
   * Bump standards-version.
   * Use https in Vcs-* fields.
   * Drop obsolete patch to support newer underscore.
+  * Rewrote the patch to use Debian-packaged libraries.
 
  -- Julien Puydt <julien.puydt at laposte.net>  Sat, 27 Aug 2016 11:04:48 +0200
 
diff --git a/debian/patches/2001_use_system_js.patch b/debian/patches/2001_use_system_js.patch
index 2bde84b..8378d11 100644
--- a/debian/patches/2001_use_system_js.patch
+++ b/debian/patches/2001_use_system_js.patch
@@ -1,20 +1,21 @@
-Description: use separately packaged JavaScript libraries
-Author: Jonas Smedegaard <dr at jones.dk>
+Description: Use Debian-packaged libraries
+Author: Julien Puydt
 Forwarded: not-needed
 
+diff --git a/test/index.html b/test/index.html
+index 3dad8c6..19bf19f 100644
 --- a/test/index.html
 +++ b/test/index.html
-@@ -4,10 +4,10 @@
-   <meta charset='utf8'>
-   <title>Backbone Test Suite</title>
-   <link rel="stylesheet" href="vendor/qunit.css" type="text/css" media="screen">
--  <script src="vendor/json2.js"></script>
--  <script src="vendor/jquery.js"></script>
-+  <script src="/usr/share/javascript/json/json2.js"></script>
-+  <script src="/usr/share/javascript/jquery/jquery.js"></script>
+@@ -7,9 +7,9 @@
+ </head>
+ <body>
    <script src="vendor/qunit.js"></script>
+-  <script src="vendor/jquery.js"></script>
+-  <script src="vendor/json2.js"></script>
 -  <script src="vendor/underscore.js"></script>
++  <script src="/usr/share/javascript/jquery/jquery.js"></script>
++  <script src="/usr/share/javascript/json/json2.js"></script>
 +  <script src="/usr/share/javascript/underscore/underscore.js"></script>
    <script src="../backbone.js"></script>
-   <script src="environment.js"></script>
-   <script src="noconflict.js"></script>
+   <script src="setup/dom-setup.js"></script>
+   <script src="setup/environment.js"></script>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/backbone.git

