This fixes dkimproxy along the same lines as the maintainer used for the last conflict.
diff -u dkimproxy-1.0.1/debian/rules dkimproxy-1.0.1/debian/rules --- dkimproxy-1.0.1/debian/rules +++ dkimproxy-1.0.1/debian/rules @@ -42,7 +42,7 @@ rmdir $(CURDIR)/debian/$(DK_PKGNAME)/usr/lib mv $(CURDIR)/debian/$(DK_PKGNAME)/usr/bin/dkim_responder.pl $(CURDIR)/debian/$(DK_PKGNAME)/usr/bin/dkim_responder mv $(CURDIR)/debian/$(DK_PKGNAME)/usr/bin/dkimverify.pl $(CURDIR)/debian/$(DK_PKGNAME)/usr/bin/dkimproxy-verify - mv $(CURDIR)/debian/$(DK_PKGNAME)/usr/bin/dkimsign.pl $(CURDIR)/debian/$(DK_PKGNAME)/usr/bin/dkimsign + mv $(CURDIR)/debian/$(DK_PKGNAME)/usr/bin/dkimsign.pl $(CURDIR)/debian/$(DK_PKGNAME)/usr/bin/dkimproxy-sign # These are deamons, they have nothing to do in /usr/bin !!! mv $(CURDIR)/debian/$(DK_PKGNAME)/usr/bin/dkimproxy.in $(CURDIR)/debian/$(DK_PKGNAME)/usr/sbin mv $(CURDIR)/debian/$(DK_PKGNAME)/usr/bin/dkimproxy.out $(CURDIR)/debian/$(DK_PKGNAME)/usr/sbin diff -u dkimproxy-1.0.1/debian/manpages dkimproxy-1.0.1/debian/manpages --- dkimproxy-1.0.1/debian/manpages +++ dkimproxy-1.0.1/debian/manpages @@ -3,3 +3,3 @@ debian/man/dkim_responder.1 -debian/man/dkimsign.1 +debian/man/dkimproxy-sign.1 debian/man/dkimproxy-verify.1 diff -u dkimproxy-1.0.1/debian/changelog dkimproxy-1.0.1/debian/changelog --- dkimproxy-1.0.1/debian/changelog +++ dkimproxy-1.0.1/debian/changelog @@ -1,3 +1,14 @@ +dkimproxy (1.0.1-8.1) unstable; urgency=medium + + * Non-maintainer upload. + * Rename /usr/bin/dkimsign to dkimproxy-sign to avoid conflict with + python-dkim dkimsign (Closes: #511037) + - Rename debian/man/dkimsign.1 to dkimproxy-sign + - Update debian/manpages + - Correct references to dkimsign.1 in the packages other man pages + + -- Scott Kitterman <sc...@kitterman.com> Mon, 12 Jan 2009 22:49:01 -0500 + dkimproxy (1.0.1-8) unstable; urgency=low * Added a patch given by upstream so that dkimproxy continues to work if reverted: --- dkimproxy-1.0.1/debian/man/dkimsign.1 +++ dkimproxy-1.0.1.orig/debian/man/dkimsign.1 @@ -1,29 +0,0 @@ -.TH dkimsign 1 - -.SH NAME -dkimsign \- computes a DKIM signature for an email message - -.SH SYNOPSIS - dkimsign.pl [options] < original_email.txt - options: - \-\-method=METHOD - \-\-selector=SELECTOR - \-\-debug\-canonicalization=FILE - - dkimsign \-\-help - to see a full description of the various options - -.SH OPTIONS - -.B \-\-method -Determines the desired canonicalization method. Possible values are -simple, simple/simple, simple/relaxed, relaxed, relaxed/relaxed, -relaxed/simple. - -.B \-\-debug\-canonicalization -Outputs the canonicalized message to the specified file, in addition -to computing the DKIM signature. This is helpful for debugging -canonicalization methods. - -.SH "SEE ALSO" -dkimproxy.in(8), dkimproxy.out(8), dkimproxy-verify(1), dkim_responder(1) diff -u dkimproxy-1.0.1/debian/man/dkimproxy-verify.1 dkimproxy-1.0.1/debian/man/dkimproxy-verify.1 --- dkimproxy-1.0.1/debian/man/dkimproxy-verify.1 +++ dkimproxy-1.0.1/debian/man/dkimproxy-verify.1 @@ -13 +13 @@ -dkimproxy.in(8), dkimproxy.out(8), dkimsign(1), dkim_responder(1) +dkimproxy.in(8), dkimproxy.out(8), dkimproxy-sign(1), dkim_responder(1) diff -u dkimproxy-1.0.1/debian/man/dkim_responder.1 dkimproxy-1.0.1/debian/man/dkim_responder.1 --- dkimproxy-1.0.1/debian/man/dkim_responder.1 +++ dkimproxy-1.0.1/debian/man/dkim_responder.1 @@ -10 +10 @@ -dkimproxy.in(8), dkimproxy.out(8), dkimsign(1), dkimproxy-verify(1) +dkimproxy.in(8), dkimproxy.out(8), dkimproxy-sign(1), dkimproxy-verify(1) diff -u dkimproxy-1.0.1/debian/man/dkimproxy.in.8 dkimproxy-1.0.1/debian/man/dkimproxy.in.8 --- dkimproxy-1.0.1/debian/man/dkimproxy.in.8 +++ dkimproxy-1.0.1/debian/man/dkimproxy.in.8 @@ -112 +112 @@ -dkimproxy.out(8), dkim_responder(1), dkimsign(1), dkimproxy-verify(1) +dkimproxy.out(8), dkim_responder(1), dkimproxy-sign(1), dkimproxy-verify(1) diff -u dkimproxy-1.0.1/debian/man/dkimproxy.out.8 dkimproxy-1.0.1/debian/man/dkimproxy.out.8 --- dkimproxy-1.0.1/debian/man/dkimproxy.out.8 +++ dkimproxy-1.0.1/debian/man/dkimproxy.out.8 @@ -197 +197 @@ -dkimproxy.in(8), dkim_responder(8), dkimsign(8), dkimproxy-verify(8) +dkimproxy.in(8), dkim_responder(8), dkimproxy-sign(8), dkimproxy-verify(8) only in patch2: unchanged: --- dkimproxy-1.0.1.orig/debian/man/dkimproxy-sign.1 +++ dkimproxy-1.0.1/debian/man/dkimproxy-sign.1 @@ -0,0 +1,29 @@ +.TH dkimproxy-sign 1 + +.SH NAME +dkimproxy-sign \- computes a DKIM signature for an email message + +.SH SYNOPSIS + dkimproxy-sign [options] < original_email.txt + options: + \-\-method=METHOD + \-\-selector=SELECTOR + \-\-debug\-canonicalization=FILE + + dkimproxy-sign \-\-help + to see a full description of the various options + +.SH OPTIONS + +.B \-\-method +Determines the desired canonicalization method. Possible values are +simple, simple/simple, simple/relaxed, relaxed, relaxed/relaxed, +relaxed/simple. + +.B \-\-debug\-canonicalization +Outputs the canonicalized message to the specified file, in addition +to computing the DKIM signature. This is helpful for debugging +canonicalization methods. + +.SH "SEE ALSO" +dkimproxy.in(8), dkimproxy.out(8), dkimproxy-verify(1), dkim_responder(1)
signature.asc
Description: This is a digitally signed message part.
