[DRE-commits] [SCM] ruby-facets.git branch, master, updated. debian/2.9.2-1-12-g52c99b2

=?UTF-8?Q?Marc=20Dequ=C3=A8nes=20?=(Duck) Duck at DuckCorp.org
Fri Jun 21 10:10:37 UTC 2013


The following commit has been merged in the master branch:
commit 0e7d29b5f164621167645dbe921b75e6cc2c75a9
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Fri Jun 21 11:32:43 2013 +0200

    [fix] use libjs-jquery instead of embedded library for doc

diff --git a/debian/changelog b/debian/changelog
index 800fe1d..5bd1657 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ruby-facets (2.9.3-1) UNRELEASED; urgency=low
   * Updated copyright file.
   * Increased Standards-Version to 3.9.4 (no changes).
   * Removed transitional libfacets-* package and obsolete relations.
+  * Use system JQuery library instead of embedded one for documentation.
 
  -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Fri, 21 Jun 2013 03:19:07 +0200
 
diff --git a/debian/control b/debian/control
index 6d37eba..41e6612 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Description: extensive additions and extensions library for Ruby
 Package: ruby-facets-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
 Replaces: libfacets-ruby-doc (<< 2.9.2-1~)
 Breaks: libfacets-ruby-doc (<< 2.9.2-1~)
 Provides: libfacets-ruby-doc
diff --git a/debian/rules b/debian/rules
index aba4452..00f07f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,14 @@ LIB_INSTALL_PATH=debian/ruby-facets/usr/lib/ruby/vendor_ruby
 override_dh_auto_install:
 	dh_auto_install
 
+override_dh_installdocs:
+	dh_installdocs
+	# use the system library
+	rm debian/ruby-facets-doc/usr/share/doc/ruby-facets-doc/api/core/js/jquery.js
+	dh_link -p ruby-facets-doc usr/share/javascript/jquery/jquery.js usr/share/doc/ruby-facets-doc/api/core/js/jquery.js
+	rm debian/ruby-facets-doc/usr/share/doc/ruby-facets-doc/api/standard/js/jquery.js
+	dh_link -p ruby-facets-doc usr/share/javascript/jquery/jquery.js usr/share/doc/ruby-facets-doc/api/standard/js/jquery.js
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf setup.rb build-doc

-- 
ruby-facets.git



More information about the Pkg-ruby-extras-commits mailing list