Merge ../git-buildpackage.devel

5 files changed, 102 insertions, 0 deletions

diff --git a/docs/common.ent b/docs/common.ent
index 7c4d38da..31e9835a 100644
--- a/docs/common.ent
+++ b/docs/common.ent
@@ -7,6 +7,7 @@
   <!ENTITY git-buildpackage 	"<command>git-buildpackage</command>">
   <!ENTITY git-import-orig	"<command>git-import-orig</command>">
   <!ENTITY git-import-dsc	"<command>git-import-dsc</command>">
+  <!ENTITY git-dch		"<command>git-dch</command>">
   <!ENTITY gitcmd		"<command>git</command>">
   <!ENTITY gitkcmd		"<command>gitk</command>">
   <!ENTITY pbuildercmd		"<command>pbuilder</command>">
diff --git a/docs/man.git-dch.sgml b/docs/man.git-dch.sgml
new file mode 100644
index 00000000..797f372a
--- /dev/null
+++ b/docs/man.git-dch.sgml
@@ -0,0 +1,11 @@
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+  <!ENTITY % COMMON SYSTEM "common.ent">
+  %COMMON;
+  <!ENTITY % MANPAGES SYSTEM "manpages/manpages.ent">
+  %MANPAGES;
+]>
+
+<reference>
+<title>git-buildpackage Manual</title>
+&man.git.dch;
+</reference>
diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml
new file mode 100644
index 00000000..7abf89cd
--- /dev/null
+++ b/docs/manpages/git-dch.sgml
@@ -0,0 +1,88 @@
+<refentry id="gbp.man.git.dch">
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+  </refentryinfo>
+  <refmeta>
+   <refentrytitle>git-dch</refentrytitle> 
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&git-dch;</refname>
+
+    <refpurpose>Generate Debian changelog from git commit messages</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      &git-dch;
+
+      <arg><option>--verbose</option></arg>
+      <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg>
+      <arg><option>--debian-tag=</option><replaceable>tag-format</replaceable></arg>
+      <arg><option>--since=</option><replaceable>commitish</replaceable></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+    <para>
+    &git-dch; reads git commit messages and generates the debian changelog from it. If no arguments
+    are given &git-dch; starts from the last tagged debian package version up
+    to the tip of the current tip of the <replaceable>debian-branch</replaceable>.
+    </para>
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--debian-branch</option>=<replaceable>branch_name</replaceable>
+        </term>
+        <listitem>
+	  <para>The branch in the Git repository the Debian package is being
+	  developed on, default is <replaceable>master</replaceable>.
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--verbose</option></term> 
+	<term><option>-v</option></term>
+        <listitem>
+          <para>verbose execution</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--debian-tag=</option><replaceable>tag-format</replaceable>
+        </term>
+        <listitem>
+          <para>tag format used, when tagging debian versions</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--since=</option><replaceable>committish</replaceable>
+        </term>
+        <listitem>
+          <para>start reading commit messages at <replaceable>committish</replaceable></para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+      &man.git.config-files;
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>git-buildpackage (1), git-import-dsc (1), git (1), git_load_dirs (1)</para>
+
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>&dhusername; &dhemail;</para>
+
+  </refsect1>
+</refentry>
diff --git a/docs/manpages/manpages.ent b/docs/manpages/manpages.ent
index 6f76421a..7a00f0b1 100644
--- a/docs/manpages/manpages.ent
+++ b/docs/manpages/manpages.ent
@@ -1,6 +1,7 @@
 <!ENTITY man.git.importorig SYSTEM "git-import-orig.sgml">
 <!ENTITY man.git.importdsc SYSTEM "git-import-dsc.sgml">
 <!ENTITY man.git.buildpackage SYSTEM "git-buildpackage.sgml">
+<!ENTITY man.git.dch SYSTEM "git-dch.sgml">
 <!ENTITY man.git.config-files "
     <title>CONFIGURATION FILES</title>
     <para> Three configuration files are parsed to set defaults for the above
diff --git a/docs/manual.sgml b/docs/manual.sgml
index 0ffbe3fe..246e6070 100644
--- a/docs/manual.sgml
+++ b/docs/manual.sgml
@@ -28,6 +28,7 @@
     &man.git.buildpackage;
     &man.git.importdsc;
     &man.git.importorig;
+    &man.git.dch;
   </appendix>
   <appendix id="gbp.copyleft">
     <title>Copyright</title>