Package: ldaptor Version: 0.0.43 Severity: normal Tags: patch Hi,
Attached is the diff for my ldaptor 0.0.43-0.1 NMU. -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -Nru /tmp/pwn32pLKFw/ldaptor-0.0.43/debian/changelog
/tmp/VGLwTwhKf2/ldaptor-0.0.43/debian/changelog
--- /tmp/pwn32pLKFw/ldaptor-0.0.43/debian/changelog 2006-03-07
08:37:56.000000000 +0100
+++ /tmp/VGLwTwhKf2/ldaptor-0.0.43/debian/changelog 2006-07-19
16:35:36.000000000 +0200
@@ -1,3 +1,11 @@
+ldaptor (0.0.43-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update package for python policy transition (Closes: #373559, #378586).
+ * Get rid of the /usr/doc link in postinst (Closes: #359444).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Wed, 19 Jul 2006 16:34:44 +0200
+
ldaptor (0.0.43) unstable; urgency=low
* Applications changes:
diff -Nru /tmp/pwn32pLKFw/ldaptor-0.0.43/debian/control
/tmp/VGLwTwhKf2/ldaptor-0.0.43/debian/control
--- /tmp/pwn32pLKFw/ldaptor-0.0.43/debian/control 2006-03-06
21:29:10.000000000 +0100
+++ /tmp/VGLwTwhKf2/ldaptor-0.0.43/debian/control 2006-07-19
16:45:30.000000000 +0200
@@ -3,7 +3,8 @@
Priority: optional
Maintainer: Tommi Virtanen <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
-Build-Depends-Indep: python, python2.3-dev, python2.4-dev, cdbs, debhelper (>=
4.1.68), docbook-slides (>= 3.2.0), xsltproc, source-highlight, python-epydoc,
dia (>= 0.93-2), python2.3-twisted-core (>= 2.2), python2.3-twisted-names (>=
0.2), python2.3-twisted-mail (>= 0.2), python2.3-twisted-web (>= 0.5),
python2.3-nevow (>= 0.6.0), python2.3-webut, python2.3-pyparsing,
python2.3-pyopenssl, python2.3-crypto, python2.4-twisted-core (>= 2.2),
python2.4-twisted-names (>= 0.2), python2.4-twisted-mail (>= 0.2),
python2.4-twisted-web (>= 0.5), python2.4-nevow (>= 0.6.0), python2.4-webut,
python2.4-pyparsing, python2.4-pyopenssl, python2.4-crypto
+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
+Build-Depends: cdbs, debhelper, python-all-dev
Package: ldaptor-utils
Section: admin
@@ -50,7 +51,7 @@
Package: ldaptor-webui
Section: admin
Architecture: all
-Depends: ${python:Depends}, python2.3-nevow (>= 0.6.0), python2.3-webut,
python2.3-ldaptor
+Depends: ${python:Depends}, python-nevow , python-webut, python-ldaptor
Description: Web user interface for editing LDAP directories
A web-based user interface to search and edit information in an LDAP
directory.
@@ -76,46 +77,6 @@
This is a dummy package that depends on the correct version of
python-ldaptor for the default version of Python.
-Package: python2.3-ldaptor
-Section: python
-Architecture: all
-Depends: ${python:Depends}, ldaptor-common, python2.3-twisted-core (>= 2.2),
python2.3-twisted-names (>= 0.2), python2.3-twisted-mail (>= 0.2),
python2.3-twisted-web (>= 0.5), python2.3-pyparsing, pwgen,
python2.3-pyopenssl, python2.3-crypto
-Description: Pure-Python library for LDAP
- 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.
- .
- This version is usable with python2.3
-
-Package: python2.4-ldaptor
-Section: python
-Architecture: all
-Depends: ${python:Depends}, ldaptor-common, python2.4-twisted-core (>= 2.2),
python2.4-twisted-names (>= 0.2), python2.4-twisted-mail (>= 0.2),
python2.4-twisted-web (>= 0.5), python2.4-pyparsing, pwgen,
python2.4-pyopenssl, python2.4-crypto
-Description: Pure-Python library for LDAP
- 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.
- .
- This version is usable with python2.4
-
Package: ldaptor-doc
Section: doc
Architecture: all
diff -Nru /tmp/pwn32pLKFw/ldaptor-0.0.43/debian/postinst
/tmp/VGLwTwhKf2/ldaptor-0.0.43/debian/postinst
--- /tmp/pwn32pLKFw/ldaptor-0.0.43/debian/postinst 2003-01-25
19:05:28.000000000 +0100
+++ /tmp/VGLwTwhKf2/ldaptor-0.0.43/debian/postinst 2006-07-19
16:34:42.000000000 +0200
@@ -2,8 +2,8 @@
PACKAGE=ldaptor
if [ "$1" = "configure" ]; then
- if [ -d /usr/doc -a ! -e /usr/doc/$PACKAGE \
+ if [ -d /usr/doc -a -h /usr/doc/$PACKAGE \
-a -d /usr/share/doc/$PACKAGE ]; then
- ln -sf ../share/doc/$PACKAGE /usr/doc/$PACKAGE
+ rm -f /usr/doc/$PACKAGE
fi
fi
diff -Nru /tmp/pwn32pLKFw/ldaptor-0.0.43/debian/rules
/tmp/VGLwTwhKf2/ldaptor-0.0.43/debian/rules
--- /tmp/pwn32pLKFw/ldaptor-0.0.43/debian/rules 2006-03-05 23:14:14.000000000
+0100
+++ /tmp/VGLwTwhKf2/ldaptor-0.0.43/debian/rules 2006-07-19 16:30:17.000000000
+0200
@@ -5,13 +5,13 @@
include /usr/share/cdbs/1/class/python-distutils.mk
DEB_COMPRESS_EXCLUDE := .py .js
-DEB_DH_INSTALL_SOURCEDIR := debian/python2.3-ldaptor
+DEB_DH_INSTALL_SOURCEDIR := debian/python-ldaptor
DEB_DH_ALWAYS_EXCLUDE := .svn
# see http://bugs.debian.org/295906
cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst
python%,%,$(cdbs_curpkg))))
-$(patsubst %,binary-post-install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES))::
binary-post-install/python%-ldaptor:
+$(patsubst %,binary-post-install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES))::
binary-post-install/python-ldaptor:
PYTHONPATH='debian/$(cdbs_curpkg)/usr/lib/python$(cdbs_python_ver)/site-packages'
\
'trial$(cdbs_python_ver)' --tbformat=emacs --reporter=text
ldaptor
@@ -21,12 +21,12 @@
binary-post-install/ldaptor-utils::
rm -rf debian/ldaptor-utils/usr/bin/ldaptor-webui
-binary-post-install/python%-ldaptor:: binary-install/ldaptor-utils
binary-install/ldaptor-webui binary-install/ldaptor-common
+binary-post-install/python-ldaptor:: binary-install/ldaptor-utils
binary-install/ldaptor-webui binary-install/ldaptor-common
rm -rf \
- debian/python$*-ldaptor/usr/bin \
-
debian/python$*-ldaptor/usr/lib/python$*/site-packages/ldaptor/apps/webui \
-
debian/python$*-ldaptor/usr/lib/python$*/site-packages/ldaptor/test/test_webui.py
\
- debian/python$*-ldaptor/usr/share/locale
+ debian/python-ldaptor/usr/bin \
+
debian/python-ldaptor/usr/lib/python$*/site-packages/ldaptor/apps/webui \
+
debian/python-ldaptor/usr/lib/python$*/site-packages/ldaptor/test/test_webui.py
\
+ debian/python-ldaptor/usr/share/locale
binary-post-install/ldaptor-common::
find debian/ldaptor-common/usr/share/locale \
diff -Nru /tmp/pwn32pLKFw/ldaptor-0.0.43/doc/Makefile
/tmp/VGLwTwhKf2/ldaptor-0.0.43/doc/Makefile
--- /tmp/pwn32pLKFw/ldaptor-0.0.43/doc/Makefile 2006-03-05 22:28:52.000000000
+0100
+++ /tmp/VGLwTwhKf2/ldaptor-0.0.43/doc/Makefile 2006-07-19 16:41:08.000000000
+0200
@@ -129,7 +129,7 @@
'$(@D)'/foil*.html
%.dia.png: %.dia
- dia --export-to-format=png-libart [EMAIL PROTECTED] $<
+ dia -t png-libart [EMAIL PROTECTED] $<
mv [EMAIL PROTECTED] $@
api:
signature.asc
Description: Digital signature
