Merge lp:~vorlon/gnome-user-docs/ubuntu-jaunty into lp:~ubuntu-core-doc/gnome-user-docs/ubuntu-jaunty

[Steve Langasek]

[Steve Langasek (vorlon)]

another upload to merge

=== modified file 'debian/changelog'
--- debian/changelog	2009-03-30 13:04:59 +0000
+++ debian/changelog	2009-04-01 15:49:54 +0000
@@ -1,9 +1,11 @@
-gnome-user-docs (2.26.0+svn20090323ubuntu3) UNRELEASED; urgency=low
+gnome-user-docs (2.26.0+svn20090323ubuntu3) jaunty; urgency=low
 
   * Drop Pre-Depends from debian/control source stanza; this has no
     meaning whatsoever for a source package.
+  * Install the omf files as well, needed so that the documentation shows
+    up in yelp.  LP: #353154.
 
- -- Steve Langasek <[e-mail]>  Mon, 30 Mar 2009 13:01:40 +0000
+ -- Steve Langasek <[e-mail]>  Wed, 01 Apr 2009 08:40:35 -0700
 
 gnome-user-docs (2.26.0+svn20090323ubuntu2) jaunty; urgency=low
 

=== modified file 'debian/gnome-user-guide.install'
--- debian/gnome-user-guide.install	2009-03-30 12:43:01 +0000
+++ debian/gnome-user-guide.install	2009-04-01 15:17:17 +0000
@@ -1,1 +1,2 @@
 /usr/share/gnome/help/*/C
+/usr/share/omf/*/*-C.omf

=== modified file 'debian/rules'
--- debian/rules	2009-03-30 12:37:33 +0000
+++ debian/rules	2009-04-01 15:17:17 +0000
@@ -34,6 +34,7 @@
 	               do echo $$ll; done | sed -e's/_.*//' | sort -u); \
 	do \
 		echo /usr/share/gnome/help/'*'/$${lang}* > debian/gnome-user-guide-$${lang}.install; \
+		echo /usr/share/omf/'*'/'*'-$${lang}'*'.omf >> debian/gnome-user-guide-$${lang}.install; \
 	done
 
 debian/control::