[Python-modules-commits] r29663 - in packages/pyclamd/trunk/debian (13 files)
kitterman at users.alioth.debian.org
kitterman at users.alioth.debian.org
Mon Jul 7 00:40:29 UTC 2014
Date: Monday, July 7, 2014 @ 00:40:28
Author: kitterman
Revision: 29663
* New upstream release
* Add debian/patches/build_no_clamd.patch to fix python3 exception syntax
error and make it possible to build without clamd installed
* Move clamav-daemon from Depends to Recommends (Closes: #645872)
* Update debian/copyright
* Drop obsolete get-orig-source rule and add debian/watch
* Convert from CDBS/pysupport to dh/dh-python/pybuild
* Add new python3-pyclamd binary and appropriate build-depends
* Add .install and .docs files so new files are appropriately installed
* Bump standards version to 3.9.5 without further change
* Bump compat and debhelper version to 9
* Add myself to uploaders
Added:
packages/pyclamd/trunk/debian/patches/
packages/pyclamd/trunk/debian/patches/build_no_clamd.patch
packages/pyclamd/trunk/debian/patches/series
packages/pyclamd/trunk/debian/python-pyclamd.docs
packages/pyclamd/trunk/debian/python-pyclamd.install
packages/pyclamd/trunk/debian/python3-pyclamd.docs
packages/pyclamd/trunk/debian/python3-pyclamd.install
packages/pyclamd/trunk/debian/watch
Modified:
packages/pyclamd/trunk/debian/changelog
packages/pyclamd/trunk/debian/compat
packages/pyclamd/trunk/debian/control
packages/pyclamd/trunk/debian/copyright
packages/pyclamd/trunk/debian/rules
Modified: packages/pyclamd/trunk/debian/changelog
===================================================================
--- packages/pyclamd/trunk/debian/changelog 2014-07-07 00:16:25 UTC (rev 29662)
+++ packages/pyclamd/trunk/debian/changelog 2014-07-07 00:40:28 UTC (rev 29663)
@@ -1,9 +1,24 @@
-pyclamd (0.2.2-2) UNRELEASED; urgency=low
+pyclamd (0.3.8-1) unstable; urgency=medium
+ [ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Jakub Wilk <jwilk at debian.org> Sun, 05 May 2013 16:01:38 +0200
+ [ Scott Kitterman ]
+ * New upstream release
+ * Add debian/patches/build_no_clamd.patch to fix python3 exception syntax
+ error and make it possible to build without clamd installed
+ * Move clamav-daemon from Depends to Recommends (Closes: #645872)
+ * Update debian/copyright
+ * Drop obsolete get-orig-source rule and add debian/watch
+ * Convert from CDBS/pysupport to dh/dh-python/pybuild
+ * Add new python3-pyclamd binary and appropriate build-depends
+ * Add .install and .docs files so new files are appropriately installed
+ * Bump standards version to 3.9.5 without further change
+ * Bump compat and debhelper version to 9
+ * Add myself to uploaders
+ -- Scott Kitterman <scott at kitterman.com> Sun, 06 Jul 2014 18:24:41 -0400
+
pyclamd (0.2.2-1) unstable; urgency=low
* New upstream release:
Modified: packages/pyclamd/trunk/debian/compat
===================================================================
--- packages/pyclamd/trunk/debian/compat 2014-07-07 00:16:25 UTC (rev 29662)
+++ packages/pyclamd/trunk/debian/compat 2014-07-07 00:40:28 UTC (rev 29663)
@@ -1 +1 @@
-5
+9
Modified: packages/pyclamd/trunk/debian/control
===================================================================
--- packages/pyclamd/trunk/debian/control 2014-07-07 00:16:25 UTC (rev 29662)
+++ packages/pyclamd/trunk/debian/control 2014-07-07 00:40:28 UTC (rev 29663)
@@ -2,17 +2,27 @@
Section: python
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Siegfried-Angel Gevatter Pujals <rainct at ubuntu.com>
+Uploaders: Siegfried-Angel Gevatter Pujals <rainct at ubuntu.com>,
+ Scott Kitterman <scott at kitterman.com>
Homepage: http://xael.org/norman/python/pyclamd/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pyclamd/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pyclamd/trunk/
-Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: python-support (>= 0.5.3)
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 9), python-all, python3-all, dh-python
+Standards-Version: 3.9.5
Package: python-pyclamd
Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, clamav-daemon
+Depends: ${misc:Depends}, ${python:Depends}
+Recommends: clamav-daemon
Description: Python interface to the ClamAV daemon
This package adds virus detection capabilities to Python software in
an efficient and easy way, thanks to the ClamAV antivirus toolkit.
+
+Package: python3-pyclamd
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Recommends: clamav-daemon
+Description: Python 3 interface to the ClamAV daemon
+ This package adds virus detection capabilities to Python 3 software in
+ an efficient and easy way, thanks to the ClamAV antivirus toolkit.
+
Modified: packages/pyclamd/trunk/debian/copyright
===================================================================
--- packages/pyclamd/trunk/debian/copyright 2014-07-07 00:16:25 UTC (rev 29662)
+++ packages/pyclamd/trunk/debian/copyright 2014-07-07 00:40:28 UTC (rev 29663)
@@ -1,13 +1,18 @@
This package was debianized by Siegfried-Angel Gevatter Pujals (RainCT)
<rainct at ubuntu.com> on Fri, 15 Feb 2008 21:58:24 +0100.
-The tarball was automatically generated by an get-orig-source rule that
-downloads the necessary files from http://xael.org/norman/python/pyclamd/.
-
Upstream Author:
Alexandre Norman <norman at xael.org>
+Contributors :
+ - PL : Philippe Lagadec - philippe.lagadec()laposte.net
+ - TK : Thomas Kastner - tk()underground8.com
+ - TT : Theodoropoulos Theodoros (TeD TeD) - sbujam()gmail.com
+ - TKL : Thomas Kluyver - thomas () kluyver.me.uk
+ - JB : Joe Brandt - brandt.joe () gmail.com
+ - JS : Joni Salonen - joni.salonen () qindel.com
+
Copyright:
Copyright © 2006-2010 Alexandre Norman <norman at xael.org>
@@ -25,7 +30,7 @@
details.
On Debian systems, the complete text of the GNU Lesser General Public
- License can be found in /usr/share/common-licenses/.
+ License version 3 can be found in /usr/share/common-licenses/LGPL-3.
The Debian packaging is © 2008-2010, Siegfried-A. Gevatter Pujals
<rainct at ubuntu.com> and is provided under the same license as the pyclamd.
Added: packages/pyclamd/trunk/debian/patches/build_no_clamd.patch
===================================================================
--- packages/pyclamd/trunk/debian/patches/build_no_clamd.patch (rev 0)
+++ packages/pyclamd/trunk/debian/patches/build_no_clamd.patch 2014-07-07 00:40:28 UTC (rev 29663)
@@ -0,0 +1,30 @@
+Description: Make building possible without clamd
+Author: Scott Kitterman <scott at kitterman.com>
+Forwarded: yes
+Last-Update: 2014-07-06
+
+--- pyclamd-0.3.8.orig/pyclamd.py
++++ pyclamd-0.3.8/pyclamd.py
+@@ -699,7 +699,7 @@ def ClamdAgnostic():
+ try:
+ cd = ClamdNetworkSocket()
+ except ConnectionError:
+- raise ValueError, "could not connect to clamd server either by unix or network socket"
++ raise ValueError("could not connect to clamd server either by unix or network socket")
+ return cd
+
+ ############################################################################
+--- pyclamd-0.3.8.orig/setup.py
++++ pyclamd-0.3.8/setup.py
+@@ -7,7 +7,10 @@ pyclamd = Extension('pyclamd',
+ # Install : python setup.py install
+ # Register : python setup.py register
+
+-import pyclamd
++try:
++ import pyclamd
++except ValueError as x:
++ pass # all we want is the version
+
+ setup (name = 'pyClamd',
+ version = pyclamd.__version__,
Added: packages/pyclamd/trunk/debian/patches/series
===================================================================
--- packages/pyclamd/trunk/debian/patches/series (rev 0)
+++ packages/pyclamd/trunk/debian/patches/series 2014-07-07 00:40:28 UTC (rev 29663)
@@ -0,0 +1 @@
+build_no_clamd.patch
Added: packages/pyclamd/trunk/debian/python-pyclamd.docs
===================================================================
--- packages/pyclamd/trunk/debian/python-pyclamd.docs (rev 0)
+++ packages/pyclamd/trunk/debian/python-pyclamd.docs 2014-07-07 00:40:28 UTC (rev 29663)
@@ -0,0 +1,2 @@
+example.py
+pyclamd.html
Added: packages/pyclamd/trunk/debian/python-pyclamd.install
===================================================================
--- packages/pyclamd/trunk/debian/python-pyclamd.install (rev 0)
+++ packages/pyclamd/trunk/debian/python-pyclamd.install 2014-07-07 00:40:28 UTC (rev 29663)
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/python2.*/dist-packages/pyclamd/pyclamd.py
+debian/tmp/usr/lib/python2.*/dist-packages/pyclamd/__init__.py
+debian/tmp/usr/lib/python2.*/dist-packages/pyClamd*
Added: packages/pyclamd/trunk/debian/python3-pyclamd.docs
===================================================================
--- packages/pyclamd/trunk/debian/python3-pyclamd.docs (rev 0)
+++ packages/pyclamd/trunk/debian/python3-pyclamd.docs 2014-07-07 00:40:28 UTC (rev 29663)
@@ -0,0 +1,2 @@
+example.py
+pyclamd.html
Added: packages/pyclamd/trunk/debian/python3-pyclamd.install
===================================================================
--- packages/pyclamd/trunk/debian/python3-pyclamd.install (rev 0)
+++ packages/pyclamd/trunk/debian/python3-pyclamd.install 2014-07-07 00:40:28 UTC (rev 29663)
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/python3.*/dist-packages/pyclamd/pyclamd.py
+debian/tmp/usr/lib/python3.*/dist-packages/pyclamd/__init__.py
+debian/tmp/usr/lib/python3.*/dist-packages/pyClamd*
Modified: packages/pyclamd/trunk/debian/rules
===================================================================
--- packages/pyclamd/trunk/debian/rules 2014-07-07 00:16:25 UTC (rev 29662)
+++ packages/pyclamd/trunk/debian/rules 2014-07-07 00:40:28 UTC (rev 29663)
@@ -1,41 +1,8 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM=pysupport
+%:
+ dh $@ --with python2,python3 --buildsystem=pybuild
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-# Variables for the get-orig-source rule
-VERSION=$(shell dpkg-parsechangelog | sed -n -e'/^ / { s/.*(\(.*\)).*/\1/; s/-[^-]*$$//; p; q }')
-BTMPDIR=/tmp/pyclamd-pkg-source
-STMPDIR=$(BTMPDIR)/pyclamd-$(VERSION)
-
-install/python-pyclamd::
- dh_install pyclamd.py /usr/share/python-support/python-pyclamd/
- #dh_installchangelogs CHANGELOG
-
-binary-install/python-pyclamd::
- dh_pysupport -ppython-pyclamd
-
-clean::
- rm -f pyclamd.pyc
- rm -rf $(BTMPDIR)
-
-get-orig-source:
- rm -rf $(BTMPDIR); mkdir -p $(STMPDIR)
- wget --quiet -O $(BTMPDIR)/pyclamd.py http://xael.org/norman/python/pyclamd/pyclamd.py
- unexpand --first-only --tabs=4 $(BTMPDIR)/pyclamd.py > $(STMPDIR)/pyclamd.py
- sed -i "s/#!\/usr\/bin\/env python//g" $(STMPDIR)/pyclamd.py
- sed -i "s/\/var\/run\/clamd/\/var\/run\/clamav\/clamd.ctl/g" $(STMPDIR)/pyclamd.py
- #wget --quiet -O $(BTMPDIR)/CHANGELOG http://xael.org/norman/python/pyclamd/CHANGELOG
- #grep -A99999 "CHANGELOG" $(BTMPDIR)/CHANGELOG > $(STMPDIR)/CHANGELOG
- if grep -qs 'GNU Lesser General Public License' $(STMPDIR)/pyclamd.py; then \
- cp /usr/share/common-licenses/LGPL-3 $(STMPDIR)/COPYING.LGPL; \
- cp /usr/share/common-licenses/GPL-3 $(STMPDIR)/COPYING; \
- else \
- echo "Possible licence change detected, aborting...";\
- rm -rf $(BTMPDIR);\
- exit 1;\
- fi
- cd $(BTMPDIR); tar -czvf $(CURDIR)/../pyclamd_$(VERSION).orig.tar.gz pyclamd-$(VERSION)
- rm -r $(BTMPDIR)
- # Tarball generated successfully.
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf __pycache__
Added: packages/pyclamd/trunk/debian/watch
===================================================================
--- packages/pyclamd/trunk/debian/watch (rev 0)
+++ packages/pyclamd/trunk/debian/watch 2014-07-07 00:40:28 UTC (rev 29663)
@@ -0,0 +1,4 @@
+version=3
+http://xael.org/norman/python/pyclamd/pyClamd-(.*)\.tar\.gz \
+debian uupdate
+
More information about the Python-modules-commits
mailing list