ubuntu-packaging-guide-team team mailing list archive
-
ubuntu-packaging-guide-team team
-
Mailing list archive
-
Message #01146
[Merge] lp:~mitya57/ubuntu-packaging-guide/use-libjs-sphinxdoc into lp:ubuntu-packaging-guide
Dmitry Shachnev has proposed merging lp:~mitya57/ubuntu-packaging-guide/use-libjs-sphinxdoc into lp:ubuntu-packaging-guide.
Requested reviews:
Ubuntu Packaging Guide Team (ubuntu-packaging-guide-team)
For more details, see:
https://code.launchpad.net/~mitya57/ubuntu-packaging-guide/use-libjs-sphinxdoc/+merge/129952
Finally got some time to test this change — it started working when I removed quotes in find call.
--
https://code.launchpad.net/~mitya57/ubuntu-packaging-guide/use-libjs-sphinxdoc/+merge/129952
Your team Ubuntu Packaging Guide Team is requested to review the proposed merge of lp:~mitya57/ubuntu-packaging-guide/use-libjs-sphinxdoc into lp:ubuntu-packaging-guide.
=== modified file 'debian/changelog'
--- debian/changelog 2012-10-12 14:53:27 +0000
+++ debian/changelog 2012-10-16 18:07:23 +0000
@@ -3,6 +3,14 @@
[ Daniel Holbach ]
* Added some additional information to the autopkgtest article.
+ [ Dmitry Shachnev ]
+ * Fix search not working (LP: #814679).
+ * Add CSS styling for code blocks and search results page.
+ * Link JS files with the libjs-sphinxdoc package.
+ * Do not install websupport.js
+ * Fixed a typo in fixing-a-bug-example.rst.
+ * Simplified the syntax in python-packaging.rst.
+
-- Daniel Holbach <daniel.holbach@xxxxxxxxxx> Fri, 12 Oct 2012 16:52:11 +0200
ubuntu-packaging-guide (0.2.4) unstable; urgency=low
=== modified file 'debian/control'
--- debian/control 2012-09-05 14:13:32 +0000
+++ debian/control 2012-10-16 18:07:23 +0000
@@ -31,7 +31,7 @@
ubuntu-packaging-guide-html.
Package: ubuntu-packaging-guide-html
-Depends: libjs-jquery (>= 1.6.1), libjs-underscore, ${misc:Depends}
+Depends: libjs-sphinxdoc, ${misc:Depends}
Architecture: all
Description: Ubuntu Packaging Guide - HTML guide
The Ubuntu Packaging Guide is a set of articles that should help you to get
@@ -55,7 +55,7 @@
This package contains the PDF version of the guide.
Package: ubuntu-packaging-guide-epub
-Depends: libjs-jquery (>= 1.6.1), libjs-underscore, ${misc:Depends}
+Depends: libjs-sphinxdoc, ${misc:Depends}
Architecture: all
Description: Ubuntu Packaging Guide - EPUB guide
The Ubuntu Packaging Guide is a set of articles that should help you to get
=== modified file 'debian/rules'
--- debian/rules 2012-08-21 21:22:08 +0000
+++ debian/rules 2012-10-16 18:07:23 +0000
@@ -28,19 +28,20 @@
done; \
cd -; \
done
- # use system copies of jquery and underscore instead.
- for filename in `find $$DEBIANDIR -wholename '*/_static/jquery.js'`; do \
- rm $$filename; \
- ln -s /usr/share/javascript/jquery/jquery.js $$filename; \
- done
- for filename in `find $$DEBIANDIR -wholename '*/_static/underscore.js'`; do \
- rm $$filename; \
- ln -s /usr/share/javascript/underscore/underscore.js $$filename; \
+ # use system copies of javascript libraries instead
+ for jsname in jquery underscore doctools searchtools; do \
+ for filename in `find debian/ -wholename */_static/$$jsname.js`; do \
+ rm $$filename; \
+ ln -s /usr/share/javascript/sphinxdoc/1.0/$$jsname.js $$filename; \
+ done; \
done
dh_link
override_dh_install:
- dh_install --list-missing
+ dh_install --list-missing -Xwebsupport.js
+
+override_dh_installdocs:
+ dh_installdocs -Xwebsupport.js
get-orig-source:
bzr export -r tag:$(VERSION) --root=ubuntu-packaging-guide-$(VERSION).orig \
Follow ups