[Python-modules-commits] r29741 - in packages/pyclamd/trunk/debian (6 files)

[kitterman at users.alioth.debian.org]

    Date: Sunday, July 13, 2014 @ 21:04:24
  Author: kitterman
Revision: 29741

* New upstream release
  - Drop debian/patches/build_no_clamd.patch, fixed upstream
* Add debian/patches/examples-print-fix.patch to fix python3 compatibility
  in examples
* Added doc-base registration files

Added:
  packages/pyclamd/trunk/debian/patches/examples-print-fix.patch
  packages/pyclamd/trunk/debian/python-pyclamd.doc-base
  packages/pyclamd/trunk/debian/python3-pyclamd.doc-base
Modified:
  packages/pyclamd/trunk/debian/changelog
  packages/pyclamd/trunk/debian/patches/series
Deleted:
  packages/pyclamd/trunk/debian/patches/build_no_clamd.patch

Modified: packages/pyclamd/trunk/debian/changelog
===================================================================
--- packages/pyclamd/trunk/debian/changelog	2014-07-13 17:20:52 UTC (rev 29740)
+++ packages/pyclamd/trunk/debian/changelog	2014-07-13 21:04:24 UTC (rev 29741)
@@ -1,3 +1,13 @@
+pyclamd (0.3.9-1) unstable; urgency=medium
+
+  * New upstream release
+    - Drop debian/patches/build_no_clamd.patch, fixed upstream
+  * Add debian/patches/examples-print-fix.patch to fix python3 compatibility
+    in examples
+  * Added doc-base registration files
+
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 13 Jul 2014 16:27:09 -0400
+
 pyclamd (0.3.8-1) unstable; urgency=medium
 
   [ Jakub Wilk ]

Deleted: packages/pyclamd/trunk/debian/patches/build_no_clamd.patch
===================================================================
--- packages/pyclamd/trunk/debian/patches/build_no_clamd.patch	2014-07-13 17:20:52 UTC (rev 29740)
+++ packages/pyclamd/trunk/debian/patches/build_no_clamd.patch	2014-07-13 21:04:24 UTC (rev 29741)
@@ -1,30 +0,0 @@
-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/examples-print-fix.patch
===================================================================
--- packages/pyclamd/trunk/debian/patches/examples-print-fix.patch	                        (rev 0)
+++ packages/pyclamd/trunk/debian/patches/examples-print-fix.patch	2014-07-13 21:04:24 UTC (rev 29741)
@@ -0,0 +1,37 @@
+Description: Fix print statements in example.py to work with python3
+Author: Scott Kitterman <scott at kitterman.com>
+Origin: vendor
+Forwarded: yes
+Last-Update: 2017-07-13
+
+--- pyclamd-0.3.9.orig/example.py
++++ pyclamd-0.3.9/example.py
+@@ -11,13 +11,13 @@ cd.ping()
+ 
+ 
+ # print version
+-print "Version : \n{0}\n".format(cd.version())
++print("Version : \n{0}\n".format(cd.version()))
+ 
+ # force a db reload
+ cd.reload()
+ 
+ # print stats
+-print "\n{0}\n".format(cd.stats())
++print("\n{0}\n".format(cd.stats()))
+ 
+ # write test file with EICAR test string
+ open('/tmp/EICAR','w').write(cd.EICAR())
+@@ -26,9 +26,9 @@ open('/tmp/EICAR','w').write(cd.EICAR())
+ open('/tmp/NO_EICAR','w').write('no virus in this file')
+ 
+ # scan files
+-print "\n{0}\n".format(cd.scan_file('/tmp/EICAR'))
+-print "\n{0}\n".format(cd.scan_file('/tmp/NO_EICAR'))
++print("\n{0}\n".format(cd.scan_file('/tmp/EICAR')))
++print("\n{0}\n".format(cd.scan_file('/tmp/NO_EICAR')))
+ 
+ # scan a stream
+-print "\n{0}\n".format(cd.scan_stream(cd.EICAR()))
++print("\n{0}\n".format(cd.scan_stream(cd.EICAR())))
+ 

Modified: packages/pyclamd/trunk/debian/patches/series
===================================================================
--- packages/pyclamd/trunk/debian/patches/series	2014-07-13 17:20:52 UTC (rev 29740)
+++ packages/pyclamd/trunk/debian/patches/series	2014-07-13 21:04:24 UTC (rev 29741)
@@ -1 +1 @@
-build_no_clamd.patch
+examples-print-fix.patch

Added: packages/pyclamd/trunk/debian/python-pyclamd.doc-base
===================================================================
--- packages/pyclamd/trunk/debian/python-pyclamd.doc-base	                        (rev 0)
+++ packages/pyclamd/trunk/debian/python-pyclamd.doc-base	2014-07-13 21:04:24 UTC (rev 29741)
@@ -0,0 +1,10 @@
+Document: python-pyclamd
+Title: Python interface to the ClamAV daemon
+Author: Alexandre Norman
+Abstract: Pyclamd exposes the clamd API to Python programs
+ This documentation contains the pydoc reference fo the pyclamd module
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-pyclamd/pyclamd.html
+Files: /usr/share/doc/python-pyclamd/pyclamd.html

Added: packages/pyclamd/trunk/debian/python3-pyclamd.doc-base
===================================================================
--- packages/pyclamd/trunk/debian/python3-pyclamd.doc-base	                        (rev 0)
+++ packages/pyclamd/trunk/debian/python3-pyclamd.doc-base	2014-07-13 21:04:24 UTC (rev 29741)
@@ -0,0 +1,10 @@
+Document: python3-pyclamd
+Title: Python 3 interface to the ClamAV daemon
+Author: Alexandre Norman
+Abstract: Pyclamd exposes the clamd API to Python 3 programs
+ This documentation contains the pydoc reference fo the pyclamd module
+Section: Programming/Python3
+
+Format: HTML
+Index: /usr/share/doc/python3-pyclamd/pyclamd.html
+Files: /usr/share/doc/python3-pyclamd/pyclamd.html