[Python-modules-commits] r1797 - in /packages/python-docutils/trunk/debian: changelog control patches/14_distutils_setup.dpatch rules

pox-guest at users.alioth.debian.org pox-guest at users.alioth.debian.org
Sat Feb 10 01:56:11 CET 2007 

Author: pox-guest
Date: Sat Feb 10 01:56:11 2007
New Revision: 1797

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1797
Log:
Egg support added

Modified:
    packages/python-docutils/trunk/debian/changelog
    packages/python-docutils/trunk/debian/control
    packages/python-docutils/trunk/debian/patches/14_distutils_setup.dpatch
    packages/python-docutils/trunk/debian/rules

Modified: packages/python-docutils/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/changelog?rev=1797&op=diff
==============================================================================
--- packages/python-docutils/trunk/debian/changelog (original)
+++ packages/python-docutils/trunk/debian/changelog Sat Feb 10 01:56:11 2007
@@ -1,8 +1,12 @@
 python-docutils (0.4-4) UNRELEASED; urgency=low
 
+  * Egg support added (closes: #382272)
+    - Added python-setuptools to Build-Depends
+    - Updated 14_distutils_setup patch (version fixed as well)
   * Added XS-Vcs-Svn field
-
- -- Piotr Ozarowski <ozarow at gmail.com>  Thu, 23 Nov 2006 14:44:52 +0100
+  * Bumped required python-central version (dh_python call removed)
+
+ -- Piotr Ozarowski <ozarow at gmail.com>  Sat, 10 Feb 2007 01:07:40 +0100
 
 python-docutils (0.4-3) unstable; urgency=low
 

Modified: packages/python-docutils/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/control?rev=1797&op=diff
==============================================================================
--- packages/python-docutils/trunk/debian/control (original)
+++ packages/python-docutils/trunk/debian/control Sat Feb 10 01:56:11 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: martin f. krafft <madduck at debian.org>, Simon McVittie <smcv at ianadd.pseudorandom.co.uk>
-Build-Depends: debhelper (>= 5.0.37.1), dpatch, python-central (>= 0.4.17)
+Build-Depends: debhelper (>= 5.0.37.1), dpatch, python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1)
 Build-Depends-Indep: python-dev, python (>= 2.3)
 Standards-Version: 3.7.2.0
 XS-Python-Version: >= 2.3

Modified: packages/python-docutils/trunk/debian/patches/14_distutils_setup.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/patches/14_distutils_setup.dpatch?rev=1797&op=diff
==============================================================================
--- packages/python-docutils/trunk/debian/patches/14_distutils_setup.dpatch (original)
+++ packages/python-docutils/trunk/debian/patches/14_distutils_setup.dpatch Sat Feb 10 01:56:11 2007
@@ -5,9 +5,18 @@
 ## DP: Split roman.py setup into a separate script
 
 @DPATCH@
-diff -urNad docutils-0.4~/setup.py docutils-0.4/setup.py
---- docutils-0.4~/setup.py	2006-07-02 17:22:09.542140332 +0100
-+++ docutils-0.4/setup.py	2006-07-02 17:22:10.018137952 +0100
+diff -urNad python-docutils-0.4~/setup.py python-docutils-0.4/setup.py
+--- python-docutils-0.4~/setup.py	2007-02-10 01:41:18.000000000 +0100
++++ python-docutils-0.4/setup.py	2007-02-10 01:41:28.000000000 +0100
+@@ -6,7 +6,7 @@
+ import os
+ import glob
+ try:
+-    from distutils.core import setup
++    from setuptools import setup
+     from distutils.command.build_py import build_py
+ except ImportError:
+     print 'Error: The "distutils" standard module, which is required for the '
 @@ -23,9 +23,6 @@
  
  def do_setup():
@@ -18,7 +27,13 @@
      if sys.hexversion >= 0x02030000:    # Python 2.3
          kwargs['classifiers'] = classifiers
      else:
-@@ -53,7 +50,7 @@
+@@ -48,12 +45,12 @@
+ input Docutils supports reStructuredText, an easy-to-read,
+ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60
+     'url': 'http://docutils.sourceforge.net/',
+-    'version': '0.4.1',
++    'version': '0.4',
+     'author': 'David Goodger',
      'author_email': 'goodger at users.sourceforge.net',
      'license': 'public domain, Python, BSD, GPL (see COPYING.txt)',
      'platforms': 'OS-independent',
@@ -65,9 +80,9 @@
  class dual_build_py(build_py):
  
      """
-diff -urNad docutils-0.4~/setup_roman.py docutils-0.4/setup_roman.py
---- docutils-0.4~/setup_roman.py	2006-07-02 17:20:58.000000000 +0100
-+++ docutils-0.4/setup_roman.py	2006-07-02 17:22:10.018137952 +0100
+diff -urNad python-docutils-0.4~/setup_roman.py python-docutils-0.4/setup_roman.py
+--- python-docutils-0.4~/setup_roman.py	2007-02-10 01:41:14.000000000 +0100
++++ python-docutils-0.4/setup_roman.py	2007-02-10 01:41:19.000000000 +0100
 @@ -0,0 +1,21 @@
 +#!/usr/bin/python
 +# $Id: setup.py,v 1.9 2002/12/12 02:45:53 goodger Exp $

Modified: packages/python-docutils/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-docutils/trunk/debian/rules?rev=1797&op=diff
==============================================================================
--- packages/python-docutils/trunk/debian/rules (original)
+++ packages/python-docutils/trunk/debian/rules Sat Feb 10 01:56:11 2007
@@ -13,6 +13,8 @@
 d	= debian/$(p)
 PYTHON	= /usr/bin/python
 PYVER := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
+	| grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
 
 BUILDHTML_DIRS := .
 BUILDHTML_RECURSE_DIRS := docs
@@ -36,6 +38,7 @@
 	-find -name '*.py[co]' | xargs rm -f
 	rm -f *.html
 	find docs -name '*.html' -not -name 'quickref.html' -print0 | xargs -0 --no-run-if-empty rm
+	-rm -rf docutils.egg-info
 	dh_clean
 
 install: build
@@ -62,6 +65,10 @@
 	install -d debian/tmp/usr/share/pycentral/python-roman/site-packages
 	mv debian/tmp/usr/share/pycentral/python-docutils/site-packages/roman.py \
 		debian/tmp/usr/share/pycentral/python-roman/site-packages/roman.py
+	
+	# share Egg dir
+	mv debian/tmp/usr/share/pycentral/$(p)/site-packages/docutils-$(DEB_UPSTREAM_VERSION)-py$(PYVER).egg-info \
+	   debian/tmp/usr/share/pycentral/$(p)/site-packages/docutils-$(DEB_UPSTREAM_VERSION).egg-info
 
 	# Emacs: move files to site-start directory
 	install -d $(d)/usr/share/emacs/site-lisp
@@ -114,7 +121,6 @@
 		debian/python-roman/usr/share/lintian/overrides/python-roman
 
 	dh_pycentral
-	dh_python
 	dh_installexamples
 	dh_installman
 	set -e && for x in rst2latex rst2newlatex rst2html rst2pseudoxml \

More information about the Python-modules-commits mailing list