[Python-apps-commits] r699 - in packages/pypolicyd-spf/trunk/debian (4 files)
kitterma-guest at users.alioth.debian.org
kitterma-guest at users.alioth.debian.org
Sun Feb 24 20:58:01 UTC 2008
Date: Sunday, February 24, 2008 @ 20:58:00
Author: kitterma-guest
Revision: 699
Revert man page renaming and add transitional package for binary renaming.
Modified:
packages/pypolicyd-spf/trunk/debian/changelog
packages/pypolicyd-spf/trunk/debian/control
packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch
packages/pypolicyd-spf/trunk/debian/rules
Modified: packages/pypolicyd-spf/trunk/debian/changelog
===================================================================
--- packages/pypolicyd-spf/trunk/debian/changelog 2008-02-24 16:22:29 UTC (rev 698)
+++ packages/pypolicyd-spf/trunk/debian/changelog 2008-02-24 20:58:00 UTC (rev 699)
@@ -5,11 +5,10 @@
- IP whitelists with multiple items fixed
- IPv6 whitelist CIDR length fixed
- Logging and config file improvements
+ * Add transitional package to ease binary package name transition
* Remove pythonpath.patch (incorporated upstream)
* Update debian/copyright for 2008
* Update install-conf-fix.patch for new binary package name
- * Rename upstream man pages in debian/rules to match debian binary package
- name
* Add preinst and prerm to move conffile to correct directory for new
package name
Modified: packages/pypolicyd-spf/trunk/debian/control
===================================================================
--- packages/pypolicyd-spf/trunk/debian/control 2008-02-24 16:22:29 UTC (rev 698)
+++ packages/pypolicyd-spf/trunk/debian/control 2008-02-24 20:58:00 UTC (rev 699)
@@ -14,8 +14,18 @@
Depends: ${python:Depends}, python-spf (>= 2.0), postfix (>= 2.1)
Provides: python-policyd-spf
Replaces: python-policyd-spf
-Conflicts: python-policyd-spf
+Conflicts: python-policyd-spf (< 0.6)
Description: pure-Python Postfix policy daemon for SPF checking
python-policyd-spf is a Postfix SMTPd policy engine for SPF checking.
It is implemented in pure Python and uses the python-spf module. The SPF
web site is http://www.openspf.org/.
+
+Package: python-policyd-spf
+Architecture: all
+Depends: postfix-policyd-spf-python (>= ${source:Version})
+Description: Transition package for pypolicyd-spf binary renaming
+ Dummy package to ease migration from the old python-policyd-spf
+ package to the new postfix-policyd-spf-python package.
+ .
+ This can be safely removed once postfix-policyd-spf-python is installed.
+
Modified: packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch
===================================================================
--- packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch 2008-02-24 16:22:29 UTC (rev 698)
+++ packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch 2008-02-24 20:58:00 UTC (rev 699)
@@ -13,20 +13,6 @@
diff -Nur pypolicyd-spf-0.6/policyd-spf.1 pypolicyd-spf-0.6.new/policyd-spf.1
--- pypolicyd-spf-0.6/policyd-spf.1 2008-02-18 22:06:00.000000000 -0500
+++ pypolicyd-spf-0.6.new/policyd-spf.1 2008-02-20 18:00:30.000000000 -0500
-@@ -127,10 +127,10 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "policy-spf 1"
--.TH policy-spf 1 "2008-02-18"
-+.IX Title "postfix-policy-spf-python 1"
-+.TH postfix-policy-spf-python 1 "2008-02-18"
- .SH "NAME"
--python-policyd-spf \- pure-Python Postfix policy daemon for SPF checking
-+postfix-policyd-spf-python \- pure-Python Postfix policy daemon for SPF checking
- .SH "VERSION"
- .IX Header "VERSION"
- 0\.6
@@ -145,11 +145,12 @@
$ policyd-spf \-h (Display usage message)
@@ -38,44 +24,14 @@
Configuration options are described in the sample configuration file provided
-with the package policyd-spf.conf(5). The provided setup.py installs this
-configuration file in /etc/policyd-spf/.
-+with the package postfix-policyd-spf-python.conf(5). The Debian package
-+installs this configuration file in /etc/postfix-policyd-spf-python/.
++with the package policyd-spf.conf(5). The provided setup.py installs this
++configuration file in /etc/postfix-policyd-spf-python/.
Additionally, whitelisting certain IP addresses or IP addresses used by listed
domains from SPF checks is supported. Skipping SPF checks for local submission
-@@ -162,7 +163,7 @@
- SMTPD_POLICY_README and are generally familiar with Sender Policy Framework
- (SPF). See RFC 4408 for details.
-
--See policyd-spf.conf(5) for configuration file information.
-+See postfix-policyd-spf-python.conf(5) for configuration file information.
-
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
-@@ -274,7 +275,8 @@
-
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--policyd-spf.conf(5), python-spf, <http://www.openspf.org>, RFC 4408
-+postfix-policyd-spf-python.conf(5), python-spf, <http://www.openspf.org>,
-+RFC 4408
-
- .SH "AUTHORS"
- .IX Header "AUTHORS"
diff -Nur pypolicyd-spf-0.6/policyd-spf.conf.5 pypolicyd-spf-0.6.new/policyd-spf.conf.5
--- pypolicyd-spf-0.6/policyd-spf.conf.5 2008-02-18 22:06:00.000000000 -0500
+++ pypolicyd-spf-0.6.new/policyd-spf.conf.5 2008-02-20 17:59:35.000000000 -0500
-@@ -127,8 +127,8 @@
- .rm #[ #] #H #V #F C
- .\" ========================================================================
- .\"
--.IX Title "policy-spf.conf 5"
--.TH policy-spf.conf 5 "2008-02-18"
-+.IX Title "postfix-policy-spf-python.conf 5"
-+.TH postfix-policy-spf-python.conf 5 "2008-02-18"
- .SH "NAME"
- python-policyd-spf \- pure-Python Postfix policy daemon for SPF checking
- .SH "VERSION"
@@ -138,7 +138,7 @@
.SH "USAGE"
.IX Header "USAGE"
@@ -85,17 +41,6 @@
.SH "OTHER DOCUMENTATION"
.IX Header "OTHER DOCUMENTATION"
-@@ -146,8 +146,8 @@
- SMTPD_POLICY_README and are generally familiar with Sender Policy Framework
- (SPF). See RFC 4408 for details.
-
--man 1 policyd-spf provides general operation documentation for this
--package.
-+man 1 postfix-policyd-spf-python provides general operation documentation for
-+this package.
-
- .SH "SYNOPSIS"
- .IX Header "SYNOPSIS"
@@ -162,8 +162,8 @@
.IX Header "DESCRIPTION"
@@ -107,31 +52,6 @@
Additionally, whitelisting certain IP addresses from SPF checks is supported.
The this man page and the sample configuration file show the format to use.
-@@ -415,7 +415,8 @@
-
- .SH "SEE ALSO"
- .IX Header "SEE ALSO"
--man 1 policyd-spf, python-spf, <http://www.openspf.org>, RFC 4408
-+man 1 postfix-policyd-spf-python, python-spf, <http://www.openspf.org>,
-+RFC 4408
-
- .SH "AUTHORS"
- .IX Header "AUTHORS"
-diff -Nur pypolicyd-spf-0.6/README pypolicyd-spf-0.6.new/README
---- pypolicyd-spf-0.6/README 2008-02-18 21:02:06.000000000 -0500
-+++ pypolicyd-spf-0.6.new/README 2008-02-20 17:56:12.000000000 -0500
-@@ -35,8 +35,8 @@
- Nothing is configured by default, so this will not interact with Postfix until
- it has been set up.
-
--See man 1 policyd-spf for information on setting up and using this policy
--server.
-+See man 1 postfix-policyd-spf-python for information on setting up and using
-+this policy server.
-
--See man 5 policyd-spf.conf for configuration file information.
-+See man 5 postfix-policyd-spf-python.conf for configuration file information.
-
diff -Nur pypolicyd-spf-0.6/setup.py pypolicyd-spf-0.6.new/setup.py
--- pypolicyd-spf-0.6/setup.py 2008-02-20 17:32:03.000000000 -0500
+++ pypolicyd-spf-0.6.new/setup.py 2008-02-20 17:55:20.000000000 -0500
Modified: packages/pypolicyd-spf/trunk/debian/rules
===================================================================
--- packages/pypolicyd-spf/trunk/debian/rules 2008-02-24 16:22:29 UTC (rev 698)
+++ packages/pypolicyd-spf/trunk/debian/rules 2008-02-24 20:58:00 UTC (rev 699)
@@ -7,9 +7,3 @@
include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-install/postfix-policyd-spf-python::
- # Rename man pages to match Debian package name
- mv debian/postfix-policyd-spf-python/usr/share/man/man1/policyd-spf.1 \
- debian/postfix-policyd-spf-python/usr/share/man/man1/postfix-policyd-spf-python.1
- mv debian/postfix-policyd-spf-python/usr/share/man/man5/policyd-spf.conf.5 \
- debian/postfix-policyd-spf-python/usr/share/man/man5/postfix-policyd-spf-python.conf.5
More information about the Python-apps-commits
mailing list