[Python-modules-commits] r7829 - in packages/ldaptor/trunk (9 files)
jandd-guest at users.alioth.debian.org
jandd-guest at users.alioth.debian.org
Mon Mar 9 19:46:42 UTC 2009
Date: Monday, March 9, 2009 @ 19:46:42
Author: jandd-guest
Revision: 7829
- remove upstream modifications and use dpatch instead (debdiff by Sandro Tosi)
Added:
packages/ldaptor/trunk/debian/patches/
packages/ldaptor/trunk/debian/patches/00list
packages/ldaptor/trunk/debian/patches/01_restore_pristine_code.dpatch
Modified:
packages/ldaptor/trunk/debian/changelog
packages/ldaptor/trunk/debian/control
packages/ldaptor/trunk/debian/rules
Deleted:
packages/ldaptor/trunk/doc/
packages/ldaptor/trunk/ldaptor/
packages/ldaptor/trunk/setup.py
Modified: packages/ldaptor/trunk/debian/changelog
===================================================================
--- packages/ldaptor/trunk/debian/changelog 2009-03-09 19:20:55 UTC (rev 7828)
+++ packages/ldaptor/trunk/debian/changelog 2009-03-09 19:46:42 UTC (rev 7829)
@@ -1,3 +1,10 @@
+ldaptor (0.0.43-3) UNRELEASED; urgency=low
+
+ * debian/{control, rules, patches/*}
+ - added dpatch, to prevent direct upstream code modification
+
+ -- Sandro Tosi <morph at debian.org> Mon, 09 Mar 2009 20:06:25 +0100
+
ldaptor (0.0.43-2) unstable; urgency=low
* QA upload.
Modified: packages/ldaptor/trunk/debian/control
===================================================================
--- packages/ldaptor/trunk/debian/control 2009-03-09 19:20:55 UTC (rev 7828)
+++ packages/ldaptor/trunk/debian/control 2009-03-09 19:46:42 UTC (rev 7829)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian QA Group <packages at qa.debian.org>
Standards-Version: 3.7.3
-Build-Depends-Indep: docbook-slides (>= 3.2.0), xsltproc, source-highlight, python-epydoc, dia (>= 0.93-2), python-twisted-core , python-twisted-names , python-twisted-mail , python-twisted-web , python-nevow , python-webut, python-pyparsing, python-pyopenssl, python-crypto, python-support (>= 0.6)
+Build-Depends-Indep: docbook-slides (>= 3.2.0), xsltproc, source-highlight, python-epydoc, dia (>= 0.93-2), python-twisted-core , python-twisted-names , python-twisted-mail , python-twisted-web , python-nevow , python-webut, python-pyparsing, python-pyopenssl, python-crypto, python-support (>= 0.6), dpatch
Build-Depends: cdbs (>= 0.4.49), debhelper (>> 6.0.0), python-all-dev
Homepage: http://www.inoi.fi/open/trac/ldaptor
Added: packages/ldaptor/trunk/debian/patches/00list
===================================================================
--- packages/ldaptor/trunk/debian/patches/00list (rev 0)
+++ packages/ldaptor/trunk/debian/patches/00list 2009-03-09 19:46:42 UTC (rev 7829)
@@ -0,0 +1 @@
+01_restore_pristine_code
Added: packages/ldaptor/trunk/debian/patches/01_restore_pristine_code.dpatch
===================================================================
--- packages/ldaptor/trunk/debian/patches/01_restore_pristine_code.dpatch (rev 0)
+++ packages/ldaptor/trunk/debian/patches/01_restore_pristine_code.dpatch 2009-03-09 19:46:42 UTC (rev 7829)
@@ -0,0 +1,103 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_restore_pristine_code.dpatch by Sandro Tosi <morph at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from ldaptor 0.0.43-3 diff.gz
+
+ at DPATCH@
+
+--- ldaptor-0.0.43.orig/setup.py
++++ ldaptor-0.0.43/setup.py
+@@ -202,5 +202,6 @@
+ 'ldaptor/apps/webui/search.xhtml',
+
+ 'ldaptor/apps/webui/ldaptor.css',
++ 'ldaptor/apps/webui/skin-default.html',
+ ]),
+ ])
+--- ldaptor-0.0.43.orig/doc/Makefile
++++ ldaptor-0.0.43/doc/Makefile
+@@ -129,14 +129,14 @@
+ '$(@D)'/foil*.html
+
+ %.dia.png: %.dia
+- dia --export-to-format=png-libart --export=$@.tmp $<
++ dia -t png-libart --export=$@.tmp $<
+ mv $@.tmp $@
+
+ api:
+ epydoc \
+ -o api \
+- -n Ldaptor \
+- -u http://www.inoi.fi/open/trac/ldaptor/ \
++ --name Ldaptor \
++ --url http://www.inoi.fi/open/trac/ldaptor/ \
+ $$(find ../ldaptor \( -name SCCS -prune \) -o -name '*.py' -print)
+
+ .PHONY: api
+--- ldaptor-0.0.43.orig/ldaptor/interfaces.py
++++ ldaptor-0.0.43/ldaptor/interfaces.py
+@@ -1,6 +1,6 @@
+-from twisted.python import components
++from zope.interface import Interface
+
+-class ILDAPEntry(components.Interface):
++class ILDAPEntry(Interface):
+ """
+
+ Pythonic API for LDAP object access and modification.
+@@ -126,7 +126,7 @@
+ incorrect.
+ """
+
+-class IEditableLDAPEntry(components.Interface):
++class IEditableLDAPEntry(Interface):
+ """Interface definition for editable LDAP entries."""
+
+ def __setitem__(self, key, value):
+@@ -206,7 +206,7 @@
+
+ """
+
+-class IConnectedLDAPEntry(components.Interface):
++class IConnectedLDAPEntry(Interface):
+ """Interface definition for LDAP entries that are part of a bigger whole."""
+
+ def namingContext(self):
+@@ -334,7 +334,7 @@
+
+ """
+
+-class ILDAPConfig(components.Interface):
++class ILDAPConfig(Interface):
+ """Generic LDAP configuration retrieval."""
+
+ def getBaseDN(self):
+--- ldaptor-0.0.43.orig/ldaptor/apps/webui/iwebui.py
++++ ldaptor-0.0.43/ldaptor/apps/webui/iwebui.py
+@@ -1,4 +1,4 @@
+-from twisted.python import components
++from zope.interface import Interface
+
+-class ICurrentDN(components.Interface):
++class ICurrentDN(Interface):
+ """Marker interface for current DN for Ldaptor-webui."""
+--- ldaptor-0.0.43.orig/ldaptor/apps/webui/search.py
++++ ldaptor-0.0.43/ldaptor/apps/webui/search.py
+@@ -1,6 +1,5 @@
+-from zope.interface import implements
++from zope.interface import implements,Interface
+ from twisted.internet import defer
+-from twisted.python import components
+ from webut.skin import iskin
+ from ldaptor.protocols.ldap import ldapclient, ldapsyntax
+ from ldaptor.protocols.ldap import distinguishedname, ldapconnector
+@@ -17,7 +16,7 @@
+ from nevow import rend, inevow, loaders, url, tags
+ from formless import annotate, webform, iformless, configurable
+
+-class IMove(components.Interface):
++class IMove(Interface):
+ """Entries being moved in the tree."""
+ pass
+
Modified: packages/ldaptor/trunk/debian/rules
===================================================================
--- packages/ldaptor/trunk/debian/rules 2009-03-09 19:20:55 UTC (rev 7828)
+++ packages/ldaptor/trunk/debian/rules 2009-03-09 19:46:42 UTC (rev 7829)
@@ -5,6 +5,7 @@
PYDEFAULT=$(shell pyversions -d)
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/python-distutils.mk
DEB_COMPRESS_EXCLUDE := .py .js
Deleted: packages/ldaptor/trunk/setup.py
===================================================================
--- packages/ldaptor/trunk/setup.py 2009-03-09 19:20:55 UTC (rev 7828)
+++ packages/ldaptor/trunk/setup.py 2009-03-09 19:46:42 UTC (rev 7829)
@@ -1,207 +0,0 @@
-#!/usr/bin/python
-
-import os, errno
-from distutils.core import setup
-from distutils import sysconfig, cmd
-from distutils.command.build import build as _build
-from distutils.command.clean import clean as _clean
-from distutils.command.install import install as _install
-from distutils.util import change_root
-from distutils.dir_util import remove_tree, copy_tree, mkpath
-
-# quick hack to support generating locale files
-class build(_build):
- def __init__(self, *a, **kw):
- self.sub_commands = self.sub_commands + [
- ('build_locale', None),
- ]
- _build.__init__(self, *a, **kw)
-
-class build_locale(cmd.Command):
- user_options = [
- ('build-dir=', 'd', "directory to build to"),
- ('po-dir=', 'd', "directory holding the domain dirs and in them PO-files"),
- ]
-
- def initialize_options(self):
- self.build_dir = 'locale'
- self.build_base = None
- self.po_dir = 'po'
-
- def finalize_options (self):
- self.set_undefined_options('build',
- ('build_base', 'build_base'))
- self.build_dir = change_root(self.build_base, self.build_dir)
-
- def run(self):
- for domain in os.listdir(self.po_dir):
- try:
- l = os.listdir(os.path.join(self.po_dir, domain))
- except OSError, e:
- if e.errno == errno.ENOTDIR:
- continue
- else:
- raise
-
- for po in l:
- if not po.endswith('.po'):
- continue
- locale = po[:-len('.po')]
- path = os.path.join(self.build_dir,
- locale,
- 'LC_MESSAGES')
- mkpath(path)
- self.spawn(['msgfmt', '-o',
- os.path.join(path, '%s.mo' % domain),
- os.path.join(self.po_dir,
- domain,
- po)])
-class clean(_clean):
- def run(self):
- self.run_command('clean_locale')
- _clean.run(self)
-
-class clean_locale(cmd.Command):
- user_options = [
- ('build-dir=', 'd', "directory to build to"),
- ]
-
- def initialize_options(self):
- self.build_dir = None
-
- def finalize_options (self):
- self.set_undefined_options('build_locale',
- ('build_dir', 'build_dir'))
-
- def run(self):
- if os.path.exists(self.build_dir):
- remove_tree(self.build_dir, dry_run=self.dry_run)
-
-class install(_install):
- def __init__(self, *a, **kw):
- self.sub_commands = self.sub_commands + [
- ('install_locale', None),
- ]
- _install.__init__(self, *a, **kw)
-
-class install_locale(cmd.Command):
- user_options = [
- ('install-dir=', 'd', "directory to install locales to"),
- ('build-dir=','b', "build directory (where to install from)"),
- ('skip-build', None, "skip the build steps"),
- ]
-
- boolean_options = ['skip-build']
-
- def initialize_options(self):
- self.build_dir = None
- self.install_dir = None
- self.root = None
- self.prefix = None
- self.skip_build = None
-
- def finalize_options (self):
- self.set_undefined_options('build_locale',
- ('build_dir', 'build_dir'))
- self.set_undefined_options('install',
- ('skip_build', 'skip_build'))
- if self.install_dir is None:
- self.set_undefined_options('install',
- ('root', 'root'))
- self.set_undefined_options('install',
- ('prefix', 'prefix'))
- prefix = self.prefix
- if self.root is not None:
- prefix = change_root(self.root, prefix)
- self.install_dir = os.path.join(prefix, 'share', 'locale')
-
- def run(self):
- if not self.skip_build:
- self.run_command('build_locale')
- copy_tree(src=self.build_dir,
- dst=self.install_dir,
- dry_run=self.dry_run)
-
-if __name__=='__main__':
- setup(name="ldaptor",
- description="Pure-Python library for LDAP",
- long_description="""
-
-Ldaptor is a pure-Python library that implements
-
-- LDAP client logic.
-
-- separately-accessible LDAP and BER protocol message
-generation/parsing.
-
-- ASCII-format LDAP filter generation and parsing.
-
-- LDIF format data generation.
-
-- Samba password changing logic.
-
-Also included is a web-based user interface to search and edit
-information in an LDAP directory and a set of LDAP utilities for use
-from the command line.
-
-""".strip(),
- author="Tommi Virtanen",
- author_email="tv at debian.org",
- #url="TODO",
- license="GNU LGPL",
-
- cmdclass={'build': build,
- 'build_locale': build_locale,
- 'clean': clean,
- 'clean_locale': clean_locale,
- 'install': install,
- 'install_locale': install_locale,
- },
-
- packages=[
- "ldaptor",
- "ldaptor.protocols",
- "ldaptor.protocols.ldap",
- "ldaptor.protocols.ldap.autofill",
- "ldaptor.samba",
- "ldaptor.apps",
- "ldaptor.apps.webui",
- "ldaptor.test",
- ],
- scripts=[
- "bin/ldaptor-webui",
- "bin/ldaptor-ldap2dhcpconf",
- "bin/ldaptor-ldap2maradns",
- "bin/ldaptor-ldap2dnszones",
- "bin/ldaptor-search",
- "bin/ldaptor-namingcontexts",
- "bin/ldaptor-passwd",
- "bin/ldaptor-ldap2passwd",
- "bin/ldaptor-getfreenumber",
- "bin/ldaptor-ldap2pdns",
- "bin/ldaptor-find-server",
- "bin/ldaptor-rename",
- "bin/ldaptor-fetchschema",
- ],
- data_files=[
- (os.path.join(sysconfig.get_python_lib(), 'ldaptor/apps/webui'),
- [
- 'ldaptor/apps/webui/add-really.xhtml',
- 'ldaptor/apps/webui/add.xhtml',
- 'ldaptor/apps/webui/basedn.xhtml',
- 'ldaptor/apps/webui/change_password.xhtml',
- 'ldaptor/apps/webui/change_service_passwords.xhtml',
- 'ldaptor/apps/webui/delete-nodn.xhtml',
- 'ldaptor/apps/webui/delete.xhtml',
- 'ldaptor/apps/webui/edit-really.xhtml',
- 'ldaptor/apps/webui/edit.xhtml',
- 'ldaptor/apps/webui/login.xhtml',
- 'ldaptor/apps/webui/mass_change_password-really.xhtml',
- 'ldaptor/apps/webui/mass_change_password.xhtml',
- 'ldaptor/apps/webui/move.xhtml',
- 'ldaptor/apps/webui/search.xhtml',
-
- 'ldaptor/apps/webui/ldaptor.css',
- 'ldaptor/apps/webui/skin-default.html',
- ]),
- ])
More information about the Python-modules-commits
mailing list