[SCM] ffmpeg/master: Use system bootstrap for ffmpeg-doc.

[aca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 43ec729793c6e2955bdd048338fb17725d2575ee
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Thu Nov 12 22:43:49 2015 +0100

    Use system bootstrap for ffmpeg-doc.

diff --git a/debian/control b/debian/control
index 2fbfe44..10118b0 100644
--- a/debian/control
+++ b/debian/control
@@ -207,6 +207,7 @@ Architecture: all
 Multi-Arch: foreign
 Depends:
  libjs-jquery,
+ libjs-bootstrap,
  ${misc:Depends}
 Description: Documentation of the FFmpeg multimedia framework
  FFmpeg is the leading multimedia framework, able to decode, encode, transcode,
diff --git a/debian/ffmpeg-doc.install b/debian/ffmpeg-doc.install
index 3c871af..44bf765 100644
--- a/debian/ffmpeg-doc.install
+++ b/debian/ffmpeg-doc.install
@@ -3,7 +3,7 @@ doc/examples/*.c					usr/share/doc/ffmpeg-doc/examples
 doc/examples/Makefile				usr/share/doc/ffmpeg-doc/examples
 doc/examples/README					usr/share/doc/ffmpeg-doc/examples
 doc/*.html							usr/share/doc/ffmpeg-doc/manual
-doc/*.css							usr/share/doc/ffmpeg-doc/manual
+doc/style.min.css					usr/share/doc/ffmpeg-doc/manual
 doc/APIchanges						usr/share/doc/ffmpeg-doc/developer-info
 doc/*.txt							usr/share/doc/ffmpeg-doc/developer-info
 usr/share/man/man3
diff --git a/debian/ffmpeg-doc.links b/debian/ffmpeg-doc.links
index 43af130..b46903f 100644
--- a/debian/ffmpeg-doc.links
+++ b/debian/ffmpeg-doc.links
@@ -1 +1,2 @@
 usr/share/javascript/jquery/jquery.min.js usr/share/doc/ffmpeg-doc/api/jquery.js
+usr/share/javascript/bootstrap/css/bootstrap.min.css usr/share/doc/ffmpeg-doc/manual/bootstrap.min.css
diff --git a/debian/rules b/debian/rules
index 8a2cb57..6c218b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -210,17 +210,14 @@ override_dh_auto_clean:
 	[ ! -d doc/examples/pc-uninstalled ] || rm -r doc/examples/pc-uninstalled
 	$(foreach flavor,$(FLAVORS),[ ! -d debian/$(flavor) ] || rm -r debian/$(flavor);)
 	# Restore backed up CSS files
-	[ ! -f debian/bootstrap.min.css.bak ] || mv debian/bootstrap.min.css.bak doc/bootstrap.min.css
 	[ ! -f debian/style.min.css.bak ] || mv debian/style.min.css.bak doc/style.min.css
 
 # Create doxygen documentation:
 override_dh_auto_build-indep:
 	dh_auto_build -i -- apidoc
 	# Backup the minified CSS files distributed by upstream.
-	mv doc/bootstrap.min.css debian/bootstrap.min.css.bak
 	mv doc/style.min.css debian/style.min.css.bak
 	# Create the minified CSS files.
-	lessc debian/missing-sources/bootstrap/less/bootstrap.less | cleancss | cat debian/missing-sources/bootstrap_copyright_notice.txt - > doc/bootstrap.min.css
 	lessc debian/missing-sources/ffmpeg-web/src/less/style.less | cleancss > doc/style.min.css
 
 override_dh_auto_build-arch:

-- 
ffmpeg packaging