Merge upstream version 0.6.0_git20120822' into devel

Basically, only changes in documentation, other changes had already been
merged in.

Also, bump version number in the spec file accordingly.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

17 files changed, 51 insertions, 36 deletions

diff --git a/debian/changelog b/debian/changelog
index b159eb8e..5ebd2198 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+git-buildpackage (0.6.0~git20120822) unstable; urgency=low
+
+  [ Guido Günther ]
+  * [e05bfb9] dch: Fix error reporting on parsing errors
+  * [f4162be] manpage: Fix typo in git-dch's multimain-merge option
+    (Closes: #684322)
+  * [e8d175a] manpages: correct manual section and remove duplicate entry
+
+  [ Zhang Qiang ]
+  * [0af1e72] GitRepository/branch_contains: remove prefix '*' in branch name.
+
+  [ Markus Lehtonen ]
+  * [678f85f] docs: fix cross-referencing in manpages.
+  * [f0d4b0d] docs: make refentry ids of manpages more consistent
+  * [dc3b3b6] GitArgs/add: support iterable and non-string args.
+
+  [ Ed Bartosh ]
+  * [7524bbb] GitRepository: Implement set_upstream_branch and
+    get_upstream_branch methods
+
+ -- Guido Günther <agx@sigxcpu.org>  Wed, 22 Aug 2012 10:58:07 +0200
+
 git-buildpackage (0.6.0~git20120803) unstable; urgency=low
 
   [ Guido Günther ]
diff --git a/docs/chapters/building.sgml b/docs/chapters/building.sgml
index c6e959d3..5005416a 100644
--- a/docs/chapters/building.sgml
+++ b/docs/chapters/building.sgml
@@ -87,7 +87,7 @@ export-dir=../build-area
     <title>Running lintian</title>
 	<para>&git-buildpackage; exports several variables into the
 	<option>posttag</option>'s environment (for details see the <xref
-	linkend="gbp.man.git.buildpackage">).
+	linkend="man.git.buildpackage">).
 	To invoke &lintian; we need to tell it where to find the changes file:
 <programlisting>
 <command>git-buildpackage</command> <option>--git-postbuild</option>=<replaceable>'lintian $GBP_CHANGES_FILE'</replaceable>
@@ -155,7 +155,7 @@ echo "done."
     <title>Running postexport hook</title>
     <para>&git-buildpackage; exports several variables into the
 	<option>postexport</option>'s environment (for details see
-	the <xref linkend="gbp.man.git.buildpackage">). The motivation
+	the <xref linkend="man.git.buildpackage">). The motivation
 	for the postexport action is to allow further adjustment of
 	the sources prior to building the package. A typical use case
 	scenario is to allow creating multiple source and binary
diff --git a/docs/chapters/cfgfile.sgml b/docs/chapters/cfgfile.sgml
index cb9bd5e0..1cbe0b7d 100644
--- a/docs/chapters/cfgfile.sgml
+++ b/docs/chapters/cfgfile.sgml
@@ -91,6 +91,6 @@ upstream-branch=notdfsgclean
 git-log=--no-merges
 </programlisting>
 <para>
-For more details see the <xref linkend="gbp.man.gbp.conf"> manual page.
+For more details see the <xref linkend="man.gbp.conf"> manual page.
 </para>
 </chapter>
diff --git a/docs/manpages/gbp-clone.sgml b/docs/manpages/gbp-clone.sgml
index 15f7d8f0..f9193a68 100644
--- a/docs/manpages/gbp-clone.sgml
+++ b/docs/manpages/gbp-clone.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.gbp.clone">
+<refentry id="man.gbp.clone">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/gbp-create-remote-repo.sgml b/docs/manpages/gbp-create-remote-repo.sgml
index 93cf9268..aa49e629 100644
--- a/docs/manpages/gbp-create-remote-repo.sgml
+++ b/docs/manpages/gbp-create-remote-repo.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.gbp.create.remote.repo">
+<refentry id="man.gbp.create.remote.repo">
   <refentryinfo>
     <address>
       &dhemail;
@@ -83,7 +83,7 @@
         </term>
         <listitem>
 	  <para>Name of a config file section in <filename>gbp.conf</filename>
-          that specifies the above paramters. See <xref linkend="gbp.man.gbp.conf">
+          that specifies the above paramters. See <xref linkend="man.gbp.conf">
           manpage for details.
 	  </para>
         </listitem>
diff --git a/docs/manpages/gbp-pq.sgml b/docs/manpages/gbp-pq.sgml
index 7e4dff29..00cafedc 100644
--- a/docs/manpages/gbp-pq.sgml
+++ b/docs/manpages/gbp-pq.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.gbp.pq">
+<refentry id="man.gbp.pq">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/gbp-pull.sgml b/docs/manpages/gbp-pull.sgml
index f796506c..fb3c0cc2 100644
--- a/docs/manpages/gbp-pull.sgml
+++ b/docs/manpages/gbp-pull.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.gbp.pull">
+<refentry id="man.gbp.pull">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/gbp.conf.sgml b/docs/manpages/gbp.conf.sgml
index 4336fc48..4d9fcd83 100644
--- a/docs/manpages/gbp.conf.sgml
+++ b/docs/manpages/gbp.conf.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.gbp.conf">
+<refentry id="man.gbp.conf">
   <refentryinfo>
     <address>
       &dhemail;
@@ -68,7 +68,7 @@
 <para>
 
 <option>key=value</option> pairs of the command sections reflect the command line
-options and their settings. For example <xref linkend="gbp.man.git.buildpackage">
+options and their settings. For example <xref linkend="man.git.buildpackage">
 manualpage contains the <option>--git-export-dir</option>=<parameter>diirectory</parameter>
 option which can be turned into configuration file setting by dropping the
 <option>--git</option> prefix with:
@@ -81,7 +81,7 @@ option which can be turned into configuration file setting by dropping the
 
 <para>
 Notice that some option are actually repeatable, or take Python lists.
-For example the <xref linkend="gbp.man.git.import.orig"> commmand has the
+For example the <xref linkend="man.git.import.orig"> commmand has the
 <option>--filter</option>=<parameter>pattern</parameter> option which can
 be truned into a configuration file option like this:
 </para>
@@ -103,7 +103,7 @@ An alternative way is to write it using Python list syntax:
 
 <para>
 Boolean options can bei either <option>True</option> or <option>False</option>. For example
-<xref linkend="gbp.man.git.import.orig">; has the <option>--pristine-tar</option> and
+<xref linkend="man.git.import.orig">; has the <option>--pristine-tar</option> and
 <option>--no-pristine-tar</option> options which translate to:
 </para>
 <programlisting>
@@ -133,7 +133,7 @@ can't be configured via gbp.conf.
 </note>
 
 <para>
-<xref linkend="gbp.man.gbp.create.remote.repo"> can additionally parse remote site
+<xref linkend="man.gbp.create.remote.repo"> can additionally parse remote site
 configurations from <filename>gbp.conf</filename>. For example a configration like:
 </para>
 
@@ -213,18 +213,9 @@ the above list of configuration files.</para></listitem>
 
 <refsect1>
   <title>FILES</title>
-<para>
-  See See <filename>/etc/git-buildpackage/gbp.conf</filename> for an example.
-</para>
-</refsect1>
-
-<refsect1>
-  <title>STANDARDS</title>
-<para>
-  The at <ulink url="file:///usr/share/doc/git-buildpackage/manual-html/index.html">
-    <citetitle>The Git-Buildpackage Manual</citetitle></ulink> at
-  <filename>/usr/share/doc/git-buildpackage/manual-html/index.html</filename>
-</para>
+  <para>
+    See See <filename>/etc/git-buildpackage/gbp.conf</filename> for an example.
+  </para>
 </refsect1>
 
 <refsect1>
@@ -261,7 +252,9 @@ the above list of configuration files.</para></listitem>
     <citerefentry>
       <refentrytitle>git-buildpackage</refentrytitle>
       <manvolnum>1</manvolnum>
-    </citerefentry>
+    </citerefentry>,
+    <ulink url="file:///usr/share/doc/git-buildpackage/manual-html/index.html">
+    <citetitle>The Git-Buildpackage Manual</citetitle></ulink>
   </para>
 </refsect1>
 <refsect1>
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index 7b06b859..a4151613 100644
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.git.buildpackage">
+<refentry id="man.git.buildpackage">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml
index ea760943..a009a589 100644
--- a/docs/manpages/git-dch.sgml
+++ b/docs/manpages/git-dch.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.git.dch">
+<refentry id="man.git.dch">
   <refentryinfo>
     <address>
       &dhemail;
@@ -253,7 +253,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><option>--[no]-multimaintmerge</option>
+        <term><option>--[no-]multimaint-merge</option>
         </term>
         <listitem>
           <para>Merge commits by maintainer.</para>
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index fd049797..cb73fed4 100644
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.git.import.dsc">
+<refentry id="man.git.import.dsc">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/git-import-dscs.sgml b/docs/manpages/git-import-dscs.sgml
index 79fee247..3496cb11 100644
--- a/docs/manpages/git-import-dscs.sgml
+++ b/docs/manpages/git-import-dscs.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.git.import.dscs">
+<refentry id="man.git.import.dscs">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index fb9f7a94..610f3ba2 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -1,4 +1,4 @@
-<refentry id="gbp.man.git.import.orig">
+<refentry id="man.git.import.orig">
   <refentryinfo>
     <address>
       &dhemail;
diff --git a/docs/manpages/man.conffiles.sgml b/docs/manpages/man.conffiles.sgml
index 70c16cca..70d1ca7f 100644
--- a/docs/manpages/man.conffiles.sgml
+++ b/docs/manpages/man.conffiles.sgml
@@ -1,4 +1,4 @@
     <title>CONFIGURATION FILES</title>
     <para>Several <filename>gbp.conf</filename> files are parsed 
     to set defaults for the above commandline arguments. See the
-    <xref linkend="gbp.man.gbp.conf"> manpage for details.</para>
+    <xref linkend="man.gbp.conf"> manpage for details.</para>
diff --git a/docs/manual.sgml b/docs/manual.sgml
index 4b9026fa..eab37452 100644
--- a/docs/manual.sgml
+++ b/docs/manual.sgml
@@ -25,7 +25,7 @@
   &ch.cfgfile;
   &ch.special;
 
-  <appendix id="gbp.man.reference">
+  <appendix id="man.reference">
     <title>Command Reference</title>
     &man.git.buildpackage;
     &man.git.importdsc;
diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py
index 7c901379..dfb33114 100755
--- a/gbp/scripts/dch.py
+++ b/gbp/scripts/dch.py
@@ -338,7 +338,7 @@ def main(argv):
         parser = GbpOptionParserDebian(command=os.path.basename(argv[0]), prefix='',
                                        usage='%prog [options] paths')
     except ConfigParser.ParsingError as err:
-        gbp.log.errror(err)
+        gbp.log.err(err)
         return 1
     range_group = GbpOptionGroup(parser, "commit range options",
                                  "which commits to add to the changelog")
diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index e6d52471..65019a9c 100644
--- a/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec
@@ -1,6 +1,6 @@
 Name:       git-buildpackage
 Summary:    Build packages from git
-Version:    0.6.0git20120803
+Version:    0.6.0git20120822
 Release:    0
 Group:      Development/Tools/Building
 License:    GPLv2