From 7263623ea488e23ec6316a82bd966158e0e39fcd Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Fri, 11 Dec 2009 09:21:42 -0500
Subject: * Upstream release 0.0.4 * debian/rules:   - removed
 disable-scrollkeeper   - set DOC_SERVER used for docs *
 debian/patches/clean_up_docs.patch   - removed, merged upstream

---
 debian/changelog                   | 11 ++++++++-
 debian/patches/clean_up_docs.patch | 48 ++++++++++++++++++++++++++++++++------
 debian/rules                       |  3 ++-
 3 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3f118e..8114617 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,13 @@
-indicator-application (0.0.3-0ubuntu1) lucid; urgency=low
+indicator-application (0.0.4-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.0.4
+  * debian/rules:
+    - removed disable-scrollkeeper
+    - set DOC_SERVER used for docs
+  * debian/patches/clean_up_docs.patch
+    - removed, merged upstream
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 11 Dec 2009 09:18:58 -0500
 
   * Upstream release 0.0.3
     * Adding in documentation
diff --git a/debian/patches/clean_up_docs.patch b/debian/patches/clean_up_docs.patch
index 0b054fe..39ff62c 100644
--- a/debian/patches/clean_up_docs.patch
+++ b/debian/patches/clean_up_docs.patch
@@ -1,15 +1,49 @@
-=== modified file 'docs/reference/libappindicator-docs.sgml'
+=== modified file 'configure.ac'
+--- configure.ac	2009-12-10 19:18:44 +0000
++++ configure.ac	2009-12-11 14:17:10 +0000
+@@ -16,6 +16,7 @@
+ AC_PROG_LIBTOOL
+ 
+ AC_SUBST(VERSION)
++AC_SUBST(DOC_SERVER)
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+@@ -93,6 +94,7 @@
+ docs/Makefile
+ docs/reference/Makefile
+ docs/reference/version.xml
++docs/reference/libappindicator-docs.sgml
+ ])
+ 
+ ###########################
+
+=== modified file 'docs/reference/Makefile.am'
+--- docs/reference/Makefile.am	2009-12-08 22:02:28 +0000
++++ docs/reference/Makefile.am	2009-12-11 14:09:14 +0000
+@@ -83,7 +83,7 @@
+ 
+ # 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
+
+=== renamed file 'docs/reference/libappindicator-docs.sgml' => 'docs/reference/libappindicator-docs.sgml.in'
 --- docs/reference/libappindicator-docs.sgml	2009-12-08 19:22:45 +0000
-+++ docs/reference/libappindicator-docs.sgml	2009-12-10 20:40:50 +0000
-@@ -7,15 +7,10 @@
- <book id="index">
++++ docs/reference/libappindicator-docs.sgml.in	2009-12-11 14:16:59 +0000
+@@ -8,14 +8,14 @@
    <bookinfo>
      <title>libappindicator Reference Manual</title>
--    <releaseinfo>
+     <releaseinfo>
 -      for libappindicator [VERSION]
--      The latest version of this documentation can be found on-line at
++      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>.
--    </releaseinfo>
++      <ulink role="online-location" url="http://@DOC_SERVER@/libappindicator/current/index.html">http://@DOC_SERVER@/libappindicator/current/</ulink>.
+     </releaseinfo>
    </bookinfo>
  
    <chapter>
diff --git a/debian/rules b/debian/rules
index c42359e..3a44cbe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
+DOC_SERVER = people.canonical.com/~ted
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-- 
cgit v1.2.3