[Python-modules-commits] r10688 - in packages/python-docutils/trunk/debian/patches (4 files)
smcv at users.alioth.debian.org
smcv at users.alioth.debian.org
Mon Dec 7 00:03:39 UTC 2009
Date: Monday, December 7, 2009 @ 00:02:22
Author: smcv
Revision: 10688
Split 14_use_setuptools.diff into a patch to use setuptools, and a patch to always install roman
Added:
packages/python-docutils/trunk/debian/patches/13_install_roman.diff
packages/python-docutils/trunk/debian/patches/14_use_setuptools.diff
Modified:
packages/python-docutils/trunk/debian/patches/series
Deleted:
packages/python-docutils/trunk/debian/patches/14_distutils_setup.diff
Added: packages/python-docutils/trunk/debian/patches/13_install_roman.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/13_install_roman.diff (rev 0)
+++ packages/python-docutils/trunk/debian/patches/13_install_roman.diff 2009-12-07 00:02:22 UTC (rev 10688)
@@ -0,0 +1,33 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Sun, 6 Dec 2009 23:44:04 +0000
+Subject: [PATCH] Force roman.py to be installed even if it's already installed
+
+Upstream treats this copy of roman.py as a convenience copy, but Debian
+doesn't ship roman.py any other way, so we treat this as the canonical
+way to get it.
+
+Creating Debian packages should be deterministic, and we don't want to
+have to build-conflict on ourselves.
+
+Forwarded: not-needed
+---
+ setup.py | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 14f98af..d2ba0d5 100755
+--- a/setup.py
++++ b/setup.py
+@@ -180,6 +180,11 @@ extra_modules = [('roman', '1.4', ['toRoman', 'fromRoman',
+ List of (module name, minimum __version__ string, [attribute names])."""
+
+ def get_extras():
++ # In Debian, this source package is treated as the canonical source of
++ # roman.py, not just as a convenience copy (we don't have a separate
++ # source package for roman.py), so we must always install it.
++ return ['roman']
++
+ extras = []
+ for module_name, version, attributes in extra_modules:
+ try:
+--
Deleted: packages/python-docutils/trunk/debian/patches/14_distutils_setup.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/14_distutils_setup.diff 2009-12-06 23:58:50 UTC (rev 10687)
+++ packages/python-docutils/trunk/debian/patches/14_distutils_setup.diff 2009-12-07 00:02:22 UTC (rev 10688)
@@ -1,110 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 14_distutils_setup.dpatch by Simon McVittie <smcv at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Package roman separately
-
- at DPATCH@
-
-From 203c8112ee6ad9c9fca788a9b065fa27224504c0 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv at debian.org>
-Date: Thu, 17 Jul 2008 11:22:01 +0100
-Subject: [PATCH] [debian-specific?] Package roman separately
-
----
- setup.py | 30 ++----------------------------
- setup_roman.py | 20 ++++++++++++++++++++
- 2 files changed, 22 insertions(+), 28 deletions(-)
- create mode 100644 setup_roman.py
-
-diff --git a/setup.py b/setup.py
-index 1ce8763..f0af2e8 100755
---- a/setup.py
-+++ b/setup.py
-@@ -6,7 +6,7 @@ import sys
- import os
- import glob
- try:
-- from distutils.core import setup
-+ from setuptools import setup
- from distutils.command.build_py import build_py
- from distutils.command.install_data import install_data
- except ImportError:
-@@ -39,9 +39,6 @@ class smart_install_data(install_data):
-
- def do_setup():
- kwargs = package_data.copy()
-- extras = get_extras()
-- if extras:
-- kwargs['py_modules'] = extras
- if sys.hexversion >= 0x02030000: # Python 2.3
- kwargs['classifiers'] = classifiers
- # Install data files properly. Note that we use a different
-@@ -77,7 +74,7 @@ what-you-see-is-what-you-get plaintext markup syntax.""", # wrap at col 60
- 'author_email': 'goodger at python.org',
- 'license': 'public domain, Python, BSD, GPL (see COPYING.txt)',
- 'platforms': 'OS-independent',
-- 'package_dir': {'docutils': 'docutils', '': 'extras'},
-+ 'package_dir': {'docutils': 'docutils'},
- 'packages': ['docutils',
- 'docutils.languages',
- 'docutils.parsers',
-@@ -147,29 +144,6 @@ classifiers = [
- """Trove classifiers for the Distutils "register" command;
- Python 2.3 and up."""
-
--extra_modules = [('optparse', '1.4.1', None),
-- ('textwrap', None, None),
-- ('roman', '1.4', ['toRoman', 'fromRoman',
-- 'InvalidRomanNumeralError'])]
--"""Third-party modules to install if they're not already present.
--List of (module name, minimum __version__ string, [attribute names])."""
--
--def get_extras():
-- extras = []
-- for module_name, version, attributes in extra_modules:
-- try:
-- module = __import__(module_name)
-- if version and module.__version__ < version:
-- raise ValueError
-- for attribute in attributes or []:
-- getattr(module, attribute)
-- print ('"%s" module already present; ignoring extras/%s.py.'
-- % (module_name, module_name))
-- except (ImportError, AttributeError, ValueError):
-- extras.append(module_name)
-- return extras
--
--
- class dual_build_py(build_py):
-
- """
-diff --git a/setup_roman.py b/setup_roman.py
-new file mode 100644
-index 0000000..d7cc28f
---- /dev/null
-+++ b/setup_roman.py
-@@ -0,0 +1,20 @@
-+#!/usr/bin/python
-+
-+from distutils.core import setup
-+
-+def do_setup():
-+ dist = setup(
-+ name = 'roman',
-+ description = 'Python Roman-numbers library',
-+ #long_description = '',
-+ url = 'http://docutils.sourceforge.net/',
-+ version = '1.4',
-+ author = 'Mark Pilgrim',
-+ author_email = 'f8dy at diveintopython.org',
-+ license = 'Python',
-+ package_dir = {'': 'extras'},
-+ py_modules = ['roman'])
-+ return dist
-+
-+if __name__ == '__main__' :
-+ do_setup()
---
-1.5.6.2
-
Added: packages/python-docutils/trunk/debian/patches/14_use_setuptools.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/14_use_setuptools.diff (rev 0)
+++ packages/python-docutils/trunk/debian/patches/14_use_setuptools.diff 2009-12-07 00:02:22 UTC (rev 10688)
@@ -0,0 +1,23 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Sun, 6 Dec 2009 23:44:23 +0000
+Subject: [PATCH] Use setuptools to get egg support (Debian #382272)
+
+Bug-Debian: http://bugs.debian.org/382272
+---
+ setup.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index d2ba0d5..27d239b 100755
+--- a/setup.py
++++ b/setup.py
+@@ -6,7 +6,7 @@ import sys
+ import os
+ import glob
+ try:
+- from distutils.core import setup, Command
++ from setuptools import setup, Command
+ from distutils.command.build import build
+ from distutils.command.build_py import build_py
+ from distutils.command.install_data import install_data
+--
Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series 2009-12-06 23:58:50 UTC (rev 10687)
+++ packages/python-docutils/trunk/debian/patches/series 2009-12-07 00:02:22 UTC (rev 10688)
@@ -1,5 +1,6 @@
10_doc_debian_paths.diff
12_more_usrbinenv.diff
-14_distutils_setup.diff
+13_install_roman.diff
+14_use_setuptools.diff
15_emacs_debian_paths.diff
16_disable_picins.diff
More information about the Python-modules-commits
mailing list