[Python-apps-commits] r1967 - in packages/harvestman/branches/experimental/debian (5 files)

akumar at users.alioth.debian.org akumar at users.alioth.debian.org
Wed Nov 12 03:57:13 UTC 2008 

    Date: Wednesday, November 12, 2008 @ 03:57:13
  Author: akumar
Revision: 1967

  + write a get-orig-source and remove feedparser.py automatically.
  + Fix watch file.

Added:
  packages/harvestman/branches/experimental/debian/patches/01_fix_etcdir.dpatch
  packages/harvestman/branches/experimental/debian/patches/02_fix_pkg_info.dpatch
Modified:
  packages/harvestman/branches/experimental/debian/changelog
Deleted:
  packages/harvestman/branches/experimental/debian/patches/01_setup_fix.dpatch
  packages/harvestman/branches/experimental/debian/patches/02_fix_import_warning.dpatch

Modified: packages/harvestman/branches/experimental/debian/changelog
===================================================================
--- packages/harvestman/branches/experimental/debian/changelog	2008-11-12 03:56:10 UTC (rev 1966)
+++ packages/harvestman/branches/experimental/debian/changelog	2008-11-12 03:57:13 UTC (rev 1967)
@@ -9,7 +9,9 @@
   * debian/rules: Minor fixes (to be listed).
   * debian/bin/harvestman: Update to work with new module name.
   * TODO: test the package, and other fixes!
-  
+    + write a get-orig-source and remove feedparser.py automatically.
+    + Fix watch file.
+
  -- Kumar Appaiah <akumar at debian.org>  Tue, 11 Nov 2008 21:07:52 -0600
 
 harvestman (2.0~alpha20022008-2) experimental; urgency=low

Added: packages/harvestman/branches/experimental/debian/patches/01_fix_etcdir.dpatch
===================================================================
--- packages/harvestman/branches/experimental/debian/patches/01_fix_etcdir.dpatch	                        (rev 0)
+++ packages/harvestman/branches/experimental/debian/patches/01_fix_etcdir.dpatch	2008-11-12 03:57:13 UTC (rev 1967)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_etcdir.dpatch by  <akumar at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Hardcode the etc directory for Debian package generation.
+
+ at DPATCH@
+diff -urNad harvestman-2.0.4~beta~/setup.py harvestman-2.0.4~beta/setup.py
+--- harvestman-2.0.4~beta~/setup.py	2008-11-11 21:25:16.000000000 -0600
++++ harvestman-2.0.4~beta/setup.py	2008-11-11 21:25:39.000000000 -0600
+@@ -74,7 +74,7 @@
+ from harvestman.lib.config import HarvestManStateObject
+ cfg = HarvestManStateObject()
+ 
+-etcdir = cfg.etcdir
++etcdir = "debian/harvestman/etc/harvestman"
+ print 'Creating basic configuration in %s...' % etcdir
+ 
+ # If using sgmlop parser set htmlparser option to 1...


Property changes on: packages/harvestman/branches/experimental/debian/patches/01_fix_etcdir.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: packages/harvestman/branches/experimental/debian/patches/01_setup_fix.dpatch
===================================================================
--- packages/harvestman/branches/experimental/debian/patches/01_setup_fix.dpatch	2008-11-12 03:56:10 UTC (rev 1966)
+++ packages/harvestman/branches/experimental/debian/patches/01_setup_fix.dpatch	2008-11-12 03:57:13 UTC (rev 1967)
@@ -1,64 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 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.
-
- at DPATCH@
-diff -urNad harvestman-2.0alpha~/setup.py harvestman-2.0alpha/setup.py
---- harvestman-2.0alpha~/setup.py	2008-02-07 22:13:13.000000000 +0530
-+++ harvestman-2.0alpha/setup.py	2008-02-07 22:15:06.000000000 +0530
-@@ -11,7 +11,7 @@
- BUILD_SGMLOP=False
- 
- if os.name == 'posix':
--    BUILD_SGMLOP = True
-+    BUILD_SGMLOP = False
-     
- pyparsing_surl = 'http://cheeseshop.python.org/packages/source/p/pyparsing/pyparsing-1.4.8.tar.gz'
- 
-@@ -136,9 +136,15 @@
-     
-     sitedir = os.path.join(os.path.dirname(os.__file__), 'site-packages')
-     prefix = sys.prefix
--    exe_prefix = os.path.join(prefix, 'bin')
-+    exe_prefix = './debian/harvestman/' + os.path.join(prefix, 'bin')
-     
-     app_path = os.path.join(exe_prefix, app)
-+    if not os.path.isdir(exe_prefix):
-+        try:
-+            os.makedirs(exe_prefix)
-+        except OSError, e:
-+            print e
-+            return -1
-     try:
-         envp = os.path.join(exe_prefix, 'env')
-         modpath = os.path.join(sitedir, 'harvestman', 'apps', app + '.py')
-@@ -159,7 +165,7 @@
-     <body>
-     <p>This is a pargraph</p>
-     <img src="img.jpg"/>
--    <a href="http://www.python.org'>Python</a>
-+    <a href="http://www.python.org">Python</a>
-     </body>
-     </html>
-     """
-@@ -256,7 +262,7 @@
-         print 'Error: You need Python 2.4 or greater for HarvestMan'
-         sys.exit(1)
- 
--    use_sgmlop = False
-+    use_sgmlop = True
-     
-     if check_sgmlop()==-1:
-         if BUILD_SGMLOP:
-@@ -322,8 +328,7 @@
- 
-     from harvestman.lib.config import HarvestManStateObject
-     cfg = HarvestManStateObject()
--
--    etcdir = cfg.etcdir
-+    etcdir = os.environ['DESTDIR'] + '/' + cfg.etcdir
-     print 'Creating basic configuration in %s...' % etcdir
- 
-     # If using sgmlop parser set htmlparser option to 1...

Deleted: packages/harvestman/branches/experimental/debian/patches/02_fix_import_warning.dpatch
===================================================================
--- packages/harvestman/branches/experimental/debian/patches/02_fix_import_warning.dpatch	2008-11-12 03:56:10 UTC (rev 1966)
+++ packages/harvestman/branches/experimental/debian/patches/02_fix_import_warning.dpatch	2008-11-12 03:57:13 UTC (rev 1967)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_import_warning.dpatch by  <akumar at ee.iitm.ac.in>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad harvestman-2.0alpha~/harvestman/test/test_base.py harvestman-2.0alpha/harvestman/test/test_base.py
---- harvestman-2.0alpha~/harvestman/test/test_base.py	2008-02-07 17:01:16.000000000 +0530
-+++ harvestman-2.0alpha/harvestman/test/test_base.py	2008-02-07 22:18:48.000000000 +0530
-@@ -17,12 +17,12 @@
-     # Add modules in prev directory
-     sys.path.append(parentdir)
- 
-+from lib.common.common import *
- def setUp():
-     """ Set up """
- 
-     setUpPaths()
-     
--    from lib.common.common import *
-     from lib import config
-     from lib import logger
-     

Added: packages/harvestman/branches/experimental/debian/patches/02_fix_pkg_info.dpatch
===================================================================
--- packages/harvestman/branches/experimental/debian/patches/02_fix_pkg_info.dpatch	                        (rev 0)
+++ packages/harvestman/branches/experimental/debian/patches/02_fix_pkg_info.dpatch	2008-11-12 03:57:13 UTC (rev 1967)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_pkg_info.dpatch by  <akumar at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix version number for PKG-INFO.
+
+ at DPATCH@
+diff -urNad harvestman-2.0.4~beta~/HarvestMan.egg-info/PKG-INFO harvestman-2.0.4~beta/HarvestMan.egg-info/PKG-INFO
+--- harvestman-2.0.4~beta~/HarvestMan.egg-info/PKG-INFO	2008-11-11 21:46:31.000000000 -0600
++++ harvestman-2.0.4~beta/HarvestMan.egg-info/PKG-INFO	2008-11-11 21:46:34.000000000 -0600
+@@ -1,6 +1,6 @@
+ Metadata-Version: 1.0
+ Name: HarvestMan
+-Version: 2.0.4betadev-r168
++Version: 2.0.4betadev
+ Summary: HarvestMan is a web crawler application and framework.
+ Home-page: http://code.google.com/p/harvestman-crawler/
+ Author: Anand B Pillai
+diff -urNad harvestman-2.0.4~beta~/HarvestMan.egg-info/SOURCES.txt harvestman-2.0.4~beta/HarvestMan.egg-info/SOURCES.txt
+--- harvestman-2.0.4~beta~/HarvestMan.egg-info/SOURCES.txt	2008-11-11 21:46:20.000000000 -0600
++++ harvestman-2.0.4~beta/HarvestMan.egg-info/SOURCES.txt	2008-11-11 21:46:39.000000000 -0600
+@@ -103,7 +103,6 @@
+ harvestman/lib/common/bst_orig.py
+ harvestman/lib/common/common.py
+ harvestman/lib/common/dictcache.py
+-harvestman/lib/common/feedparser.py
+ harvestman/lib/common/keepalive.py
+ harvestman/lib/common/lrucache.py
+ harvestman/lib/common/macros.py


Property changes on: packages/harvestman/branches/experimental/debian/patches/02_fix_pkg_info.dpatch
___________________________________________________________________
Name: svn:executable
   + *

More information about the Python-apps-commits mailing list