~ubuntu-branches/ubuntu/natty/dbus/natty-201012211412

« back to all changes in this revision

Viewing changes to doc/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-08-09 16:09:57 UTC
  • mfrom: (1.3.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100809160957-3xh1a1tnhxebs159
Tags: 1.2.24-3ubuntu1
* Resync on Debian
* Remaining Ubuntu Changes:
  - Install into / rather than /usr.
  - debian/control: Depend on ConsoleKit for "at_console" policy stanza.
  - debian/dbus.postinst: Do not restart dbus on upgrades, since it breaks
    too many applications. Instead, trigger a "reboot required" notification.
  - debian/dbus.postinst: Create /var/run/dbus in postinst to handle system
    being rebooted before package is configured.  LP: #275229.
  - Add debian/dbus.upstart and bump debhelper b-dep to ensure that it is
    properly installed.
  - 20_system_conf_limit.patch: Increase max_match_rules_per_connection for
    the system bus to 5000 (LP #454093)
  - 81-session.conf-timeout.patch: Raise the service startup timeout from 25
    to 60 seconds. It may be too short on the live CD with slow machines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
EXTRA_DIST=                                     \
2
2
        busconfig.dtd                           \
 
3
        diagram.png                             \
 
4
        diagram.svg                             \
3
5
        introspect.dtd                          \
4
6
        dbus-faq.xml                            \
5
7
        dbus-specification.xml                  \
7
9
        dbus-tutorial.xml                       \
8
10
        dcop-howto.txt                          \
9
11
        file-boilerplate.c                      \
10
 
        introspect.xsl
 
12
        introspect.xsl                          \
 
13
        system-activation.txt
11
14
 
12
15
HTML_FILES=                                     \
13
16
        dbus-faq.html                           \
18
21
if DBUS_XML_DOCS_ENABLED
19
22
all-local: $(HTML_FILES)
20
23
 
21
 
EXTRA_DIST += $(HTML_FILES) system-activation.txt
 
24
EXTRA_DIST += $(HTML_FILES)
22
25
 
23
26
dbus-specification.html: dbus-specification.xml
24
27
        $(XMLTO) html-nochunks $<