Merging in Ken's fixes.

6 files changed, 39 insertions, 7 deletions

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..3165e05
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True
diff --git a/debian/changelog b/debian/changelog
index 6573574..b924e8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-indicator-application (0.0.3-0ubuntu1~ppa1) karmic; urgency=low
+indicator-application (0.0.3-0ubuntu1) karmic; urgency=low
 
   * Upstream release 0.0.3
     * Adding in documentation
@@ -8,6 +8,17 @@ indicator-application (0.0.3-0ubuntu1~ppa1) karmic; urgency=low
   * debian/control: Adding a build dep on gtk-doc-tools 
   * debian/control: Increasing libdbusmenu requirements to 0.1.8
 
+  [Ken VanDine]
+  * debian/control
+    - set Vcs-Bzr to ~ubuntu-desktop
+  * debian/libappindicator-doc.install
+    - install the developer docs
+  * debian/rules
+    - enable-gtk-doc
+    - added simple-patchsys.mk
+  * debian/patches/clean_up_docs.patch
+    - Remove template values and set a proper title
+
  -- Ted Gould <ted@ubuntu.com>  Thu, 10 Dec 2009 13:34:40 -0600
 
 indicator-application (0.0.2-0~ppa3) karmic; urgency=low
diff --git a/debian/control b/debian/control
index bd84152..039c721 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 5.0),
                libdbusmenu-glib-dev (>= 0.1.8)
 Standards-Version: 3.8.0
 Homepage: https://launchpad.net/indicator-application
-Vcs-Bzr: http://bazaar.launchpa.net/~indicator-applet-developers/indicator-application/karmic
+Vcs-Bzr: http://bazaar.launchpa.net/~ubuntu-desktop/indicator-application/ubuntu
 
 Package: indicator-application
 Architecture: any
diff --git a/debian/libappindicator-doc.install b/debian/libappindicator-doc.install
new file mode 100644
index 0000000..313fe33
--- /dev/null
+++ b/debian/libappindicator-doc.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/gtk-doc/html/libappindicator/*
diff --git a/debian/patches/clean_up_docs.patch b/debian/patches/clean_up_docs.patch
new file mode 100644
index 0000000..0b054fe
--- /dev/null
+++ b/debian/patches/clean_up_docs.patch
@@ -0,0 +1,21 @@
+=== modified file 'docs/reference/libappindicator-docs.sgml'
+--- 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">
+   <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>.
+-    </releaseinfo>
+   </bookinfo>
+ 
+   <chapter>
+-    <title>[Insert title here]</title>
++    <title>Base Classes for Applications</title>
+         <xi:include href="xml/app-indicator.xml"/>
+ 
+   </chapter>
+
diff --git a/debian/rules b/debian/rules
index 9d0676a..c42359e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,11 +2,8 @@
 
 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
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-#binary-install/indicator-messages::
-#	# remove .a/.la clutter
-#	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a
-#	rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la