[libstxxl1] 01/01: * Relink against system jquery
D Haley
mycae-guest at moszumanska.debian.org
Sat Sep 20 21:18:14 UTC 2014
This is an automated email from the git hooks/post-receive script.
mycae-guest pushed a commit to branch master
in repository libstxxl1.
commit 44d06b0bc2af09133f44541f01e6ae683177516b
Author: D Haley <mycae at gmx.com>
Date: Fri Sep 19 16:55:47 2014 +0100
* Relink against system jquery
---
debian/control | 2 +-
debian/rules | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 3a95053..038a7db 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,7 @@ Package: libstxxl-doc
Section: doc
Priority: extra
Depends:
- ${misc:Depends}
+ ${misc:Depends}, libjs-jquery
Architecture: all
Description: Documentation for STXXL
STXXL provides an STL replacement using an abstraction layer to
diff --git a/debian/rules b/debian/rules
index 3bcbc3a..9489bcb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
#!/usr/bin/make -f
-
+#location of stxxl's built-in jquery
+JQUERY_STXXL_TARGET=/usr/share/doc/libstxxl-doc/html/html/jquery.js
+#Location of debian jquery
+JQUERY_SYS_TARGET=/usr/share/javascript/jquery/jquery.js
%:
CC=/usr/local/bin/gcc CXX=/usr/local/bin/g++ dh $@ --parallel
@@ -7,6 +10,14 @@ override_dh_auto_install:
dh_auto_install
#Don't want this, so delete it
rm -rf $$(pwd)/debian/tmp/usr/lib/cmake/
+
+override_dh_install:
+ dh_install
+ #Relink jquery to system provided copy.
+ rm -f $$(pwd)/debian/libstxxl-doc/$(JQUERY_STXXL_TARGET)
+ mkdir -p $$(pwd)/debian/libstxxl-doc/$$(dirname $(JQUERY_STXXL_TARGET) )
+ #Symlink to system value
+ ln -s $(JQUERY_SYS_TARGET) $$(pwd)/debian/libstxxl-doc/$(JQUERY_STXXL_TARGET)
override_dh_auto_build:
dh_auto_build
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libstxxl1.git
More information about the debian-science-commits
mailing list