[DRE-commits] [SCM] webgen0.5.git branch, master, updated. debian/0.5.14+dfsg1-3

[=?UTF-8?Q?Marc=20Dequ=C3=A8nes=20?=(Duck)]

The following commit has been merged in the master branch:
commit 85e10790d11be8992ba98ff27839cff413bd61d2
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Wed Jul 4 22:55:49 2012 +0200

    fixed embedded-javascript-library (jquery)

diff --git a/debian/changelog b/debian/changelog
index 8be31ac..1c34754 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ webgen0.5 (0.5.14+dfsg1-3) unstable; urgency=low
   * Use new policy packages for exif, haml, and erubis.
   * Fixed breakage with the new YAML parser in Ruby 1.9, which is now
     the default version, thanks to Sebastian Reichel (Closes: #680227).
+  * Removed embedded copy of JQuery and depends on libjs-jquery instead.
 
- -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Tue, 26 Jun 2012 00:38:52 +0200
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Wed, 04 Jul 2012 22:54:50 +0200
 
 webgen0.5 (0.5.14+dfsg1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 2ba4c8e..8471d35 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Description: fast, powerful, and extensible static website generator
 Package: webgen0.5-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
 Suggests: doc-base
 Description: fast, powerful, and extensible static website generator -- API documentation
  webgen is used to generate static websites from templates and content
diff --git a/debian/rules b/debian/rules
index bcb8d97..7a1bf08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,12 @@ override_dh_install:
 	# webgui is not usuable
 	rm -rf debian/webgen0.5/usr/share/webgen/webgui
 
+override_dh_installdocs:
+	dh_installdocs --remaining-packages
+	# avoid software duplication
+	rm debian/webgen0.5-doc/usr/share/doc/webgen0.5-doc/rdoc/js/jquery.js
+	dh_link -p webgen0.5-doc usr/share/javascript/jquery/jquery.js usr/share/doc/webgen0.5-doc/rdoc/js/jquery.js
+
 override_dh_installman:
 	dh_installman --remaining-packages
 	# rename the webgen manpage as webgen0.5, to allow alternative

-- 
webgen0.5.git