[banshee: 39/40] Merge branch 'docs'

[Gabriel Burt <gburt src gnome org>]

commit 52eb965f724ca0bcb4759905efd334e5306a60eb
Merge: bbb6e38 1ad24a0
Author: Gabriel Burt <gabriel burt gmail com>
Date:   Fri Jun 4 17:17:43 2010 -0700

    Merge branch 'docs'
    
    Conflicts:
    	.gitignore
    	Makefile.am
    	configure.ac

 .gitignore                     |    2 +
 Makefile.am                    |    5 ++
 autogen.sh                     |    2 +
 build/m4/shamrock/gnome-doc.m4 |   11 +++
 configure.ac                   |    6 ++
 help/C/TODO                    |    8 ++
 help/C/add-podcast.page        |   80 ++++++++++++++++++++++
 help/C/add-radio.page          |   71 +++++++++++++++++++
 help/C/advanced.page           |   32 +++++++++
 help/C/emusic.page             |   14 ++++
 help/C/extensions.page         |   40 +++++++++++
 help/C/import.page             |   73 ++++++++++++++++++++
 help/C/importplaylist.page     |   13 ++++
 help/C/index.page              |   47 +++++++++++++
 help/C/introduction.page       |   50 ++++++++++++++
 help/C/itunes-import.page      |   14 ++++
 help/C/keyboardshortcuts.page  |  145 ++++++++++++++++++++++++++++++++++++++++
 help/C/legal.xml               |    9 +++
 help/C/manage-coverart.page    |   31 +++++++++
 help/C/manage-playlists.page   |   72 ++++++++++++++++++++
 help/C/manage-tags.page        |   81 ++++++++++++++++++++++
 help/C/play-queue.page         |   85 +++++++++++++++++++++++
 help/C/play.page               |   54 +++++++++++++++
 help/C/rb-import.page          |   14 ++++
 help/C/search.page             |  119 ++++++++++++++++++++++++++++++++
 help/C/sort.page               |   55 +++++++++++++++
 help/C/sync.page               |   31 +++++++++
 help/C/ui.page                 |   54 +++++++++++++++
 help/Makefile.am               |   25 +++++++
 help/banshee.omf.in            |    9 +++
 30 files changed, 1252 insertions(+), 0 deletions(-)
---
diff --cc .gitignore
index 4b34e0c,479ec7e..fd27482
--- a/.gitignore
+++ b/.gitignore
@@@ -55,5 -55,4 +56,6 @@@ release-r
  C:\\NUnitPrimaryTrace.txt
  tests/Performance/Performance.dll
  tests/results/
 +extras/metrics/data
 +obj
+ *.make
diff --cc Makefile.am
index ccb2f8a,246d907..56e8d07
--- a/Makefile.am
+++ b/Makefile.am
@@@ -118,40 -102,10 +119,43 @@@ hg
  	rm tester.*; \
  	popd; 
  
 +update-docs:
 +	make -C docs/Hyena update-docs; \
 +	make -C docs/Banshee update-docs;
 +
 +merge-docs:
 +	make -C docs/Hyena merge; \
 +	make -C docs/Banshee merge;
 +
 +check-since:
 +	@if [ -z '$(SINCE)' ]; then echo 'Specify a SINCE (e.g. make package-patch SINCE=1.6.0)'; exit 1; fi;
 +
 +package-patch: check-since
 +	@if [ -f 'since-$(SINCE).patch' ]; then echo 'since-$(SINCE).patch already exists'; exit 1; fi;
 +	@git diff-tree -p "$(SINCE).." | filterdiff \
 +		-x 'a/Makefile.am' \
 +		-x 'a/profile-configure' \
 +		-x 'a/po/*' \
 +		-x 'a/banshee.doap' \
 +		-x \*.csproj \
 +		-x \*.sln \
 +		-x \*extras/\* &> 'since-$(SINCE).patch'
 +	@echo 'since-$(SINCE).patch is ready'
 +
 +package-po: check-since
 +	@if [ -f 'po-since-$(SINCE).tar.bz2' ]; then echo 'po-since-$(SINCE).tar.bz2 already exists'; exit 1; fi;
 +	@git diff-tree -p '$(SINCE)..' po \
 +		| awk -F / '{if ($$0 ~ /^+++ b\/po\/.+\.po$$/) print $$2 "/" $$3}' \
 +		| xargs tar cfj po-since-$(SINCE).tar.bz2 2>/dev/null; \
 +	if [ $$? -eq 123 ]; then \
 +		echo 'No po changes since $(SINCE)'; \
 +		exit 0; \
 +	fi
 +
+ DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+ 
  EXTRA_DIST = \
+ 	gnome-doc-utils.make \
  	intltool-extract.in \
  	intltool-merge.in \
  	intltool-update.in \
diff --cc configure.ac
index 9bc8573,1c7bbc1..eb62ba1
--- a/configure.ac
+++ b/configure.ac
@@@ -62,11 -63,10 +63,13 @@@ dnl libbanshee/native dependencies (req
  BANSHEE_CHECK_LIBBANSHEE
  BANSHEE_CHECK_GSTREAMER
  
 +dnl For the new media backend using gstreamer-sharp
 +BANSHEE_CHECK_GSTREAMER_SHARP
 +
  BANSHEE_CHECK_NOW_PLAYING_X11
  
+ SHAMROCK_CHECK_GNOME_DOC_UTILS(0.17.3)
+ 
  dnl Mono and gmcs
  SHAMROCK_CHECK_MONO_MODULE(1.9.1)
  SHAMROCK_FIND_MONO_2_0_COMPILER
@@@ -386,7 -354,7 +391,8 @@@ ${PACKAGE}-${VERSION
  
    Build/Development:
      Unit Tests:        ${do_tests} (requires nunit >= ${NUNIT_REQUIRED})
 +    API Docs:          ${enable_docs} (requires monodocer and mdassembler)
+     User Help:         ${HAVE_GNOME_DOC_UTILS} (requires gnome-doc-utils >= 0.17.3)
      Custom a11y:       ${gtksharp_with_a11y} (requires gtk-sharp >= 2.12.10)
      Release Build:     ${enable_release}
      Vendor Build ID:   ${vendor_build_id}