aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2009-12-11 16:46:23 -0500
committerKen VanDine <ken.vandine@canonical.com>2009-12-11 16:46:23 -0500
commit7158acfb2b6d2fcb7f9036d2ac9cea0abfd3533a (patch)
treee560c000cec74b7ad643d2889fbb93ebfc61859d
parente75075f8a6212e58c4d9fff3d47d0800eb9380ac (diff)
parentd3038937c5f5621da42952a026c61e1f5f74e83a (diff)
downloadayatana-indicator-application-7158acfb2b6d2fcb7f9036d2ac9cea0abfd3533a.tar.gz
ayatana-indicator-application-7158acfb2b6d2fcb7f9036d2ac9cea0abfd3533a.tar.bz2
ayatana-indicator-application-7158acfb2b6d2fcb7f9036d2ac9cea0abfd3533a.zip
merged from trunk
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac5
-rw-r--r--docs/reference/Makefile.am2
-rw-r--r--docs/reference/libappindicator-docs.sgml.in (renamed from docs/reference/libappindicator-docs.sgml)6
4 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index d63fda6..d05078e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,10 @@ SUBDIRS = data \
EXTRA_DIST = \
gtk-doc.make \
omf.make \
- xmldocs.make
+ xmldocs.make \
+ autogen.sh \
+ COPYING.LGPL.2.1 \
+ COPYING.LGPL.3
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-localinstall
diff --git a/configure.ac b/configure.ac
index d88fdc8..33d296c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(indicator-application, 0.0.3, ted@canonical.com)
+AC_INIT(indicator-application, 0.0.4, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009 Canonical])
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.0.3)
+AM_INIT_AUTOMAKE(indicator-application, 0.0.4)
AM_MAINTAINER_MODE
@@ -93,6 +93,7 @@ example/Makefile
docs/Makefile
docs/reference/Makefile
docs/reference/version.xml
+docs/reference/libappindicator-docs.sgml
])
###########################
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 67582f2..1292f4d 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -83,7 +83,7 @@ include $(top_srcdir)/gtk-doc.local.make
# Other files to distribute
# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += version.xml.in libappindicator-docs.sgml.in
# Files not to distribute
# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
diff --git a/docs/reference/libappindicator-docs.sgml b/docs/reference/libappindicator-docs.sgml.in
index a8eb058..3a8e5de 100644
--- a/docs/reference/libappindicator-docs.sgml
+++ b/docs/reference/libappindicator-docs.sgml.in
@@ -8,14 +8,12 @@
<bookinfo>
<title>libappindicator Reference Manual</title>
<releaseinfo>
- for libappindicator [VERSION]
- The latest version of this documentation can be found on-line at
- <ulink role="online-location" url="http://[SERVER]/libappindicator/index.html">http://[SERVER]/libappindicator/</ulink>.
+ for libappindicator @VERSION@
</releaseinfo>
</bookinfo>
<chapter>
- <title>[Insert title here]</title>
+ <title>Base Classes for Applications</title>
<xi:include href="xml/app-indicator.xml"/>
</chapter>