Merged revisions 5169-5170 via svnmerge from

https://svn.o-hand.com/repos/poky/trunk

........
  r5169 | ross | 2008-09-10 17:17:54 +0100 (Wed, 10 Sep 2008) | 1 line
  
  gaku: clean up depends/recommends
........
  r5170 | richard | 2008-09-10 17:25:46 +0100 (Wed, 10 Sep 2008) | 20 lines
  
  bitbake hg fetcher: Add fix from Matt Hoosier
  
  The Mercurial fetcher right now will fail when used to incrementally
  fetch an update to a local clone of a repository already fetched at
  some prior revision. The culprit is the sequence:
  
   hg pull -r <rev>
   hg update -C <rev>
    
  A subtlety in the way that Mercurial stores its tags (in a normally
  version-controlled file called .hgtags) has the side-effect that a
  repository fetched at a tag "foo" will not actually contain a
  new-enough copy of the .hgtags file to be self-aware of the foo tag's
  existence.
    
  The solution is just to get all the changesets in the repository on
  incremental upgrades, so that the following "hg update" will be able
  to resolve the tag.
    
........


git-svn-id: https://svn.o-hand.com/repos/poky/branches/elroy@5282 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 13 insertions, 5 deletions

diff --git a/bitbake/lib/bb/fetch/hg.py b/bitbake/lib/bb/fetch/hg.py
index c7d2e62c13..1cd5a8aa5c 100644
--- a/bitbake/lib/bb/fetch/hg.py
+++ b/bitbake/lib/bb/fetch/hg.py
@@ -94,7 +94,10 @@ class Hg(Fetch):
         if command is "fetch":
             cmd = "%s clone %s %s://%s/%s %s" % (basecmd, " ".join(options), proto, hgroot, ud.module, ud.module)
         elif command is "pull":
-            cmd = "%s pull %s" % (basecmd, " ".join(options))
+            # do not pass options list; limiting pull to rev causes the local
+            # repo not to contain it and immediately following "update" command
+            # will crash
+            cmd = "%s pull" % (basecmd)
         elif command is "update":
             cmd = "%s update -C %s" % (basecmd, " ".join(options))
         else:
diff --git a/meta/packages/gaku/gaku_svn.bb b/meta/packages/gaku/gaku_svn.bb
index 12fc545d74..66055f129b 100644
--- a/meta/packages/gaku/gaku_svn.bb
+++ b/meta/packages/gaku/gaku_svn.bb
@@ -1,15 +1,20 @@
 DESCRIPTION = "Music player"
 LICENSE = "GPL"
 DEPENDS = "gtk+ gstreamer"
-PV = "0.0+svnr${SRCREV}"
 
 RDEPENDS = "gst-plugin-audioconvert \
         gst-plugin-audioresample \
-        gst-plugin-alsa \
         gst-plugin-typefindfunctions \
-        gst-plugin-id3demux \
         gst-plugin-playbin"
-RRECOMMENDS = "gst-plugin-mad gst-plugin-ivorbis gst-plugin-ogg"
+
+RRECOMMENDS = "gst-plugin-mad \
+            gst-plugin-id3demux \
+            gst-plugin-ivorbis \
+            gst-plugin-alsa \
+            gst-plugin-ogg"
+
+PV = "0.0+svnr${SRCREV}"
+PR = "r1"
 
 S = "${WORKDIR}/${PN}"