~jfi/ubuntu/quantal/psensor/new-upstream

« back to all changes in this revision

Viewing changes to www/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2012-01-21 22:41:34 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20120121224134-mty23d3917ng5ujd
Tags: 0.6.2.16-1ubuntu1
* Merge from Debian testing.  Remaining changes:
  + Modifed build-dep to add NVidia and Application Indicator support
  + Only add an nvidia-settings build-dep on i386 and amd64

* Add a patch to drop the deprecated g_thread_init() call
  - add debian/patches/drop_g_thread_init.patch
  - add debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
defaultwwwdir = $(pkgdatadir)/www
2
 
defaultwww_DATA = index.lua style.css
 
2
defaultwww_DATA = \
 
3
        details.html \
 
4
        index.html \
 
5
        excanvas.js \
 
6
        favicon.ico \
 
7
        monitor.html \
 
8
        psensor.js \
 
9
        jqplot.dateAxisRenderer.js \
 
10
        jqplot.css \
 
11
        jqplot.js \
 
12
        jquery.js \
 
13
        style.css 
3
14
 
4
15
EXTRA_DIST=$(defaultwww_DATA)