Package: ldaptor Severity: wishlist Hi,
Attached is the diff for my ldaptor 0.0.43-0.4 NMU. -- ·O· Pierre Habouzit ··O [EMAIL PROTECTED] OOO http://www.madism.org
diff -Nru /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/changelog
/tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/changelog
--- /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/changelog 2006-08-01
19:30:33.000000000 +0200
+++ /tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/changelog 2006-08-31
12:23:24.000000000 +0200
@@ -1,3 +1,14 @@
+ldaptor (0.0.43-0.4) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Really update package for the python policy (Closes: #373559, #378586).
+ * remove ldaptor-common, merge it into python-ldaptor.
+ * Bump Standards-Version to 3.7.2.
+ * Add python-pyopenssl to the webui Depends.
+ * Urgency set to medium for RC bug fix.
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Thu, 31 Aug 2006 11:02:15 +0200
+
ldaptor (0.0.43-0.3) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/control
/tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/control
--- /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/control 2006-07-20
20:00:28.000000000 +0200
+++ /tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/control 2006-08-31
12:03:39.000000000 +0200
@@ -2,8 +2,11 @@
Section: admin
Priority: optional
Maintainer: Tommi Virtanen <[EMAIL PROTECTED]>
-Standards-Version: 3.6.1
-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
+Standards-Version: 3.7.2
+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.4)
Build-Depends: cdbs, debhelper, python-all-dev
Package: ldaptor-utils
@@ -51,7 +54,7 @@
Package: ldaptor-webui
Section: admin
Architecture: all
-Depends: ${python:Depends}, python-nevow , python-webut, python-ldaptor
+Depends: ${python:Depends}, python-nevow , python-webut, python-ldaptor,
python-pyopenssl
Description: Web user interface for editing LDAP directories
A web-based user interface to search and edit information in an LDAP
directory.
@@ -60,7 +63,9 @@
Section: python
Architecture: all
Depends: ${python:Depends}, python-twisted-core (>= 2.2), python-twisted-names
(>= 0.2), python-twisted-mail (>= 0.2), python-twisted-web (>= 0.5),
python-pyparsing
-Replaces: python2.3-ldaptor
+Provides: ${python:Provides}
+Replaces: python2.3-ldaptor, ldaptor-common
+Conflicts: python2.3-ldaptor, ldaptor-common
Description: Pure-Python library for LDAP
Ldaptor is a pure-Python library that implements
.
@@ -89,23 +94,3 @@
- The Ldaptor library API
.
- Slides for a talk "Creating a simple LDAP application"
-
-Package: ldaptor-common
-Section: python
-Architecture: all
-Description: Pure-Python library for LDAP (common files)
- 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 package contains the common files shared between different
- builds of the library for different Python versions.
diff -Nru /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/ldaptor-common.install
/tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/ldaptor-common.install
--- /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/ldaptor-common.install
2005-02-21 19:22:37.000000000 +0100
+++ /tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/ldaptor-common.install
1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-../global.cfg etc/ldaptor
-../../ldaptor.schema etc/ldaptor
-usr/share/locale
diff -Nru /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/ldaptor-webui.install
/tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/ldaptor-webui.install
--- /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/ldaptor-webui.install 2005-02-21
19:22:37.000000000 +0100
+++ /tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/ldaptor-webui.install 2006-08-31
11:13:24.000000000 +0200
@@ -1,3 +1,3 @@
usr/bin/ldaptor-webui
-usr/lib/python2.3/site-packages/ldaptor/apps/webui
+usr/lib/python*/site-packages/ldaptor/apps/webui
usr/share/locale
diff -Nru /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/postinst
/tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/postinst
--- /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/postinst 2006-07-19
16:34:42.000000000 +0200
+++ /tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/postinst 2006-08-31
11:08:03.000000000 +0200
@@ -7,3 +7,5 @@
rm -f /usr/doc/$PACKAGE
fi
fi
+
+#DEBHELPER#
diff -Nru /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/prerm
/tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/prerm
--- /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/prerm 2002-07-20 22:45:36.000000000
+0200
+++ /tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/prerm 2006-08-31 11:08:03.000000000
+0200
@@ -5,3 +5,5 @@
-a -L /usr/doc/$PACKAGE ]; then
rm -f /usr/doc/$PACKAGE
fi
+
+#DEBHELPER#
diff -Nru /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/python-ldaptor.install
/tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/python-ldaptor.install
--- /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/python-ldaptor.install
1970-01-01 01:00:00.000000000 +0100
+++ /tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/python-ldaptor.install
2006-08-31 11:35:22.000000000 +0200
@@ -0,0 +1,2 @@
+../global.cfg etc/ldaptor
+../../ldaptor.schema etc/ldaptor
diff -Nru /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/pyversions
/tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/pyversions
--- /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/pyversions 1970-01-01
01:00:00.000000000 +0100
+++ /tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/pyversions 2006-08-31
11:28:09.000000000 +0200
@@ -0,0 +1 @@
+2.3-
diff -Nru /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/rules
/tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/rules
--- /tmp/IMsVyxuxL1/ldaptor-0.0.43/debian/rules 2006-08-01 19:50:08.000000000
+0200
+++ /tmp/nSANuGkJ7E/ldaptor-0.0.43/debian/rules 2006-08-31 11:55:01.000000000
+0200
@@ -1,46 +1,47 @@
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
-include /usr/share/cdbs/1/rules/debhelper.mk
+#the exchange is intentionnal, we will hook dh_pysupport ourselves
include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
DEB_COMPRESS_EXCLUDE := .py .js
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))))
+cdbs_python_ver = $(shell pyversions -dv)
-$(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
+#binary-install/python-ldaptor::
+#
PYTHONPATH='debian/$(cdbs_curpkg)/usr/lib/python$(cdbs_python_ver)/site-packages'
\
+# trial --tbformat=emacs --reporter=text ldaptor
build/ldaptor-doc::
make -C doc
-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
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
-
-binary-post-install/ldaptor-common::
- find debian/ldaptor-common/usr/share/locale \
+ debian/$(cdbs_curpkg)/usr/bin \
+
debian/$(cdbs_curpkg)/usr/lib/python*/site-packages/ldaptor/apps/webui \
+
debian/$(cdbs_curpkg)/usr/lib/python*/site-packages/ldaptor/test/test_webui.py
+ find debian/$(cdbs_curpkg)/usr/share/locale \
-name '*.mo' \
-a \! -name 'ldaptor.mo' \
-print0 \
| xargs -0 --no-run-if-empty rm --
+ dh_pysupport -p$(cdbs_curpkg)
+
+binary-post-install/ldaptor-utils::
+ rm -rf debian/$(cdbs_curpkg)/usr/bin/ldaptor-webui
+ dh_pysupport -p$(cdbs_curpkg)
binary-post-install/ldaptor-webui::
- find debian/ldaptor-webui/usr/share/locale \
+ find debian/$(cdbs_curpkg)/usr/share/locale \
-name '*.mo' \
-a \! -name 'ldaptor-webui.mo' \
-print0 \
| xargs -0 --no-run-if-empty rm --
+ dh_pysupport -p$(cdbs_curpkg)
clean::
find . -type f -name '*.pyc' -print0 \
signature.asc
Description: Digital signature
