[Python-modules-commits] r10158 - in packages/ldaptor/trunk/debian (11 files)
jandd at users.alioth.debian.org
jandd at users.alioth.debian.org
Wed Oct 21 09:58:46 UTC 2009
Date: Wednesday, October 21, 2009 @ 09:58:44
Author: jandd
Revision: 10158
switch from dpatch to quilt to prepare switch from cdbs to dh
Added:
packages/ldaptor/trunk/debian/patches/01_restore_pristine_code.patch
packages/ldaptor/trunk/debian/patches/02_fix_526522.patch
packages/ldaptor/trunk/debian/patches/03_fix_dia_invocation_545663.patch
packages/ldaptor/trunk/debian/patches/series
Modified:
packages/ldaptor/trunk/debian/changelog
packages/ldaptor/trunk/debian/control
packages/ldaptor/trunk/debian/rules
Deleted:
packages/ldaptor/trunk/debian/patches/00list
packages/ldaptor/trunk/debian/patches/01_restore_pristine_code.dpatch
packages/ldaptor/trunk/debian/patches/02_fix_526522.dpatch
packages/ldaptor/trunk/debian/patches/03_fix_dia_invocation_545663.dpatch
Modified: packages/ldaptor/trunk/debian/changelog
===================================================================
--- packages/ldaptor/trunk/debian/changelog 2009-10-21 09:45:09 UTC (rev 10157)
+++ packages/ldaptor/trunk/debian/changelog 2009-10-21 09:58:44 UTC (rev 10158)
@@ -1,9 +1,13 @@
ldaptor (0.0.43-4) UNRELEASED; urgency=low
- * add debian/patches/02_fix_526522.dpatch:
+ * switch to quilt
+ * replaced debian/patches/00list with debian/patches/series
+ * replaced debian/patches/01_restore_pristine_code.dpatch with
+ debian/patches/01_restore_pristine_code.patch
+ * add debian/patches/02_fix_526522.patch:
- fixes the reason of the traceback generated by ldaptor-ldap2passwd
--help (Closes: #526522)
- * add debian/patches/03_fix_dia_invocation_545663.dpatch:
+ * add debian/patches/03_fix_dia_invocation_545663.patch:
- fixes invocation of dia to generate images during doc build in
headless environments (Closes: #545663)
* debian/changelog:
@@ -14,6 +18,8 @@
* debian/control:
- change to d.o email address
- update Standards-Version to 3.8.3 (no changes needed)
+ - remove dpatch from Build-Depends
+ - add quilt to Build-Depends
* debian/ldaptor-ldap2passwd.1, debian/ldaptor-find-server.1,
debian/ldaptor-ldap2dnszones.1, debian/ldaptor-ldap2pdns.1,
debian/ldaptor-getfreenumber.1, debian/ldaptor-passwd.1,
@@ -21,6 +27,8 @@
debian/ldaptor-ldap2dhcpconf.1, debian/ldaptor-rename.1,
debian/ldaptor-ldap2maradns.1, debian/ldaptor-fetchschema.1,
debian/ldaptor-webui.1: update email address
+ * debian/rules:
+ - use quilt instead of dpatch macros
-- Jan Dittberner <jan at dittberner.info> Mon, 08 Jun 2009 22:26:16 +0200
Modified: packages/ldaptor/trunk/debian/control
===================================================================
--- packages/ldaptor/trunk/debian/control 2009-10-21 09:45:09 UTC (rev 10157)
+++ packages/ldaptor/trunk/debian/control 2009-10-21 09:58:44 UTC (rev 10158)
@@ -9,7 +9,7 @@
python-twisted-core, python-twisted-names, python-twisted-mail,
python-twisted-web, python-nevow, python-webut, python-pyparsing,
python-openssl, python-crypto, python-support (>= 0.6)
-Build-Depends: cdbs (>= 0.4.49), debhelper (>> 6.0.0), python-all-dev, dpatch
+Build-Depends: cdbs (>= 0.4.49), debhelper (>> 6.0.0), python-all-dev, quilt (>= 0.40)
XS-Python-Version: all
Homepage: http://www.inoi.fi/open/trac/ldaptor
Vcs-Svn: svn://svn.debian.org/python-modules/packages/ldaptor/trunk/
Deleted: packages/ldaptor/trunk/debian/patches/00list
===================================================================
--- packages/ldaptor/trunk/debian/patches/00list 2009-10-21 09:45:09 UTC (rev 10157)
+++ packages/ldaptor/trunk/debian/patches/00list 2009-10-21 09:58:44 UTC (rev 10158)
@@ -1,3 +0,0 @@
-01_restore_pristine_code
-02_fix_526522
-03_fix_dia_invocation_545663
Deleted: packages/ldaptor/trunk/debian/patches/01_restore_pristine_code.dpatch
===================================================================
--- packages/ldaptor/trunk/debian/patches/01_restore_pristine_code.dpatch 2009-10-21 09:45:09 UTC (rev 10157)
+++ packages/ldaptor/trunk/debian/patches/01_restore_pristine_code.dpatch 2009-10-21 09:58:44 UTC (rev 10158)
@@ -1,103 +0,0 @@
-#! /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
-
Added: packages/ldaptor/trunk/debian/patches/01_restore_pristine_code.patch
===================================================================
--- packages/ldaptor/trunk/debian/patches/01_restore_pristine_code.patch (rev 0)
+++ packages/ldaptor/trunk/debian/patches/01_restore_pristine_code.patch 2009-10-21 09:58:44 UTC (rev 10158)
@@ -0,0 +1,97 @@
+Author: Sandro Tosi <morph at debian.org>
+Description: New patch generated from ldaptor 0.0.43-3 diff.gz
+--- a/setup.py
++++ b/setup.py
+@@ -202,5 +202,6 @@
+ 'ldaptor/apps/webui/search.xhtml',
+
+ 'ldaptor/apps/webui/ldaptor.css',
++ 'ldaptor/apps/webui/skin-default.html',
+ ]),
+ ])
+--- a/doc/Makefile
++++ b/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
+--- a/ldaptor/interfaces.py
++++ b/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):
+--- a/ldaptor/apps/webui/iwebui.py
++++ b/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."""
+--- a/ldaptor/apps/webui/search.py
++++ b/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
+
Deleted: packages/ldaptor/trunk/debian/patches/02_fix_526522.dpatch
===================================================================
--- packages/ldaptor/trunk/debian/patches/02_fix_526522.dpatch 2009-10-21 09:45:09 UTC (rev 10157)
+++ packages/ldaptor/trunk/debian/patches/02_fix_526522.dpatch 2009-10-21 09:58:44 UTC (rev 10158)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_526522.dpatch by Jan Dittberner <jan at dittberner.info>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fixes #526522 ldaptor-ldap2passwd --help throws exception.
-
- at DPATCH@
-diff -urNad ldaptor-0.0.43~/bin/ldaptor-ldap2passwd ldaptor-0.0.43/bin/ldaptor-ldap2passwd
---- ldaptor-0.0.43~/bin/ldaptor-ldap2passwd 2005-12-04 11:09:40.000000000 +0100
-+++ ldaptor-0.0.43/bin/ldaptor-ldap2passwd 2009-06-08 22:18:48.000000000 +0200
-@@ -77,7 +77,7 @@
- try:
- opts = MyOptions()
- opts.parseOptions()
-- except usage.UsageError, ue:
-+ except usage.usage.UsageError, ue:
- sys.stderr.write('%s: %s\n' % (sys.argv[0], ue))
- sys.exit(1)
-
Added: packages/ldaptor/trunk/debian/patches/02_fix_526522.patch
===================================================================
--- packages/ldaptor/trunk/debian/patches/02_fix_526522.patch (rev 0)
+++ packages/ldaptor/trunk/debian/patches/02_fix_526522.patch 2009-10-21 09:58:44 UTC (rev 10158)
@@ -0,0 +1,13 @@
+Author: Jan Dittberner <jandd at debian.org>
+Description: fixes #526522 ldaptor-ldap2passwd --help throws exception.
+--- a/bin/ldaptor-ldap2passwd
++++ b/bin/ldaptor-ldap2passwd
+@@ -77,7 +77,7 @@
+ try:
+ opts = MyOptions()
+ opts.parseOptions()
+- except usage.UsageError, ue:
++ except usage.usage.UsageError, ue:
+ sys.stderr.write('%s: %s\n' % (sys.argv[0], ue))
+ sys.exit(1)
+
Deleted: packages/ldaptor/trunk/debian/patches/03_fix_dia_invocation_545663.dpatch
===================================================================
--- packages/ldaptor/trunk/debian/patches/03_fix_dia_invocation_545663.dpatch 2009-10-21 09:45:09 UTC (rev 10157)
+++ packages/ldaptor/trunk/debian/patches/03_fix_dia_invocation_545663.dpatch 2009-10-21 09:58:44 UTC (rev 10158)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03fix_dia_invocation_545663.dpatch by Jan Dittberner <jandd at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes the invocation of dia for diagramm generation in a headless
-## DP: environment
-
- at DPATCH@
-
---- ldaptor-0.4.3.orig/doc/Makefile 2009-10-21 10:12:44.000000000 +0200
-+++ ldaptor-0.4.3/doc/Makefile 2009-10-21 10:14:10.000000000 +0200
-@@ -129,7 +129,7 @@
- '$(@D)'/foil*.html
-
- %.dia.png: %.dia
-- dia -t png-libart --export=$@.tmp $<
-+ dia -n -t cairo-alpha-png --export=$@.tmp $<
- mv $@.tmp $@
-
- api:
Added: packages/ldaptor/trunk/debian/patches/03_fix_dia_invocation_545663.patch
===================================================================
--- packages/ldaptor/trunk/debian/patches/03_fix_dia_invocation_545663.patch (rev 0)
+++ packages/ldaptor/trunk/debian/patches/03_fix_dia_invocation_545663.patch 2009-10-21 09:58:44 UTC (rev 10158)
@@ -0,0 +1,14 @@
+Author: Jan Dittberner <jandd at debian.org>
+Description: Fixes the invocation of dia for diagramm generation in a headless
+environment
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -129,7 +129,7 @@
+ '$(@D)'/foil*.html
+
+ %.dia.png: %.dia
+- dia -t png-libart --export=$@.tmp $<
++ dia -n -t cairo-alpha-png --export=$@.tmp $<
+ mv $@.tmp $@
+
+ api:
Added: packages/ldaptor/trunk/debian/patches/series
===================================================================
--- packages/ldaptor/trunk/debian/patches/series (rev 0)
+++ packages/ldaptor/trunk/debian/patches/series 2009-10-21 09:58:44 UTC (rev 10158)
@@ -0,0 +1,3 @@
+01_restore_pristine_code.patch
+02_fix_526522.patch
+03_fix_dia_invocation_545663.patch
Modified: packages/ldaptor/trunk/debian/rules
===================================================================
--- packages/ldaptor/trunk/debian/rules 2009-10-21 09:45:09 UTC (rev 10157)
+++ packages/ldaptor/trunk/debian/rules 2009-10-21 09:58:44 UTC (rev 10158)
@@ -5,7 +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/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/python-distutils.mk
DEB_COMPRESS_EXCLUDE := .py .js
More information about the Python-modules-commits
mailing list