--- cvschangelogbuilder-2.4.orig/debian/cvschangelogbuilder.sgml
+++ cvschangelogbuilder-2.4/debian/cvschangelogbuilder.sgml
@@ -0,0 +1,262 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+  <!ENTITY dhfirstname "<firstname>Adriaan</firstname>">
+  <!ENTITY dhsurname   "<surname>Peeters</surname>">
+  <!ENTITY dhdate      "<date>July 16, 2008</date>">
+  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
+  <!ENTITY dhemail     "<email>apeeters@lashout.net</email>">
+  <!ENTITY dhusername  "Adriaan Peeters">
+  <!ENTITY dhucpackage "<refentrytitle>CVSCHANGELOGBUILDER</refentrytitle>">
+  <!ENTITY dhpackage   "cvschangelogbuilder">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2006</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>build cvs ChangeLogs and cvs html reports</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage; </command>
+      <arg choice="req"><option>-output=outputmode</option></arg>
+      <arg choice="opt"><option>-m=module -d=repository</option></arg>
+      <arg choice="opt"><option>-b=branch</option></arg>
+      <arg choice="opt"><option>-tagstart=tagname</option></arg>
+      <arg choice="opt"><option>-tagend=tagname</option></arg>
+      <arg choice="opt"><option>-ssh</option></arg>
+      <arg choice="opt"><option>-rlogfile=rlogfile</option></arg>
+      <arg choice="opt"><option>-keeprlogfile</option></arg>
+      <arg choice="opt"><option>-dir=dirname</option></arg>
+      <arg choice="opt"><option>-viewcvsurl=viewcvsurl</option></arg>
+      <arg choice="opt"><option>-ignore=file/dir</option></arg>
+      <arg choice="opt"><option>-only=file/dir</option></arg>
+      <arg choice="opt"><option>-includeheader=file</option></arg>
+      <arg choice="opt"><option>-allowindex</option></arg
+      <arg choice="opt"><option>-debug=x</option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para><command>&dhpackage;</command>
+      generates advanced ChangeLog/Report files for CVS projects/modules.
+    </para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+        <variablelist>
+            <varlistentry><term><option>-output=outputmode</option></term>
+                <listitem>
+                    <para>
+			Where outputmode is:
+                    </para>
+                    <itemizedlist>
+                        <listitem><para>listdeltabydate  To get a changelog between 2 versions, sorted by date</para></listitem>
+                        <listitem><para>listdeltabylog   To get a changelog between 2 versions, sorted by log</para></listitem>
+                        <listitem><para>listdeltabyfile  To get a changelog between 2 versions, sorted by file</para></listitem>
+                        <listitem><para>listdeltaforrpm  To get a changelog between 2 versions for rpm spec files</para></listitem>
+                        <listitem><para>buildhtmlreport  To build an html report</para></listitem>
+                    </itemizedlist>
+                    <para>Note that "between 2 versions" means (depends on tagstart/tagend options):</para>
+                    <itemizedlist>
+                        <listitem><para>from start to a tagged version (version changes included)</para></listitem>
+                        <listitem><para>from a tagged version (excluded) to another tagged version (included)</para></listitem>
+                        <listitem><para>or from a tagged version until now (version changes excluded)</para></listitem>
+                    </itemizedlist>
+                    <para>You can also add extra parameters when output=buildhtmlreport by adding them
+                          after a colon and separated by a comma, like this:
+                           -output=buildhtmlreport:param1,param2
+                          This is extra paremeters available for -output=buildhtmlreport mode:
+                    </para>
+                    <itemizedlist>
+                        <listitem><para>nosummary         To remove summary part</para></listitem>
+                        <listitem><para>nolinesofcode     To remove lines of code part</para></listitem>
+                        <listitem><para>nodevelopers      To remove developers part</para></listitem>
+                        <listitem><para>nodaysofweek      To remove days of week part</para></listitem>
+                        <listitem><para>nohours           To remove hours part</para></listitem>
+                        <listitem><para>notags            To remove tags part</para></listitem>
+                        <listitem><para>nolastlogs        To remove last logs part</para></listitem>
+                        <listitem><para>nolimit           To not limit last logs to last 200</para></listitem>
+                        <listitem><para>sortbyrevision    To sort last logs by revision</para></listitem>
+			<listitem><para>includediff       To include diff inside report page (very slow)</para></listitem>
+                        <listitem><para>loosecommits      To separate commits for same log by spaces</para></listitem>
+                    </itemizedlist>
+                </listitem>
+            </varlistentry>
+            <varlistentry><term><option>-m=module</option> <option>-d=repository</option></term>
+                <listitem>
+                    <para>The 'module' and 'repository' are the CVS module name and the CVS repository.
+                          If current directory is the root of a CVS project built from a cvs checkout,
+                          cvschangelogbuilder will retreive module and repository value automatically.
+                          If no local copy of repository are available or to force other value, use:
+                    </para>
+                    <itemizedlist>
+                        <listitem><para>-m=module           To force value of module name</para></listitem>
+                        <listitem><para>  -d=repository       To force value of CVSROOT</para></listitem>
+                    </itemizedlist>
+                </listitem>
+            </varlistentry>
+            <varlistentry><term><option>-branch=branchname</option></term>
+                <listitem>
+                    <para>
+                        To work on another branch than the default branch.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry><term><option>-tagstart=tagname</option></term>
+                <listitem>
+                    <para>
+                        To specify start tag version.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry><term><option>-tagend=tagend</option></term>
+                <listitem>
+                    <para>
+                        To specify end tag version.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry><term><option>-ssh</option></term>
+                <listitem>
+                    <para>
+                        To run CVS through ssh (this set env var CVS_RSH="ssh").
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry><term><option>-rlogfile=rlogfile</option></term>
+                <listitem>
+                    <para>
+                        If an up-to-date log file already exists localy, you can
+                        use this option to avoid log download, for a faster result.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry><term><option>-keeprlogfile</option></term>
+                <listitem>
+                    <para>
+                        Once process is finished, you can ask to not remove the
+                        downloaded log file.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry><term><option>-dir=dirname</option></term>
+                <listitem>
+                    <para>
+                        Output is built in directory dirname.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry><term><option>-viewcvsurl=viewcvsurl</option></term>
+                <listitem>
+                    <para>
+                        File's revisions in reports built by buildhtmlreport
+                        output are links to "viewcvs". String '__MODULE__'
+                        will be replaced by name of CVS module.
+                    </para>
+                </listitem>
+            </varlistentry>
+            <varlistentry><term><option>-ignore=file/dir</option></term>
+                <listitem>
+                    <para>
+                        To exclude a file/dir off report.
+                    </para>
+                </listitem>
+            </varlistentry>
+	    <varlistentry><term><option>-only=file/dir</option></term>
+	        <listitem>
+		    <para>
+		        To have reports only on file/dir that match.
+		    </para>
+		</listitem>
+	    </varlistentry>
+	    <varlistentry><term><option>-includeheader=file</option></term>
+		<listitem>
+		    <para>
+			To add content of a file after body tag.
+		    </para>
+		</listitem>
+	   </varlistentry>
+	   <varlistentry><term><option>-allowindex</option></term>
+		<listitem>
+		    <para>
+			To allow meta tag index (noindex by default).
+		    </para>
+		 </listitem>
+	    </varlistentry>
+            <varlistentry><term><option>-debug=x</option></term>
+                <listitem>
+                    <para>
+                        To output on stderr some debug info with level x.
+                    </para>
+                </listitem>
+            </varlistentry>
+        </variablelist>
+
+  </refsect1>
+
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>cvs (1).</para>
+
+  </refsect1>
+
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others). It is based on
+      the help output of &dhpackage;. Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the <acronym>GNU</acronym> General Public
+      License, Version 2 or any later version published by the Free
+      Software Foundation; with no Invariant Sections, no Front-Cover
+      Texts and no Back-Cover Texts.</para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
+
+
--- cvschangelogbuilder-2.4.orig/debian/rules
+++ cvschangelogbuilder-2.4/debian/rules
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+install/cvschangelogbuilder::
+	cp cvschangelogbuilder.pl debian/cvschangelogbuilder/usr/bin/cvschangelogbuilder
+
+DEB_INSTALL_MANPAGES_cvschangelogbuilder += debian/cvschangelogbuilder.1
+
+build/cvschangelogbuilder::
+	docbook-to-man debian/cvschangelogbuilder.sgml > debian/cvschangelogbuilder.1
+
+DEB_INSTALL_CHANGELOGS_ALL := docs/cvschangelogbuilder_changelog.txt
+
+cleanbuilddir/cvschangelogbuilder::
+	rm -f debian/cvschangelogbuilder.1
--- cvschangelogbuilder-2.4.orig/debian/dirs
+++ cvschangelogbuilder-2.4/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- cvschangelogbuilder-2.4.orig/debian/control
+++ cvschangelogbuilder-2.4/debian/control
@@ -0,0 +1,24 @@
+Source: cvschangelogbuilder
+Section: web
+Priority: optional
+Maintainer: Adriaan Peeters <apeeters@lashout.net>
+Uploaders: MJ Ray (Debian) <mjr@debian.org>
+Homepage: http://cvschangelogb.sourceforge.net/
+Build-Depends: cdbs, debhelper (>= 4.1.0), quilt, docbook-to-man
+Standards-Version: 3.8.0
+
+Package: cvschangelogbuilder
+Architecture: all
+Depends: perl, cvs
+Recommends: libgd-graph-perl
+Description: perl utility to generate ChangeLogs or html cvs reports
+ cvschangelogbuilder is an Perl utility to generate ChangeLogs or cvs reports
+ for a project hosted on a cvs server. The main goal is to provide a better
+ output that the 'cvs log' command.
+ .
+ cvschangelogbuilder offers 5 kinds of output:
+  * a changelog to include in a rpm .spec file
+  * a changelog by date (looks like 'cvs log')
+  * a changelog by file
+  * a changelog by change comment
+  * a html report of cvs project activity.
--- cvschangelogbuilder-2.4.orig/debian/watch
+++ cvschangelogbuilder-2.4/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sf.net/cvschangelogb/cvschangelogbuilder-(.*)\.tar\.gz
--- cvschangelogbuilder-2.4.orig/debian/compat
+++ cvschangelogbuilder-2.4/debian/compat
@@ -0,0 +1 @@
+4
--- cvschangelogbuilder-2.4.orig/debian/README.source
+++ cvschangelogbuilder-2.4/debian/README.source
@@ -0,0 +1,3 @@
+This package uses quilt for managing patches to upstream sources.
+
+See /usr/share/doc/quilt/README.source, contained in the quilt package.
--- cvschangelogbuilder-2.4.orig/debian/changelog
+++ cvschangelogbuilder-2.4/debian/changelog
@@ -0,0 +1,60 @@
+cvschangelogbuilder (2.4-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control:
+    - Added Build-Depends: quilt
+    - Bumped Standards-Version to 3.8.0
+  * Use quilt as patch system and update patch accordingly
+  * debian/rules:
+    - Use patchsys-quilt.mk instead of simple-patchsys.mk
+  * Added debian/README.source
+  * Updated man page debian/cvschangelogbuilder.sgml with new functionality
+
+ -- Adriaan Peeters <apeeters@lashout.net>  Wed, 16 Jul 2008 11:37:49 +0000
+
+cvschangelogbuilder (2.3-2) unstable; urgency=low
+
+  * Fixed debian/watch file (Closes: #453588)
+  * Added documentation to debian/patches/cvschangelogbuilder.pl.patch
+  * debian/control:
+    - Added Recommends: libgd-graph-perl
+    - Moved Homepage to a real field
+    - Bumped Standards-Version to 3.7.3, no changes needed
+    - Moved docbook-to-man to Build-Depends
+  * debian/rules:
+    - call docbook-to-man without absolute path
+    - remove man page on clean
+  * debian/copyright: added packaging license and upstream copyright
+
+ -- Adriaan Peeters <apeeters@lashout.net>  Sun, 09 Dec 2007 23:19:27 +0100
+
+cvschangelogbuilder (2.3-1) unstable; urgency=low
+
+  * New upstream release (Closes: #419279)
+  * Updated man page with new options
+  * Added debian/watch
+
+ -- Adriaan Peeters <apeeters@lashout.net>  Tue, 17 Apr 2007 10:25:48 +0200
+
+cvschangelogbuilder (2.2-3) unstable; urgency=low
+
+  * Added patch to fix program name in usage description
+  * Minor fix in the man page
+
+ -- Adriaan Peeters <apeeters@lashout.net>  Tue, 20 Jun 2006 08:43:46 +0200
+
+cvschangelogbuilder (2.2-2) unstable; urgency=low
+
+  * Initial Release (Closes: #368692)
+  * debian/control:
+    - Changed Architecture from any to all
+    - Added Build-Depends-Indep: docbook-to-man
+    - Added Uploaders: MJ Ray (Debian) <mjr@debian.org>
+
+ -- Adriaan Peeters <apeeters@lashout.net>  Thu, 15 Jun 2006 09:32:46 +0200
+
+cvschangelogbuilder (2.2-1) unstable; urgency=low
+
+  * Added man page
+
+ -- Adriaan Peeters <apeeters@lashout.net>  Wed, 24 May 2006 09:12:18 +0200
--- cvschangelogbuilder-2.4.orig/debian/copyright
+++ cvschangelogbuilder-2.4/debian/copyright
@@ -0,0 +1,30 @@
+This package was debianized by Adriaan Peeters <apeeters@lashout.net> on
+Wed, 24 May 2006 09:12:18 +0200.
+
+It was downloaded from http://cvschangelogb.sourceforge.net/
+
+The upstream source code and the Debian packaging is licensed under the
+following license.
+
+Upstream Author: Laurent Destailleur <eldy@users.sourceforge.net>
+
+Copyright (c) 2003-2006 Laurent Destailleur
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+   02110-1301 USA.
+
+On Debian systems, the complete text of the GNU General
+Public License, version 2 can be found in '/usr/share/common-licenses/GPL-2'.
--- cvschangelogbuilder-2.4.orig/debian/patches/series
+++ cvschangelogbuilder-2.4/debian/patches/series
@@ -0,0 +1 @@
+remove-program-extension-in-docs.diff
--- cvschangelogbuilder-2.4.orig/debian/patches/remove-program-extension-in-docs.diff
+++ cvschangelogbuilder-2.4/debian/patches/remove-program-extension-in-docs.diff
@@ -0,0 +1,46 @@
+Index: cvschangelogbuilder/cvschangelogbuilder.pl
+===================================================================
+--- cvschangelogbuilder.orig/cvschangelogbuilder.pl	2008-07-16 11:49:42.000000000 +0000
++++ cvschangelogbuilder/cvschangelogbuilder.pl	2008-07-16 11:50:22.000000000 +0000
+@@ -745,7 +745,7 @@
+ 	writeoutput("Note 1: Your cvs client (cvs or cvs.exe) must be in your PATH.\n");
+ 	writeoutput("Note 2: To use $PROG with a csv client through ssh, add option -ssh.\n");
+ 	writeoutput("\nUsage:\n");
+-	writeoutput("  $PROG.$Extension -output=outputmode [-m=module -d=repository] [options]\n");
++	writeoutput("  $PROG -output=outputmode [-m=module -d=repository] [options]\n");
+ 	writeoutput("\n");
+ 	writeoutput("Where 'output' is:\n");
+ 	writeoutput("  listdeltabydate  To get a changelog between 2 versions, sorted by date\n");
+@@ -807,10 +807,10 @@
+ 	writeoutput("  -debug=x            To output on stderr some debug info with level x.\n");
+ 	writeoutput("\n");
+ 	writeoutput("Examples:\n");
+-	writeoutput("  $PROG.$Extension -output=listdeltabyfile -module=myproject -tagstart=myproj_2_0 -d=john\@cvsserver:/cvsdir\n");
+-	writeoutput("  $PROG.$Extension -output=listdeltabydate -module=mymodule  -d=:ntserver:127.0.0.1:d:/mycvsdir\n");
+-	writeoutput("  $PROG.$Extension -output=listdeltabylog  -module=mymodule  -d=:pserver:user\@127.0.0.1:/usr/local/cvsroot\n");
+-	writeoutput("  $PROG.$Extension -output=buildhtmlreport -module=mymodule  -d=:ext:user\@cvs.sourceforge.net:/cvsroot -viewcvsurl=\"http://savannah.nongnu.org/cgi-bin/viewcvs/project/__MODULE__\"\n");
++	writeoutput("  $PROG -output=listdeltabyfile -module=myproject -tagstart=myproj_2_0 -d=john\@cvsserver:/cvsdir\n");
++	writeoutput("  $PROG -output=listdeltabydate -module=mymodule  -d=:ntserver:127.0.0.1:d:/mycvsdir\n");
++	writeoutput("  $PROG -output=listdeltabylog  -module=mymodule  -d=:pserver:user\@127.0.0.1:/usr/local/cvsroot\n");
++	writeoutput("  $PROG -output=buildhtmlreport -module=mymodule  -d=:ext:user\@cvs.sourceforge.net:/cvsroot -viewcvsurl=\"http://savannah.nongnu.org/cgi-bin/viewcvs/project/__MODULE__\"\n");
+ 	writeoutput("\n");
+ 	exit 0;
+ }
+@@ -899,7 +899,7 @@
+ }
+ if (! $Module) {
+ 	writeoutput("\n");
+-	error("The module name was not provided and could not be detected.\nUse -m=cvsmodulename option to specifiy module name.\n\nExample: $PROG.$Extension -output=$Output -module=mymodule -d=:pserver:user\@127.0.0.1:/usr/local/cvsroot");
++	error("The module name was not provided and could not be detected.\nUse -m=cvsmodulename option to specifiy module name.\n\nExample: $PROG -output=$Output -module=mymodule -d=:pserver:user\@127.0.0.1:/usr/local/cvsroot");
+ }
+ 
+ writeoutput(ucfirst($PROG)." launched for module: $Module\n",1);
+@@ -940,7 +940,7 @@
+ }
+ if (! $CvsRoot) {
+ 	writeoutput("\n");
+-	error("The repository value to use was not provided and could not be detected.\nUse -d=repository option to specifiy repository value.\n\nExample: $PROG.$Extension -output=$Output -module=mymodule -d=:pserver:user\@127.0.0.1:/usr/local/cvsroot");
++	error("The repository value to use was not provided and could not be detected.\nUse -d=repository option to specifiy repository value.\n\nExample: $PROG -output=$Output -module=mymodule -d=:pserver:user\@127.0.0.1:/usr/local/cvsroot");
+ }
+ if ($OutputDir) {
+     $OutputDir.="/";
