[Python-apps-commits] r5684 - in packages/pypolicyd-spf/trunk/debian (11 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Fri Jun 25 19:40:43 UTC 2010
Date: Friday, June 25, 2010 @ 19:40:41
Author: kitterman
Revision: 5684
* Convert from CDBS to Debhelper 7
- Port debian/rules to DH 7 --with quilt plus overrides
- Drop cdbs from build-depends
- Add quilt to build-depends
- Update debian/README.source
- Bump debhelper version requirement
- Change compat to 7
- Remove cdbs generated pycompat
* Convert from python-central to dh_python2
- Drop build-depends on python-central
- Version build-depend on python (>- 2.6.5.-2~)
- Add --with python2 to debian/rules
* Drop obsolete Conflicts/Provides/Replaces: python-policyd-spf
* Drop obsolete debian/postfix-policyd-spf-python.postrm/preinst
* Fix XB-Python-Version
* Bump standards version to 3.8.4 without further change
* Drop DM-Upload-Allowed
Added:
packages/pypolicyd-spf/trunk/debian/patches/series
Modified:
packages/pypolicyd-spf/trunk/debian/README.source
packages/pypolicyd-spf/trunk/debian/changelog
packages/pypolicyd-spf/trunk/debian/compat
packages/pypolicyd-spf/trunk/debian/control
packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch
packages/pypolicyd-spf/trunk/debian/rules
Deleted:
packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postrm
packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.preinst
packages/pypolicyd-spf/trunk/debian/pycompat
packages/pypolicyd-spf/trunk/debian/source/
Modified: packages/pypolicyd-spf/trunk/debian/README.source
===================================================================
--- packages/pypolicyd-spf/trunk/debian/README.source 2010-06-25 16:50:19 UTC (rev 5683)
+++ packages/pypolicyd-spf/trunk/debian/README.source 2010-06-25 19:40:41 UTC (rev 5684)
@@ -1,5 +1,5 @@
-This package uses CDBS simple patchsys. dpkg-source -x does produce source
+This package uses quilt for patches. dpkg-source -x does produce source
ready for building with dpkg-buildpackage. It does not procude source ready
-for editing. To edit or update a patch, use cdbs-edit-patch. See man
-cdbs-edit-patch for details.
+for editing. See /usr/share/doc/quilt/README.source for information on using
+quilt.
Modified: packages/pypolicyd-spf/trunk/debian/changelog
===================================================================
--- packages/pypolicyd-spf/trunk/debian/changelog 2010-06-25 16:50:19 UTC (rev 5683)
+++ packages/pypolicyd-spf/trunk/debian/changelog 2010-06-25 19:40:41 UTC (rev 5684)
@@ -1,3 +1,25 @@
+pypolicyd-spf (0.8.0-2) unstable; urgency=low
+
+ * Convert from CDBS to Debhelper 7
+ - Port debian/rules to DH 7 --with quilt plus overrides
+ - Drop cdbs from build-depends
+ - Add quilt to build-depends
+ - Update debian/README.source
+ - Bump debhelper version requirement
+ - Change compat to 7
+ - Remove cdbs generated pycompat
+ * Convert from python-central to dh_python2
+ - Drop build-depends on python-central
+ - Version build-depend on python (>- 2.6.5.-2~)
+ - Add --with python2 to debian/rules
+ * Drop obsolete Conflicts/Provides/Replaces: python-policyd-spf
+ * Drop obsolete debian/postfix-policyd-spf-python.postrm/preinst
+ * Fix XB-Python-Version
+ * Bump standards version to 3.8.4 without further change
+ * Drop DM-Upload-Allowed
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 25 Jun 2010 14:41:35 -0400
+
pypolicyd-spf (0.8.0-1) unstable; urgency=low
* New upstream release
Modified: packages/pypolicyd-spf/trunk/debian/compat
===================================================================
--- packages/pypolicyd-spf/trunk/debian/compat 2010-06-25 16:50:19 UTC (rev 5683)
+++ packages/pypolicyd-spf/trunk/debian/compat 2010-06-25 19:40:41 UTC (rev 5684)
@@ -1 +1 @@
-5
+7
Modified: packages/pypolicyd-spf/trunk/debian/control
===================================================================
--- packages/pypolicyd-spf/trunk/debian/control 2010-06-25 16:50:19 UTC (rev 5683)
+++ packages/pypolicyd-spf/trunk/debian/control 2010-06-25 19:40:41 UTC (rev 5684)
@@ -1,23 +1,19 @@
Source: pypolicyd-spf
Section: mail
-Priority: extra
+Priority: optional
Maintainer: Scott Kitterman <scott at kitterman.com>
Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.1), python-all, python-central (>= 0.6)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.3.16), python (>= 2.6.5-2~), quilt (>= 0.46-7)
+Standards-Version: 3.8.4
Homepage: https://launchpad.net/pypolicyd-spf
Vcs-Svn: svn://svn.debian.org/python-apps/packages/pypolicyd-spf/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/pypolicyd-spf/trunk/
-DM-Upload-Allowed: yes
XS-Python-Version: >= 2.4
Package: postfix-policyd-spf-python
Architecture: all
-XB-Python-Version: >= 2.4
+XB-Python-Version: ${python:Versions}
Depends: ${python:Depends}, ${misc:Depends}, python-spf (>= 2.0), postfix (>= 2.1), adduser
-Provides: python-policyd-spf
-Replaces: python-policyd-spf
-Conflicts: python-policyd-spf
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
Modified: packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch
===================================================================
--- packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch 2010-06-25 16:50:19 UTC (rev 5683)
+++ packages/pypolicyd-spf/trunk/debian/patches/install-conf-fix.patch 2010-06-25 19:40:41 UTC (rev 5684)
@@ -1,6 +1,9 @@
-diff -Nur -x '*.orig' -x '*~' pypolicyd-spf-0.8.0/policyd-spf pypolicyd-spf-0.8.0.new/policyd-spf
---- pypolicyd-spf-0.8.0/policyd-spf 2010-02-17 01:56:53.000000000 -0500
-+++ pypolicyd-spf-0.8.0.new/policyd-spf 2010-02-17 02:17:13.000000000 -0500
+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
+===================================================================
+--- 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 @@
###################################################
# load config file {{{1
@@ -10,9 +13,10 @@
if len(sys.argv) > 1:
if sys.argv[1] in ( '-?', '--help', '-h' ):
print 'usage: policyd-spf [<configfilename>]'
-diff -Nur -x '*.orig' -x '*~' pypolicyd-spf-0.8.0/policyd-spf.1 pypolicyd-spf-0.8.0.new/policyd-spf.1
---- pypolicyd-spf-0.8.0/policyd-spf.1 2010-02-17 01:56:53.000000000 -0500
-+++ pypolicyd-spf-0.8.0.new/policyd-spf.1 2010-02-17 02:17:13.000000000 -0500
+Index: pypolicyd-spf-0.8.0/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
@@ -145,12 +145,13 @@
$ policyd-spf \-h (Display usage message)
@@ -49,9 +53,10 @@
2. Configure the Postfix policy service in /etc/postfix/main.cf:
-diff -Nur -x '*.orig' -x '*~' pypolicyd-spf-0.8.0/policyd-spf.conf.5 pypolicyd-spf-0.8.0.new/policyd-spf.conf.5
---- pypolicyd-spf-0.8.0/policyd-spf.conf.5 2010-02-17 01:56:53.000000000 -0500
-+++ pypolicyd-spf-0.8.0.new/policyd-spf.conf.5 2010-02-17 02:17:13.000000000 -0500
+Index: pypolicyd-spf-0.8.0/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
@@ -138,7 +138,7 @@
.SH "USAGE"
.IX Header "USAGE"
@@ -70,9 +75,10 @@
Additionally, whitelisting certain IP addresses from SPF checks is supported.
The this man page and the sample configuration file show the format to use.
-diff -Nur -x '*.orig' -x '*~' pypolicyd-spf-0.8.0/setup.py pypolicyd-spf-0.8.0.new/setup.py
---- pypolicyd-spf-0.8.0/setup.py 2010-02-17 01:56:53.000000000 -0500
-+++ pypolicyd-spf-0.8.0.new/setup.py 2010-02-17 02:19:18.000000000 -0500
+Index: pypolicyd-spf-0.8.0/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
@@ -16,9 +16,9 @@
scripts = ['policyd-spf'],
data_files=[(os.path.join('share', 'man', 'man1'),
Added: packages/pypolicyd-spf/trunk/debian/patches/series
===================================================================
--- packages/pypolicyd-spf/trunk/debian/patches/series (rev 0)
+++ packages/pypolicyd-spf/trunk/debian/patches/series 2010-06-25 19:40:41 UTC (rev 5684)
@@ -0,0 +1 @@
+install-conf-fix.patch
Deleted: packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postrm
===================================================================
--- packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postrm 2010-06-25 16:50:19 UTC (rev 5683)
+++ packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.postrm 2010-06-25 19:40:41 UTC (rev 5684)
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-set -e
-
-# conffile renamed in 0.6-1
-if dpkg --compare-versions "$2" lt-nl "0.6-1"; then
- # "$1" is equal to "upgrade" (which means downgrading in this case) or "abort-upgrade"
- # downgrading to <0.6-1 (0.5.2-3 most probably) -- restore old conffile name
- if [ ! -e /etc/python-policyd-spf/policyd-spf.conf ]; then
- test ! -d /etc/python-policyd-spf && mkdir /etc/python-policyd-spf/
- # policyd-spf.conf should exist but lets test it anyway
- test -f /etc/postfix-policyd-spf-python/policyd-spf.conf && \
- mv /etc/postfix-policyd-spf-python/policyd-spf.conf /etc/python-policyd-spf/policyd-spf.conf
- rmdir /etc/postfix-policyd-spf-python/
- fi
-fi
-
-#DEBHELPER#
-
-exit 0
Deleted: packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.preinst
===================================================================
--- packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.preinst 2010-06-25 16:50:19 UTC (rev 5683)
+++ packages/pypolicyd-spf/trunk/debian/postfix-policyd-spf-python.preinst 2010-06-25 19:40:41 UTC (rev 5684)
@@ -1,38 +0,0 @@
-#! /bin/sh
-
-set -e
-
-
-# Prepare to move a conffile without triggering a dpkg question
-prep_mv_conffile() {
- PKGNAME="$1"
- CONFFILE="$2"
- if [ -e "$CONFFILE" ]; then
- md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
- old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
- if [ "$md5sum" = "$old_md5sum" ]; then
- rm -f "$CONFFILE"
- test -d /etc/python-policyd-spf/ && rmdir /etc/python-policyd-spf/
- else
- if [ -e "$CONFFILE" ]; then
- if [ -n "/etc/postfix-policyd-spf-python/" ]; then
- mkdir "/etc/postfix-policyd-spf-python/"
- fi
- mv -f "$CONFFILE" "/etc/postfix-policyd-spf-python/policyd-spf.conf"
- test -d /etc/python-policyd-spf/ && rmdir /etc/python-policyd-spf/
- fi
- fi
- fi
-}
-case "$1" in
-install|upgrade)
- if dpkg --compare-versions "$2" le "0.5.2-3"; then
- prep_mv_conffile postfix-policyd-spf-python "/etc/python-policyd-spf/policyd-spf.conf"
- fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-esac
Deleted: packages/pypolicyd-spf/trunk/debian/pycompat
===================================================================
--- packages/pypolicyd-spf/trunk/debian/pycompat 2010-06-25 16:50:19 UTC (rev 5683)
+++ packages/pypolicyd-spf/trunk/debian/pycompat 2010-06-25 19:40:41 UTC (rev 5684)
@@ -1 +0,0 @@
-2
Modified: packages/pypolicyd-spf/trunk/debian/rules
===================================================================
--- packages/pypolicyd-spf/trunk/debian/rules 2010-06-25 16:50:19 UTC (rev 5683)
+++ packages/pypolicyd-spf/trunk/debian/rules 2010-06-25 19:40:41 UTC (rev 5684)
@@ -1,14 +1,10 @@
#!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-DEB_PYTHON_SYSTEM=pycentral
+%:
+ dh $@ --with quilt, --with python2
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-install/postfix-policyd-spf-python::
+override_dh_install:
# Install logcheck filter
- dh_install debian/logcheck etc/logcheck/ignore.d.server
- mv $(CURDIR)/debian/postfix-policyd-spf-python/etc/logcheck/ignore.d.server/logcheck \
- $(CURDIR)/debian/postfix-policyd-spf-python/etc/logcheck/ignore.d.server/postfix-policyd-spf-python
+ dh_install debian/logcheck etc/logcheck/ignore.d.server/postfix-policyd-spf-python
+ dh_install
+
More information about the Python-apps-commits
mailing list