[Python-modules-commits] r5778 - in packages/pyspf/trunk/debian (6 files)

[kitterma-guest at users.alioth.debian.org]

    Date: Tuesday, July 1, 2008 @ 17:38:54
  Author: kitterma-guest
Revision: 5778

Make lintian happy and clean up the docs a bit more.

Added:
  packages/pyspf/trunk/debian/patches/spf-shebang.patch
Modified:
  packages/pyspf/trunk/debian/README.Debian.python-spf
  packages/pyspf/trunk/debian/README.Debian.spf-tools-python
  packages/pyspf/trunk/debian/changelog
  packages/pyspf/trunk/debian/control
  packages/pyspf/trunk/debian/pyspf.1

Modified: packages/pyspf/trunk/debian/README.Debian.python-spf
===================================================================
--- packages/pyspf/trunk/debian/README.Debian.python-spf	2008-07-01 15:22:52 UTC (rev 5777)
+++ packages/pyspf/trunk/debian/README.Debian.python-spf	2008-07-01 17:38:54 UTC (rev 5778)
@@ -1,8 +1,8 @@
-README.Debian
+README.Debian.python-spf
 
-In addition to the Python SPF library, the python-spf package installs a python
-version of the spfquery script and a DNS Resource Record Type 99 (Type SPF) 
-conversion helper script.
+A Python version of the spfquery script and a DNS Resource Record Type 99
+(Type SPF) conversion helper script are provided in the spf-tools-python
+package.
 
 Use of the Python SPF library is documented in the pyspf(1) man page.
 

Modified: packages/pyspf/trunk/debian/README.Debian.spf-tools-python
===================================================================
--- packages/pyspf/trunk/debian/README.Debian.spf-tools-python	2008-07-01 15:22:52 UTC (rev 5777)
+++ packages/pyspf/trunk/debian/README.Debian.spf-tools-python	2008-07-01 17:38:54 UTC (rev 5778)
@@ -1,8 +1,8 @@
 README.Debian
 
-In addition to the Python SPF library, the python-spf package installs a python
-version of the spfquery script and a DNS Resource Record Type 99 (Type SPF) 
-conversion helper script.
+The Python SPF library is provided in the python-spf package.  The
+spf-tools-python package installs a Python version of the spfquery script and a
+DNS Resource Record Type 99 (Type SPF) conversion helper script.
 
 Use of the Python SPF library is documented in the pyspf(1) man page.
 

Modified: packages/pyspf/trunk/debian/changelog
===================================================================
--- packages/pyspf/trunk/debian/changelog	2008-07-01 15:22:52 UTC (rev 5777)
+++ packages/pyspf/trunk/debian/changelog	2008-07-01 17:38:54 UTC (rev 5778)
@@ -19,8 +19,11 @@
     run, so python-yaml need not be installed by default
   * Update standards version to 3.8.0.1
     - Add debian/README.source
+  * Properly escape leading quotes in pyspf.1
+  * Revert inline removal of spf.py shebang and spf-shebang.patch to make
+    it right 
 
- -- Scott Kitterman <scott at kitterman.com>  Mon, 30 Jun 2008 15:07:13 -0400
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 01 Jul 2008 13:34:17 -0400
 
 pyspf (2.0.4-3) unstable; urgency=low
 

Modified: packages/pyspf/trunk/debian/control
===================================================================
--- packages/pyspf/trunk/debian/control	2008-07-01 15:22:52 UTC (rev 5777)
+++ packages/pyspf/trunk/debian/control	2008-07-01 17:38:54 UTC (rev 5778)
@@ -26,7 +26,7 @@
 Depends: ${python:Depends}
 Recommends: python-spf
 XB-Python-Version: all
-Conflicts: spfquery (<= 1.2.5-4), libmail-spf-query-perl (<< 1:1.999.1-3)
+Conflicts: spfquery (<= 1.2.5-4), libmail-spf-query-perl (<< 1:1.999.1-3), python-spf (<< 2.0.4-4~)
 Description: sender policy framework (SPF) tools for Python
  SPF (Sender Policy Framework) related scripts and tools in Python.
  .

Added: packages/pyspf/trunk/debian/patches/spf-shebang.patch
===================================================================
--- packages/pyspf/trunk/debian/patches/spf-shebang.patch	                        (rev 0)
+++ packages/pyspf/trunk/debian/patches/spf-shebang.patch	2008-07-01 17:38:54 UTC (rev 5778)
@@ -0,0 +1,9 @@
+diff -Nur -x '*.orig' -x '*~' pyspf-2.0.4/spf.py pyspf-2.0.4.new/spf.py
+--- pyspf-2.0.4/spf.py	2008-07-01 13:13:38.000000000 -0400
++++ pyspf-2.0.4.new/spf.py	2008-07-01 13:15:33.000000000 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ """SPF (Sender Policy Framework) implementation.
+ 
+ Copyright (c) 2003, Terence Way

Modified: packages/pyspf/trunk/debian/pyspf.1
===================================================================
--- packages/pyspf/trunk/debian/pyspf.1	2008-07-01 15:22:52 UTC (rev 5777)
+++ packages/pyspf/trunk/debian/pyspf.1	2008-07-01 17:38:54 UTC (rev 5778)
@@ -182,8 +182,8 @@
         ('pass', 250, 'sender SPF authorized')
 
 The first element in the tuple is one of 'pass', 'fail', 'netural', 'softfail',
-'unknown', or 'error'.  The second is the SMTP response status code: 550 for 
-'fail', 450 for 'error' and 250 for all else.  The third is an explanation.
+\'unknown', or 'error'.  The second is the SMTP response status code: 550 for 
+\'fail', 450 for 'error' and 250 for all else.  The third is an explanation.
 
 Note: SPF results alone are never sufficient to decide that a message should be
 accepted.  Accept, reject, or defer decisions are a function of local reciever
@@ -197,7 +197,7 @@
         ('pass', 'sender SPF verified')
 
 The first element in the tuple is one of 'pass', 'fail', 'neutral', 'softfail,
-'permerror', or 'temperror'.  The second is an explanation.
+\'permerror', or 'temperror'.  The second is an explanation.
 
 .SH "RFC 4408 TEST SUITE"
 .IX Header "RFC 4408 TEST SUITE"