~xnox/ubuntu/saucy/drizzle/merge

« back to all changes in this revision

Viewing changes to debian/drizzle-doc.links

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-06-19 10:46:49 UTC
  • mfrom: (1.2.11) (2.1.16 sid)
  • Revision ID: package-import@ubuntu.com-20120619104649-9ij634mxm4x8pp4l
Tags: 1:7.1.36-stable-1ubuntu1
* Merge from Debian unstable. (LP: #987575)
  Remaining changes:
  - Added upstart script.
* debian/drizzle.upstart: dropped logger since upstart logs job
  output now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
# Overwrite jquery.js  from upstream tarball with a  link to jquery.js
2
2
# provided by jQuery Debian package
3
3
/usr/share/javascript/jquery/jquery.js usr/share/doc/drizzle-doc/html/_static/jquery.js
 
4
/usr/share/javascript/underscore/underscore.js usr/share/doc/drizzle-doc/html/_static/underscore.js