--- cvs-syncmail-2.3.orig/debian/docs
+++ cvs-syncmail-2.3/debian/docs
@@ -0,0 +1 @@
+README
--- cvs-syncmail-2.3.orig/debian/dirs
+++ cvs-syncmail-2.3/debian/dirs
@@ -0,0 +1 @@
+usr/bin
--- cvs-syncmail-2.3.orig/debian/copyright
+++ cvs-syncmail-2.3/debian/copyright
@@ -0,0 +1,35 @@
+This package was debianized by Kevin M. Rosenberg <kmr@debian.org> on
+Thu,  7 Nov 2002 19:35:48 -0700.
+
+It was downloaded from http://www.sourceforge.net/projects/cvs-syncmail
+
+Upstream Authors: Barry Warsaw & Fred Drake (maintainers)
+
+Copyright (c) 2002-2005, Barry Warsaw, Fred Drake, and contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the names of the authors nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- cvs-syncmail-2.3.orig/debian/changelog
+++ cvs-syncmail-2.3/debian/changelog
@@ -0,0 +1,94 @@
+cvs-syncmail (2.3-1.4.201403182209) ucs4-0-0-0; urgency=low
+
+  * UCS auto build. No patches were applied to the original source package
+
+ -- Univention builddaemon <buildd@univention.de>  Tue, 18 Mar 2014 22:09:30 +0100
+
+cvs-syncmail (2.3-1) unstable; urgency=low
+
+  * New maintainer (Closes: #300564)
+  * Updated encoding patch and using dpatch to deal with it
+    (Closes: #251814)
+  * Added patch to correct spelling in man page (Closes: #247281)
+  * Corrected issues with directory handling (Closes: #246997)
+  * Seems that version 2.3 handles multiple emails fine
+    (Closes: #294846)
+  * Added patch to correct use of - in the man page
+
+ -- Christopher Sacca <csacca@thecsl.org>  Fri,  5 Aug 2005 11:26:14 -0400
+
+cvs-syncmail (1.2+cvs.2004.05.02-2) unstable; urgency=low
+
+  * Orphan package as in bug# 250510
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 24 Jun 2004 08:22:40 -0600
+
+cvs-syncmail (1.2+cvs.2004.05.02-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun,  2 May 2004 12:35:11 -0600
+
+cvs-syncmail (1.2+cvs.2003.08.07.patch1-1) unstable; urgency=low
+
+  * New upstream
+  * Apply encoding patch (closes:228856)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 22 Jan 2004 06:41:38 -0700
+
+cvs-syncmail (1.2+cvs.2003.07.28-2) unstable; urgency=low
+
+  * Patch upstream man page (closes: 207243, 205593)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 31 Aug 2003 02:43:46 -0600
+
+cvs-syncmail (1.2+cvs.2003.07.28-1) unstable; urgency=low
+
+  * New upstream (closes:203192)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 28 Jul 2003 14:53:56 -0600
+
+cvs-syncmail (1.2+cvs.2003.07.10-1) unstable; urgency=low
+
+  * New upstream (closes: 184326,186358) 
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed,  9 Jul 2003 11:28:57 -0600
+
+cvs-syncmail (1.2+cvs.2003.03.20-1) unstable; urgency=low
+
+  * New upstream
+  * Remove blank lines from control (closes:185579)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 20 Mar 2003 09:45:28 -0700
+
+cvs-syncmail (1.2+cvs.2003.01.18-1) unstable; urgency=low
+
+  * Synchronize with latest CVS
+  * Add upstream changelog created with cvs2cl
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 18 Jan 2003 09:38:55 -0700
+
+cvs-syncmail (1.2+cvs.2003.01.16-1) unstable; urgency=low
+
+  * New upstream (closes: 176865)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 16 Jan 2003 12:15:31 -0700
+
+cvs-syncmail (1.2-2) unstable; urgency=low
+
+  * Fix URL in copyright file (closes: 176638)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 14 Jan 2003 01:36:47 -0700
+
+cvs-syncmail (1.2-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Tue, 12 Nov 2002 16:41:04 -0700
+
+cvs-syncmail (1.0-1) unstable; urgency=low
+
+  * Initial Release (closes: 168240)
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu,  7 Nov 2002 19:35:48 -0700
+
--- cvs-syncmail-2.3.orig/debian/source.lintian-overrides
+++ cvs-syncmail-2.3/debian/source.lintian-overrides
@@ -0,0 +1,2 @@
+# Upstream tarball is made from cvs
+cvs-syncmail source: cvsignore-file-in-source doc/.cvsignore
--- cvs-syncmail-2.3.orig/debian/control
+++ cvs-syncmail-2.3/debian/control
@@ -0,0 +1,17 @@
+Source: cvs-syncmail
+Section: utils
+Priority: optional
+Maintainer: Christopher Sacca <csacca@thecsl.org>
+Build-Depends-Indep: debhelper (>= 4.0.0), dpatch
+Standards-Version: 3.6.2
+
+Package: cvs-syncmail
+Architecture: all
+Depends: ${shlibs:Depends}, python (>= 2.2.2)
+Description: Notification program for CVS checkins
+ syncmail is a CVS notification tool which can provide a diff for every 
+ change to a CVS repository, mailed to specified email addresses. This 
+ tool is useful for large communities to monitor activity, and is used 
+ for Python and many other active SourceForge.net projects.
+ .
+ Homepage: http://sourceforge.net/projects/cvs-syncmail
--- cvs-syncmail-2.3.orig/debian/rules
+++ cvs-syncmail-2.3/debian/rules
@@ -0,0 +1,59 @@
+#!/usr/bin/make -f
+
+export DH_COMPAT=3
+
+# Include magic dpatch stuff to give us
+# patch and depatch targets
+include /usr/share/dpatch/dpatch.make
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+configure: configure-stamp
+configure-stamp: patch
+	dh_testdir
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp 
+	dh_testdir
+	# Might want to construct the man from the sgml later
+	#/usr/bin/docbook-to-man debian/syncmail.sgml > syncmail.1
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	install syncmail $(CURDIR)/debian/cvs-syncmail/usr/bin/
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installman doc/syncmail.1
+	dh_installchangelogs
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
+
--- cvs-syncmail-2.3.orig/debian/patches/04_man_page.dpatch
+++ cvs-syncmail-2.3/debian/patches/04_man_page.dpatch
@@ -0,0 +1,226 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_man_page.dpatch by  <csacca@thecsl.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Corrects lintian infos on the man page
+## DP: Changes - to \- or \(hy depending on use
+
+@DPATCH@
+
+--- cvs-syncmail/doc/syncmail.1	2005-08-09 09:41:27.076546440 -0400
++++ cvs-syncmail/doc/syncmail.1	2005-08-09 10:16:44.115707568 -0400
+@@ -1,16 +1,16 @@
+ .\" This manpage has been automatically generated by docbook2man 
+ .\" from a DocBook document.  This tool can be found at:
+ .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
+-.\" Please send any bug reports, improvements, comments, patches, 
++.\" Please send any bug reports, improvements, patches, 
+ .\" etc. to Steve Cheng <steve@ggi-project.org>.
+-.TH "SYNCMAIL" "1" "15 July 2003" "" ""
++.TH "SYNCMAIL" "1" "09 August 2005" "" ""
+ 
+ .SH NAME
+ syncmail \- Send email notifications of CVS activity
+ .SH SYNOPSIS
+ 
+-\fBsyncmail\fR [ \fB--cvsroot \fIpath\fB\fR ] [ \fB [ --context | -C ]
+-\fIlines\fB\fR ] [ \fB-c\fR ] [ \fB-u\fR ] [ \fB--quiet | -q\fR ] [ \fB--fromhost \fIhostname\fB\fR ] [ \fB-f \fIhostname\fB\fR ] [ \fB--mailhost \fIhostname\fB\fR ] [ \fB-m \fIhostname\fB\fR ] [ \fB--reply-to \fIemail-address\fB\fR ] [ \fB-R \fIemail-address\fB\fR ] [ \fB--subject-prefix \fIstring\fB\fR ] [ \fB-S \fIstring\fB\fR ] [ \fB--help | -h\fR ] \fB%{sSv}\fR \fBemail\fR\fI ...\fR
++\fBsyncmail\fR [ \fB\-\-cvsroot \fIpath\fB\fR ] [ \fB [ \-\-context | \-C ]
++\fIlines\fB\fR ] [ \fB\-c\fR ] [ \fB\-u\fR ] [ \fB\-\-quiet | \-q\fR ] [ \fB\-\-fromhost \fIhostname\fB\fR ] [ \fB\-f \fIhostname\fB\fR ] [ \fB\-\-mailhost \fIhostname\fB\fR ] [ \fB\-m \fIhostname\fB\fR ] [ \fB\-\-reply\(hyto \fIemail\(hyaddress\fB\fR ] [ \fB\-R \fIemail\(hyaddress\fB\fR ] [ \fB\-\-subject\(hyprefix \fIstring\fB\fR ] [ \fB\-S \fIstring\fB\fR ] [ \fB\-\-help | \-h\fR ] \fB%{sSv}\fR \fBemail\fR\fI ...\fR
+ 
+ .SH "DESCRIPTION"
+ .PP
+@@ -68,7 +68,7 @@
+ need any supplemental data files.  There are two approaches to
+ installing the script:
+ check it into the repository, or place it in a shared location on the CVS
+-server.
++server\&.
+ .PP
+ To install syncmail by checking it into the repository
+ itself, check out a working copy of the CVSROOT module.  Add
+@@ -81,7 +81,7 @@
+ syncmail\fR for this), and use the \fBcvs
+ add\fR and \fBcvs commit\fR commands to
+ add it to the repository.  Once the commit is complete, a
+-checked-out copy of the syncmail script should be located
++checked\(hyout copy of the syncmail script should be located
+ in the repository in the \fICVSROOT\fR directory in the
+ repository.  This is the usual way of integrating syncmail
+ into a CVS repository.
+@@ -118,7 +118,7 @@
+ .nf
+ CVSROOT $CVSROOT/CVSROOT/syncmail %{sVv} you@example.com
+ 
+-DEFAULT $CVSROOT/CVSROOT/syncmail %{sVv} myproject-checkins@example.com
++DEFAULT $CVSROOT/CVSROOT/syncmail %{sVv} myproject\(hycheckins@example.com
+ .fi
+ .PP
+ This will cause email to be sent to two different places, with
+@@ -128,7 +128,7 @@
+ list all your project administrators here.  For all other
+ files, email will be sent to the addresses you specify.
+ .PP
+-If you have several sub-products for which you want different
++If you have several sub\(hyproducts for which you want different
+ checkin lists, you can change the "DEFAULT" label to match the
+ subtree that you want to go to each list, with a separate line
+ for each distinct prefix.  For example, if your repository
+@@ -138,8 +138,8 @@
+ .nf
+ CVSROOT $CVSROOT/CVSROOT/syncmail %{sVv} you@example.com
+ 
+-one/ $CVSROOT/CVSROOT/syncmail %{sVv} myproject-one-cvs@example.com
+-two/ $CVSROOT/CVSROOT/syncmail %{sVv} myproject-two-cvs@exmaple.com
++one/ $CVSROOT/CVSROOT/syncmail %{sVv} myproject\(hyone\(hycvs@example.com
++two/ $CVSROOT/CVSROOT/syncmail %{sVv} myproject\(hytwo\(hycvs@exmaple.com
+ .fi
+ .PP
+ Note that %{sSv} is magic that CVS
+@@ -147,7 +147,7 @@
+ are affected; be sure to enter that exactly as shown, just
+ before the email addresses.  Command line options for
+ syncmail should be placed between the name of the
+-syncmail command and the %{sSv}.
++syncmail command and the %{sSv}\&.
+ .PP
+ You can still have a "DEFAULT" line that gets used for any
+ additional subprojects.
+@@ -167,85 +167,85 @@
+ .SH "OPTIONS"
+ .PP
+ When an option includes an argument, you may specify the
+-argument either separate ("-d output") or mashed ("-doutput").
++argument either separate ("\-d output") or mashed ("\-doutput").
+ syncmail supports both.  For long options which include an
+ argument, the argument may be separated from the option
+-("--fromhost example.com") or mashed, but with an equals sign
+-between the option and the argument ("--fromhost=example.com").
++("\-\-fromhost example.com") or mashed, but with an equals sign
++between the option and the argument ("\-\-fromhost=example.com").
+ .TP
+-\fB--cvsroot \fIpath\fB\fR
++\fB\-\-cvsroot \fIpath\fB\fR
+ Use \fIpath\fR as the value for the
+ \fBCVSROOT\fR environment variable.  This is
+ usually not needed.
+ .TP
+-\fB--context \fIlines\fB\fR
++\fB\-\-context \fIlines\fB\fR
+ .TP
+-\fB-C \fIlines\fB\fR
++\fB\-C \fIlines\fB\fR
+ Generate context diffs with
+ \fIlines\fR lines of context
+ displayed on either side of the changed portion.
+ .TP
+-\fB-c\fR
++\fB\-c\fR
+ Generate context diffs with two lines of context shown on
+ either side of the changed portion.  This is the default.
+ .TP
+-\fB-u\fR
++\fB\-u\fR
+ Generate unified diffs instead of context diffs.  Unified
+ diffs are typically shorter than context diffs, but many
+ users find it easier to read context diffs.
+ .TP
+-\fB--quiet\fR
++\fB\-\-quiet\fR
+ .TP
+-\fB-q\fR
++\fB\-q\fR
+ Do not display progress information to the user.  By
+ default, syncmail will display the email addresses it
+ is sending mail to and note when it starts generating the
+ notification email and when it is done sending the email.
+ .TP
+-\fB--fromhost \fIhostname\fB\fR
++\fB\-\-fromhost \fIhostname\fB\fR
+ .TP
+-\fB-f \fIhostname\fB\fR
++\fB\-f \fIhostname\fB\fR
+ Specify the host name that email should appear to come
+ from.  By default, syncmail uses the fully qualified
+ name for the host it's running on, and lets the local MTA
+ take care of host name translation.
+ .TP
+-\fB--mailhost \fIhostname\fB\fR
++\fB\-\-mailhost \fIhostname\fB\fR
+ .TP
+-\fB-m \fIhostname\fB\fR
++\fB\-m \fIhostname\fB\fR
+ Specify the host name that should be used to submit mail
+ via SMTP.  By default, syncmail uses
+-\fBlocalhost\fR.
++\fBlocalhost\fR\&.
+ .TP
+-\fB--reply-to \fIemail-address\fB\fR
++\fB\-\-reply\(hyto \fIemail\(hyaddress\fB\fR
+ .TP
+-\fB-R \fIemail-address\fB\fR
++\fB\-R \fIemail\(hyaddress\fB\fR
+ Specify an email address that should be used for the
+ Reply-To header in email.  This header is not normally
+ used.
+ .TP
+-\fB--subject-prefix \fIstring\fB\fR
++\fB\-\-subject\(hyprefix \fIstring\fB\fR
+ .TP
+-\fB-S \fIstring\fB\fR
+-Provide a string that is pre-pended to the subject of
++\fB\-S \fIstring\fB\fR
++Provide a string that is pre\(hypended to the subject of
+ generated email.  This prefix is often of the form
+-\&'[Checkins]', allowing mail filters to easily identify
++'[Checkins]', allowing mail filters to easily identify
+ mail from syncmail for a specific CVS repository or
+ project.
+ 
+ This is often not needed if mail is being sent to a
+ mailing list manager that adds a prefix of it's own.
+ .TP
+-\fB--help\fR
++\fB\-\-help\fR
+ .TP
+-\fB-h\fR
++\fB\-h\fR
+ Print a summary of the command line options to standard
+ output.
+ .SH "BUGS"
+ .PP
+ There are probably some bugs.  If you find them, please
+ report them to the maintainers using the bug
+-tracker <URL:http://sourceforge.net/projects/cvs-syncmail/>.
++tracker <URL:http://sourceforge.net/projects/cvs\(hysyncmail/>\&.
+ .SH "ALTERNATIVES"
+ .PP
+ Other people have written tools that serve similar purposes, but
+@@ -253,8 +253,8 @@
+ from remote locations (anything other than direct filesystem
+ access).
+ .PP
+-A mostly-equivalent package, written in Perl, is available as
+-cvs-syncmail (Perl version) <URL:http://cvs-syncmail-pl.sourceforge.net/>.
++A mostly\(hyequivalent package, written in Perl, is available as
++cvs-syncmail (Perl version) <URL:http://cvs\(hysyncmail\(hypl.sourceforge.net/>\&.
+ .PP
+ \fBlog_accum\fR is another Perl implementation, but
+ there appears to be no authoritative source of information for
+@@ -264,13 +264,13 @@
+ current references to these efforts.
+ .SH "SEE ALSO"
+ .PP
+-The syncmail page <URL:http://sourceforge.net/projects/cvs-syncmail/> on SourceForge <URL:http://sourceforge.net/>.
++The syncmail page <URL:http://sourceforge.net/projects/cvs\(hysyncmail/> on SourceForge <URL:http://sourceforge.net/>\&.
+ .PP
+-The CVS home page <URL:http://www.cvshome.org/>.
++The CVS home page <URL:http://www.cvshome.org/>\&.
+ .SH "AUTHOR"
+ .PP
+ syncmail was originally written by Barry Warsaw to send mail
+ based on checkins to the Python project.  Barry continues to
+ maintain syncmail with help from Fred L. Drake, Jr. and others.
+ .PP
+-This manual page was written by Fred L. Drake, Jr. <fdrake@acm.org>.
++This manual page was written by Fred L. Drake, Jr. <fdrake@acm.org>\&.
--- cvs-syncmail-2.3.orig/debian/patches/03_dir_issues.dpatch
+++ cvs-syncmail-2.3/debian/patches/03_dir_issues.dpatch
@@ -0,0 +1,78 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_dir_issues.dpatch by  <csacca@thecsl.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correction on issues with directories
+
+@DPATCH@
+
+--- cvs-syncmail/syncmail	2005-08-05 13:30:47.042173408 -0400
++++ cvs-syncmail/syncmail	2005-08-05 16:38:19.021653120 -0400
+@@ -298,27 +298,35 @@
+         entries_fn = os.path.join("CVS", "Entries")
+     entries_log_fn = entries_fn + ".Log"
+     mapping = {}
+-    f = open(entries_fn)
+-    while 1:
+-        line = f.readline()
+-        if not line:
+-            break
+-##        if line.strip() == "D":
+-##            continue
+-        # we could recurse down subdirs, except the Entries.Log files
+-        # we need haven't been written to the subdirs yet, so it
+-        # doesn't do us any good
+-##        if line[0] == "D":
+-##            name = line.split("/")[1]
+-##            dirname = namekey(prefix, name)
+-##            if os.path.isdir(dirname):
+-##                m = load_change_info(dirname)
+-##                mapping.update(m)
+-        if line[0] == "/":
+-            # normal file
+-            get_entry(prefix, mapping, line, entries_fn)
+-        # else: bogus Entries line
+-    f.close()
++    try:
++        f = open(entries_fn)
++    except IOError:
++        try:
++            f = open(os.path.join("../", entries_fn))
++        except IOError:
++            f = None
++    if (f != None):
++        while 1:
++            line = f.readline()
++            if not line:
++                break
++##            if line.strip() == "D":
++##                continue
++            # we could recurse down subdirs, except the Entries.Log files
++            # we need haven't been written to the subdirs yet, so it
++            # doesn't do us any good
++##            if line[0] == "D":
++##                name = line.split("/")[1]
++##                dirname = namekey(prefix, name)
++##                if os.path.isdir(dirname):
++##                    m = load_change_info(dirname)
++##                    mapping.update(m)
++            if line[0] == "/":
++                # normal file
++                get_entry(prefix, mapping, line, entries_fn)
++            # else: bogus Entries line
++        f.close()
++
+     if os.path.isfile(entries_log_fn):
+         f = open(entries_log_fn)
+         while 1:
+@@ -358,6 +366,10 @@
+ 
+ # scan args for options
+ def main():
++    # fix so that %{sVv} works sanely
++    for i in range(len(sys.argv)):
++      sys.argv[i] = re.sub('- ', ' - ', sys.argv[i])
++
+     # XXX Should really move all the options to an object, just to
+     # avoid threading so many positional args through everything.
+     try:
--- cvs-syncmail-2.3.orig/debian/patches/00list
+++ cvs-syncmail-2.3/debian/patches/00list
@@ -0,0 +1,4 @@
+01_encoding.dpatch
+02_spelling.dpatch
+03_dir_issues.dpatch
+04_man_page.dpatch
--- cvs-syncmail-2.3.orig/debian/patches/01_encoding.dpatch
+++ cvs-syncmail-2.3/debian/patches/01_encoding.dpatch
@@ -0,0 +1,74 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_encoding.dpatch by <csacca@thecsl.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Old patch to support character encodings
+
+@DPATCH@
+
+--- cvs-syncmail-2.3/syncmail	2005-08-05 12:02:22.612818776 -0400
++++ cvs-syncmail-2.3/syncmail	2005-08-05 12:03:13.181131224 -0400
+@@ -71,6 +71,9 @@
+     --charset=charset
+       Add a encoding header to message.
+ 
++    --charset=charset
++      Add a encoding header to message.
++
+     --quiet / -q
+         Don't print as much status to stdout.
+ 
+@@ -218,7 +221,7 @@
+ 
+ 
+ 
+-def blast_mail(subject, people, entries, contextlines, fromhost, replyto):
++def blast_mail(subject, people, entries, contextlines, fromhost, replyto, charset):
+     # cannot wait for child process or that will cause parent to retain cvs
+     # lock for too long.  Urg!
+     if not os.fork():
+@@ -247,6 +250,9 @@
+ To: %(people)s''' % vars
+         if replyto:
+             print >> s, 'Reply-To: %s' % replyto
++        if charset:
++            print >> s, 'MIME-Version: 1.0\nContent-Type: text/plain; charset=%s\nContent-Transfer-Encoding: 8bit' % charset
++
+         print >>s, '''\
+ Subject: %(subject)s
+ Date: %(date)s
+@@ -371,7 +377,7 @@
+             sys.argv[1:], 'hC:cuS:R:qf:m:',
+             ['fromhost=', 'context=', 'cvsroot=', 'mailhost=',
+              'subject-prefix=', 'reply-to=',
+-             'help', 'quiet'])
++             'help', 'quiet', 'charset='])
+     except getopt.error, msg:
+         usage(1, msg)
+ 
+@@ -380,6 +386,7 @@
+     verbose = 1
+     subject_prefix = ""
+     replyto = None
++    charset = None
+     fromhost = None
+     for opt, arg in opts:
+         if opt in ('-h', '--help'):
+@@ -397,6 +404,8 @@
+             subject_prefix = arg
+         elif opt in ('-R', '--reply-to'):
+             replyto = arg
++        elif opt == '--charset':
++            charset = arg
+         elif opt in ('-q', '--quiet'):
+             verbose = 0
+         elif opt in ('-f', '--fromhost'):
+@@ -433,7 +442,7 @@
+         print 'Mailing %s...' % COMMASPACE.join(people)
+         print 'Generating notification message...'
+     blast_mail(subject, people, changes.values(),
+-               contextlines, fromhost, replyto)
++               contextlines, fromhost, replyto, charset)
+     if verbose:
+         print 'Generating notification message... done.'
+ 
--- cvs-syncmail-2.3.orig/debian/patches/02_spelling.dpatch
+++ cvs-syncmail-2.3/debian/patches/02_spelling.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_spelling.dpatch by  <csacca@thecsl.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Spelling correction.
+
+@DPATCH@
+
+--- cvs-syncmail/doc/syncmail.1  2005-08-05 14:09:05.274788944 -0400
++++ cvs-syncmail/doc/syncmail.1  2005-08-05 14:09:29.578094280 -0400
+@@ -191,7 +191,7 @@
+ .TP
+ \fB-u\fR
+ Generate unified diffs instead of context diffs.  Unified
+-diffs are typically shorted than context diffs, but many
++diffs are typically shorter than context diffs, but many
+ users find it easier to read context diffs.
+ .TP
+ \fB--quiet\fR
+
