[DRE-commits] [SCM] cucumber.git branch, master, updated. debian/1.0.2-2-15-gac5c0c2

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 68486c6cfc385285b91d63bc27fb39e4573b5447
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon Jun 25 10:25:51 2012 +0200

    make more explicit that debian/jquery-1.4.2-js act as source of bundled minified version

diff --git a/debian/changelog b/debian/changelog
index 748fd61..130c489 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ cucumber (1.2.1-1) unstable; urgency=low
     + disable tests relying on ordered hashes
   * Add myself to Uploaders:
   * Depend on libjs-jquery instead of using the embedded copy.
-    + include non-minified copy of jquery
+    + include non-minified copy of jquery as source of the embedded version
     + update copyright file to take into account jsquery
   * Do no suggest anymore ruby-prawn and ruby-nokogiri explicitly
 
diff --git a/debian/copyright b/debian/copyright
index 2442c09..d85b67a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,8 +15,8 @@ Copyright:
  Copyright 2010, John Resig
  Copyright 2010, The Dojo Foundation
 License: Expat or GPL-2
-Comment: the two first files contain a minified version of the javascript library jquery,
- which is shipped in debian/jquery-1.4.2.js
+Comment: the two first files contain a minified version of the javascript library jquery.
+ The source (a non-minified version of it) is shipped in debian/jquery-1.4.2.js.
 
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining

-- 
cucumber.git