[Python-apps-commits] r8063 - in packages/pypolicyd-spf/trunk/debian (5 files)

kitterman at users.alioth.debian.org kitterman at users.alioth.debian.org
Wed Jan 11 04:27:33 UTC 2012 

    Date: Wednesday, January 11, 2012 @ 04:27:30
  Author: kitterman
Revision: 8063

* New upstream release
  - Update debian/copyright for licensing changes
  - Update debian/patches/install-conf-fix.patch for new release
  - Add Suggests: python-authres for support for optional RFC 5451
    Authentication-Results header support
* Stop installing two copies of upstream changelog (CHANGES)

Modified:
  packages/pypolicyd-spf/trunk/debian/changelog
  packages/pypolicyd-spf/trunk/debian/control
  packages/pypolicyd-spf/trunk/debian/copyright
  packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch
  packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.docs

Modified: packages/pypolicyd-spf/trunk/debian/changelog
===================================================================
--- packages/pypolicyd-spf/trunk/debian/changelog	2012-01-10 23:28:42 UTC (rev 8062)
+++ packages/pypolicyd-spf/trunk/debian/changelog	2012-01-11 04:27:30 UTC (rev 8063)
@@ -1,3 +1,14 @@
+pypolicyd-spf (0.9-1) unstable; urgency=low
+
+  * New upstream release
+    - Update debian/copyright for licensing changes
+    - Update debian/patches/install-conf-fix.patch for new release
+    - Add Suggests: python-authres for support for optional RFC 5451
+      Authentication-Results header support
+  * Stop installing two copies of upstream changelog (CHANGES)
+
+ -- Scott Kitterman <scott at kitterman.com>  Tue, 10 Jan 2012 22:50:51 -0500
+
 pypolicyd-spf (0.8.1-2) unstable; urgency=low
 
   * Rebuild for python transition

Modified: packages/pypolicyd-spf/trunk/debian/control
===================================================================
--- packages/pypolicyd-spf/trunk/debian/control	2012-01-10 23:28:42 UTC (rev 8062)
+++ packages/pypolicyd-spf/trunk/debian/control	2012-01-11 04:27:30 UTC (rev 8063)
@@ -13,10 +13,11 @@
 Package: postfix-policyd-spf-python
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-spf, postfix, adduser
+Suggests: python-authres
 Description: Postfix policy server for SPF checking
  postfix-policyd-spf-python is a full featured Postfix SMTPd policy engine for
  SPF checking. It includes a variety of whitelisting mechanisms and policy
  options to enable it to support the widest variety of system requirements.
  It is implemented in pure Python and uses the python-spf module.  The SPF
- web site is http://www.openspf.org/.
+ web site is http://www.openspf.net/.
 

Modified: packages/pypolicyd-spf/trunk/debian/copyright
===================================================================
--- packages/pypolicyd-spf/trunk/debian/copyright	2012-01-10 23:28:42 UTC (rev 8062)
+++ packages/pypolicyd-spf/trunk/debian/copyright	2012-01-11 04:27:30 UTC (rev 8063)
@@ -1,36 +1,32 @@
 This package was debianized by Scott Kitterman <scott at kitterman.com> on
 Wed January 17, 2007 19:04:29 -0500.
 
-It was downloaded from http://www.openspf.org/Software
+It was downloaded from http://www.openspf.net/Software
 
 Copyright Holder: 
-Copyright © 2007-2010 Scott Kitterman <scott at kitterman.com>
+Copyright © 2007-2012 Scott Kitterman <scott at kitterman.com>
 Portions Copyright  © 2004-2005, Sean Reifschneider, tummy.com, ltd.
 <jafo at tummy.com>
 Portions Copyright © 2003-2004 Meng Weng Wong <mengwong at pobox.com>
 
 License:
 
-This is free software; you can redistribute it and/or modify it under the terms
-of the GNU General Public License (version 2).
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-    This program 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; either version 2 of the License, or
-    (at your option) any later version.
+       http://www.apache.org/licenses/LICENSE-2.0
 
-    This program 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.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+On Debian systems, the complete text of the Apache License, Version 2.0 can be
+found here:
+  /usr/share/common-licenses/Apache-2.0
 
-On Debian systems, the complete text of the GPL v2 can be found here:
-  /usr/share/common-licenses/GPL-2
+The Debian packaging is © 2007-2012, Scott Kitterman <scott at kitterman.com>
+and is licensed under the Apache-2.0 license.  See above.
 
-The Debian packaging is © 2007-2010, Scott Kitterman <scott at kitterman.com>
-and is licensed under the GPL.  See above.
-

Modified: packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch
===================================================================
--- packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch	2012-01-10 23:28:42 UTC (rev 8062)
+++ packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch	2012-01-11 04:27:30 UTC (rev 8063)
@@ -1,10 +1,10 @@
 This patch is to integrate with the package namespace for Debian and derived
 distributions.  It has not gone, and does not need to go, upstream.
-Index: pypolicyd-spf-0.8.0/policyd-spf
+Index: pypolicyd-spf-0.9/policyd-spf
 ===================================================================
---- pypolicyd-spf-0.8.0.orig/policyd-spf	2010-06-25 15:00:55.000000000 -0400
-+++ pypolicyd-spf-0.8.0/policyd-spf	2010-06-25 15:19:11.804410967 -0400
-@@ -567,7 +567,7 @@
+--- pypolicyd-spf-0.9.orig/policyd-spf	2012-01-10 22:46:37.760926000 -0500
++++ pypolicyd-spf-0.9/policyd-spf	2012-01-10 22:59:14.007929229 -0500
+@@ -605,7 +605,7 @@
  ###################################################
  #  load config file  {{{1
  #  Default location:
@@ -13,10 +13,10 @@
  if len(sys.argv) > 1:
      if sys.argv[1] in ( '-?', '--help', '-h' ):
          print 'usage: policyd-spf [<configfilename>]'
-Index: pypolicyd-spf-0.8.0/policyd-spf.1
+Index: pypolicyd-spf-0.9/policyd-spf.1
 ===================================================================
---- pypolicyd-spf-0.8.0.orig/policyd-spf.1	2010-06-25 15:00:55.000000000 -0400
-+++ pypolicyd-spf-0.8.0/policyd-spf.1	2010-06-25 15:19:11.804410967 -0400
+--- pypolicyd-spf-0.9.orig/policyd-spf.1	2012-01-10 22:46:37.760926000 -0500
++++ pypolicyd-spf-0.9/policyd-spf.1	2012-01-10 22:59:14.007929229 -0500
 @@ -145,12 +145,13 @@
  
  $ policyd-spf \-h (Display usage message)
@@ -53,10 +53,10 @@
  
   2. Configure the Postfix policy service in /etc/postfix/main.cf:
  
-Index: pypolicyd-spf-0.8.0/policyd-spf.conf.5
+Index: pypolicyd-spf-0.9/policyd-spf.conf.5
 ===================================================================
---- pypolicyd-spf-0.8.0.orig/policyd-spf.conf.5	2010-06-25 15:18:01.000000000 -0400
-+++ pypolicyd-spf-0.8.0/policyd-spf.conf.5	2010-06-25 15:19:46.272508648 -0400
+--- pypolicyd-spf-0.9.orig/policyd-spf.conf.5	2012-01-10 22:46:37.760926000 -0500
++++ pypolicyd-spf-0.9/policyd-spf.conf.5	2012-01-10 22:59:14.007929229 -0500
 @@ -138,7 +138,7 @@
  .SH "USAGE"
  .IX Header "USAGE"
@@ -74,16 +74,16 @@
 +file in /etc/postfix-policyd-spf-python/.
  
  Additionally, whitelisting certain IP addresses from SPF checks is supported.
- The this man page and the sample configuration file show the format to use.
-Index: pypolicyd-spf-0.8.0/setup.py
+ This man page and the sample configuration file show the format to use.
+Index: pypolicyd-spf-0.9/setup.py
 ===================================================================
---- pypolicyd-spf-0.8.0.orig/setup.py	2010-06-25 15:00:55.000000000 -0400
-+++ pypolicyd-spf-0.8.0/setup.py	2010-06-25 15:19:11.808412105 -0400
+--- pypolicyd-spf-0.9.orig/setup.py	2012-01-10 22:46:37.760926000 -0500
++++ pypolicyd-spf-0.9/setup.py	2012-01-10 22:59:14.007929229 -0500
 @@ -16,9 +16,9 @@
        scripts = ['policyd-spf'],
        data_files=[(os.path.join('share', 'man', 'man1'),
            ['policyd-spf.1']), (os.path.join('share', 'man', 'man5'),
--          ['policyd-spf.conf.5']), (os.path.join('../etc', 'python-policyd-spf'),
+-          ['policyd-spf.conf.5']), (os.path.join('/etc', 'python-policyd-spf'),
 -          ['policyd-spf.conf']), (os.path.join('share', 'man', 'man5'),
 -          ['policyd-spf.peruser.5'])],
 +          ['policyd-spf.conf.5']), (os.path.join('../etc',

Modified: packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.docs
===================================================================
--- packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.docs	2012-01-10 23:28:42 UTC (rev 8062)
+++ packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.docs	2012-01-11 04:27:30 UTC (rev 8063)
@@ -1,3 +1,2 @@
 README.per_user_whitelisting
 policyd-spf.conf.commented
-CHANGES

More information about the Python-apps-commits mailing list