[Python-apps-commits] r2810 - in packages/harvestman/trunk/debian (10 files)
akumar at users.alioth.debian.org
akumar at users.alioth.debian.org
Wed Apr 29 23:00:57 UTC 2009
Date: Wednesday, April 29, 2009 @ 23:00:56
Author: akumar
Revision: 2810
* debian/patches/:
+ Patches 05_no_more_gopher.dpatch
and 06_hashlib_not_md5.dpatch from Scott
Kitterman for Python 2.6 support.
(Closes: #524372)
* debian/copyright:
+ Update homepage, e-mail address.
+ Refer to versioned GPL.
* debian/control:
+ Standards version is now 3.8.1 (no changes needed).
Added:
packages/harvestman/trunk/debian/patches/05_no_more_gopher.dpatch
packages/harvestman/trunk/debian/patches/06_hashlib_not_md5.dpatch
Modified:
packages/harvestman/trunk/debian/changelog
packages/harvestman/trunk/debian/control
packages/harvestman/trunk/debian/copyright
packages/harvestman/trunk/debian/patches/00list
packages/harvestman/trunk/debian/patches/01_setup_fix.dpatch
packages/harvestman/trunk/debian/patches/02_fix_feedparser_indentation.dpatch
packages/harvestman/trunk/debian/patches/03_fix_encoding_declaration.dpatch
packages/harvestman/trunk/debian/rules
Modified: packages/harvestman/trunk/debian/changelog
===================================================================
--- packages/harvestman/trunk/debian/changelog 2009-04-28 17:37:51 UTC (rev 2809)
+++ packages/harvestman/trunk/debian/changelog 2009-04-29 23:00:56 UTC (rev 2810)
@@ -1,3 +1,18 @@
+harvestman (1.4.6-10) UNRELEASED; urgency=low
+
+ * debian/patches/:
+ + Patches 05_no_more_gopher.dpatch
+ and 06_hashlib_not_md5.dpatch from Scott
+ Kitterman for Python 2.6 support.
+ (Closes: #524372)
+ * debian/copyright:
+ + Update homepage, e-mail address.
+ + Refer to versioned GPL.
+ * debian/control:
+ + Standards version is now 3.8.1 (no changes needed).
+
+ -- Kumar Appaiah <akumar at debian.org> Wed, 11 Feb 2009 07:12:52 -0600
+
harvestman (1.4.6-9) unstable; urgency=medium
[ Sandro Tosi ]
Modified: packages/harvestman/trunk/debian/control
===================================================================
--- packages/harvestman/trunk/debian/control 2009-04-28 17:37:51 UTC (rev 2809)
+++ packages/harvestman/trunk/debian/control 2009-04-29 23:00:56 UTC (rev 2810)
@@ -5,7 +5,7 @@
Uploaders: Kumar Appaiah <akumar at debian.org>, Anand Pillai <abpillai at gmail.com>
Build-Depends-Indep: python-dev (>= 2.3.5-11), python-central (>= 0.6)
Build-Depends: debhelper (>= 5.0.37.3), dpatch
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
XS-Python-Version: current
Vcs-Svn: svn://svn.debian.org/python-apps/packages/harvestman/trunk
Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/harvestman/trunk/
Modified: packages/harvestman/trunk/debian/copyright
===================================================================
--- packages/harvestman/trunk/debian/copyright 2009-04-28 17:37:51 UTC (rev 2809)
+++ packages/harvestman/trunk/debian/copyright 2009-04-29 23:00:56 UTC (rev 2810)
@@ -1,10 +1,10 @@
This is the Debian GNU/Linux prepackaged version of HarvestMan, a web
crawler application written in Python.
-This package was debianized by Kumar Appaiah <akumar at ee.iitm.ac.in>,
+This package was debianized by Kumar Appaiah <a.kumar at alumni.iitm.ac.in>,
from sources, which I obtained from:
- http://harvestman.freezope.org
+ http://www.harvestmanontheweb.com
Upstream Author:
@@ -31,8 +31,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'
-and `/usr/share/common-licenses/LGPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
These files have different copyright notices:
Modified: packages/harvestman/trunk/debian/patches/00list
===================================================================
--- packages/harvestman/trunk/debian/patches/00list 2009-04-28 17:37:51 UTC (rev 2809)
+++ packages/harvestman/trunk/debian/patches/00list 2009-04-29 23:00:56 UTC (rev 2810)
@@ -1,4 +1,6 @@
-01_setup_fix
-02_fix_feedparser_indentation
-03_fix_encoding_declaration
-04_fix_connector_vercheck
+01_setup_fix.dpatch
+02_fix_feedparser_indentation.dpatch
+03_fix_encoding_declaration.dpatch
+04_fix_connector_vercheck.dpatch
+05_no_more_gopher.dpatch
+06_hashlib_not_md5.dpatch
Modified: packages/harvestman/trunk/debian/patches/01_setup_fix.dpatch
===================================================================
--- packages/harvestman/trunk/debian/patches/01_setup_fix.dpatch 2009-04-28 17:37:51 UTC (rev 2809)
+++ packages/harvestman/trunk/debian/patches/01_setup_fix.dpatch 2009-04-29 23:00:56 UTC (rev 2810)
@@ -2,7 +2,7 @@
## 01_setup_fix.dpatch by <akumar at ee.iitm.ac.in>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Fix the documentation installation directory for Debian packaging.
@DPATCH@
diff -urNad harvestman-1.4.6~/setup.py harvestman-1.4.6/setup.py
Modified: packages/harvestman/trunk/debian/patches/02_fix_feedparser_indentation.dpatch
===================================================================
--- packages/harvestman/trunk/debian/patches/02_fix_feedparser_indentation.dpatch 2009-04-28 17:37:51 UTC (rev 2809)
+++ packages/harvestman/trunk/debian/patches/02_fix_feedparser_indentation.dpatch 2009-04-29 23:00:56 UTC (rev 2810)
@@ -2,7 +2,7 @@
## 02_fix_feedparser_indentation.dpatch by <akumar at ee.iitm.ac.in>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Fix incorrect indentation.
@DPATCH@
diff -urNad harvestman-1.4.6~/HarvestMan/feedparser.py harvestman-1.4.6/HarvestMan/feedparser.py
Modified: packages/harvestman/trunk/debian/patches/03_fix_encoding_declaration.dpatch
===================================================================
--- packages/harvestman/trunk/debian/patches/03_fix_encoding_declaration.dpatch 2009-04-28 17:37:51 UTC (rev 2809)
+++ packages/harvestman/trunk/debian/patches/03_fix_encoding_declaration.dpatch 2009-04-29 23:00:56 UTC (rev 2810)
@@ -2,7 +2,7 @@
## 03_fix_encoding_declaration.dpatch by <akumar at ee.iitm.ac.in>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Fix encoding specifiers.
@DPATCH@
diff -urNad harvestman-1.4.6~/HarvestMan/connector.py harvestman-1.4.6/HarvestMan/connector.py
Added: packages/harvestman/trunk/debian/patches/05_no_more_gopher.dpatch
===================================================================
--- packages/harvestman/trunk/debian/patches/05_no_more_gopher.dpatch (rev 0)
+++ packages/harvestman/trunk/debian/patches/05_no_more_gopher.dpatch 2009-04-29 23:00:56 UTC (rev 2810)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_no_more_gopher.dpatch by <akumar at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from Scott Kitterman to disable Gopher for Python 2.6.
+
+ at DPATCH@
+diff -urNad harvestman-1.4.6~/HarvestMan/connector.py harvestman-1.4.6/HarvestMan/connector.py
+--- harvestman-1.4.6~/HarvestMan/connector.py 2009-04-29 17:46:24.000000000 -0500
++++ harvestman-1.4.6/HarvestMan/connector.py 2009-04-29 17:47:20.000000000 -0500
+@@ -420,7 +420,6 @@
+ urllib2.HTTPHandler,
+ urllib2.HTTPDefaultErrorHandler,
+ urllib2.CacheFTPHandler,
+- urllib2.GopherHandler,
+ urllib2.HTTPSHandler,
+ urllib2.FileHandler,
+ cookiehandler)
+@@ -431,7 +430,6 @@
+ urllib2.HTTPHandler,
+ urllib2.HTTPDefaultErrorHandler,
+ urllib2.CacheFTPHandler,
+- urllib2.GopherHandler,
+ urllib2.FileHandler,
+ cookiehandler)
+
+@@ -443,7 +441,6 @@
+ urllib2.HTTPHandler,
+ urllib2.CacheFTPHandler,
+ urllib2.HTTPSHandler,
+- urllib2.GopherHandler,
+ urllib2.FileHandler,
+ urllib2.HTTPDefaultErrorHandler,
+ cookiehandler)
+@@ -452,7 +449,6 @@
+ MyRedirectHandler,
+ urllib2.HTTPHandler,
+ urllib2.CacheFTPHandler,
+- urllib2.GopherHandler,
+ urllib2.FileHandler,
+ urllib2.HTTPDefaultErrorHandler,
+ cookiehandler)
Added: packages/harvestman/trunk/debian/patches/06_hashlib_not_md5.dpatch
===================================================================
--- packages/harvestman/trunk/debian/patches/06_hashlib_not_md5.dpatch (rev 0)
+++ packages/harvestman/trunk/debian/patches/06_hashlib_not_md5.dpatch 2009-04-29 23:00:56 UTC (rev 2810)
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_hashlib_not_md5.dpatch by <akumar at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from Scott Kitterman to use hashlib for Python 2.6, instead of md5.
+
+ at DPATCH@
+diff -urNad harvestman-1.4.6~/HarvestMan/connector.py harvestman-1.4.6/HarvestMan/connector.py
+--- harvestman-1.4.6~/HarvestMan/connector.py 2005-08-19 03:19:04.000000000 -0500
++++ harvestman-1.4.6/HarvestMan/connector.py 2009-04-29 17:52:50.000000000 -0500
+@@ -60,7 +60,7 @@
+ """
+
+ import sys
+-import md5
++import hashlib
+ import socket
+ import time
+ import threading as tg
+@@ -965,12 +965,12 @@
+ def verify_checksum(self, filename):
+ """ Verify data written to file using md5 checksum """
+
+- m1=md5.new()
++ m1=hashlib.md5()
+ m1.update(self.__data)
+ mdigest1=m1.digest()
+ mdigest2=''
+
+- m2=md5.new()
++ m2=hashlib.md5()
+ try:
+ m2.update(open(filename, 'rb').read())
+ except:
+diff -urNad harvestman-1.4.6~/HarvestMan/datamgr.py harvestman-1.4.6/HarvestMan/datamgr.py
+--- harvestman-1.4.6~/HarvestMan/datamgr.py 2005-08-19 03:17:53.000000000 -0500
++++ harvestman-1.4.6/HarvestMan/datamgr.py 2009-04-29 17:53:28.000000000 -0500
+@@ -150,9 +150,9 @@
+ return (False, False)
+
+ # Look up the dictionary containing the url cache info
+- import md5
++ import hashlib
+
+- m1=md5.new()
++ m1=hashlib.md5()
+ digest1=m1.digest()
+
+ # Assume that cache is not uptodate apriori
Property changes on: packages/harvestman/trunk/debian/patches/06_hashlib_not_md5.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: packages/harvestman/trunk/debian/rules
===================================================================
--- packages/harvestman/trunk/debian/rules 2009-04-28 17:37:51 UTC (rev 2809)
+++ packages/harvestman/trunk/debian/rules 2009-04-29 23:00:56 UTC (rev 2810)
@@ -34,11 +34,11 @@
binary-indep: build install
dh_testdir -i
dh_testroot -i
+ dh_pycentral -i
dh_installdocs
dh_installman -i
dh_installexamples -pharvestman ./HarvestMan/config.xml
dh_installchangelogs -pharvestman ./doc/Changelog.txt
- dh_pycentral -i
dh_compress -i -X.py
dh_fixperms -i
chmod 755 ./debian/harvestman/`pycentral pycentraldir harvestman`/HarvestMan/harvestman.py
More information about the Python-apps-commits
mailing list