Bug#516306: ldaptor: prepared patch for #494904 and #516306

2009-03-09 Thread Ansgar Burchardt
tags 494904 + patch pending
tags 516306 + patch pending
thanks

Hi,

I prepared a patch to address these issues.  I'll send a message to
debian-ment...@l.d.o later to ask for someone to sponsor the upload.

The patch for the upload is attached.

Regards,
Ansgar

-- 
PGP: 1024D/595FAD19  739E 2D09 0969 BEA9 9797  B055 DDB0 2FF7 595F AD19
diff -u ldaptor-0.0.43/debian/changelog ldaptor-0.0.43/debian/changelog
--- ldaptor-0.0.43/debian/changelog
+++ ldaptor-0.0.43/debian/changelog
@@ -1,3 +1,17 @@
+ldaptor (0.0.43-3) unstable; urgency=low
+
+  * QA upload.
+  * `python-pyopenssl' has been renamed into `python-openssl'.
+Update dependencies accordingly. (Closes: #494904)
+  * debian/control: Add ${misc:Depends}.
+  * debian/control: Bump Standards Version to 3.8.0 (no changes)
+  * debian/control: Do not duplicate Section field for binary packages.
+  * debian/rules: Do not rely on python-support internals to find files,
+instead remove them earlier using the standard path (Closes: #516306).
+  * postinst: Set -e option.
+
+ -- Ansgar Burchardt ans...@43-1.org  Mon, 09 Mar 2009 19:44:37 +0100
+
 ldaptor (0.0.43-2) unstable; urgency=low
 
   * QA upload.
diff -u ldaptor-0.0.43/debian/control ldaptor-0.0.43/debian/control
--- ldaptor-0.0.43/debian/control
+++ ldaptor-0.0.43/debian/control
@@ -2,15 +2,14 @@
 Section: admin
 Priority: optional
 Maintainer: Debian QA Group packa...@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)
+Standards-Version: 3.8.0
+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-openssl, python-crypto, python-support (= 0.6)
 Build-Depends: cdbs (= 0.4.49), debhelper ( 6.0.0), python-all-dev
 Homepage: http://www.inoi.fi/open/trac/ldaptor
 
 Package: ldaptor-utils
-Section: admin
 Architecture: all
-Depends: ${python:Depends}, python-ldaptor
+Depends: ${python:Depends}, ${misc:Depends}, python-ldaptor
 Description: Command-line LDAP utilities
  A set of LDAP utilities for use from the command line, including:
  .
@@ -44,9 +43,8 @@
  ldaptor-fetchschema -- Fetch schema from a server.
 
 Package: ldaptor-webui
-Section: admin
 Architecture: all
-Depends: ${python:Depends}, python-nevow , python-webut, python-ldaptor, python-pyopenssl
+Depends: ${python:Depends}, ${misc:Depends}, python-nevow, python-webut, python-ldaptor, python-openssl
 Description: Web user interface for editing LDAP directories
  A web-based user interface to search and edit information in an LDAP
  directory.
@@ -54,7 +52,7 @@
 Package: python-ldaptor
 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
+Depends: ${python:Depends}, ${misc:Depends}, python-twisted-core (= 2.2), python-twisted-names (= 0.2), python-twisted-mail (= 0.2), python-twisted-web (= 0.5), python-pyparsing
 Provides: ${python:Provides}
 Replaces: python2.3-ldaptor, ldaptor-common
 Conflicts: python2.3-ldaptor, ldaptor-common
@@ -70,6 +68,7 @@
 Package: ldaptor-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Description: Documentation for Ldaptor
  A collection of documentation about Ldaptor and LDAP, including
 * An introduction to LDAP
diff -u ldaptor-0.0.43/debian/postinst ldaptor-0.0.43/debian/postinst
--- ldaptor-0.0.43/debian/postinst
+++ ldaptor-0.0.43/debian/postinst
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/sh -e
 
 #DEBHELPER#
diff -u ldaptor-0.0.43/debian/rules ldaptor-0.0.43/debian/rules
--- ldaptor-0.0.43/debian/rules
+++ ldaptor-0.0.43/debian/rules
@@ -5,6 +5,12 @@
 PYDEFAULT=$(shell pyversions -d)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+
+binary-install/python-ldaptor::
+	rm -rf \
+		debian/python-ldaptor/usr/lib/python*/site-packages/ldaptor/apps/webui \
+		debian/python-ldaptor/usr/lib/python*/site-packages/ldaptor/test/test_webui.py
+
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 DEB_COMPRESS_EXCLUDE := .py .js
@@ -14,11 +20,6 @@
 	PYTHONPATH='debian/tmp/usr/lib/$(PYDEFAULT)/site-packages' \
 		trial --tbformat=emacs --reporter=text ldaptor
 
-binary-post-install/python-ldaptor::
-	rm -rf \
-		debian/python-ldaptor/usr/share/python-support/*/ldaptor/apps/webui \
-		debian/python-ldaptor/usr/share/python-support/*/ldaptor/test/test_webui.py
-
 build/ldaptor-doc:: doc-stamp
 doc-stamp:
 	make -C doc


Bug#494904: Bug#516306: ldaptor: prepared patch for #494904 and #516306

2009-03-09 Thread Sandro Tosi
Please hold: Jan and me are adopting this package for DPMT team, so
we'll upload once the integration is done.

On Mon, Mar 9, 2009 at 20:31, Ansgar Burchardt ans...@2008.43-1.org wrote:
 tags 494904 + patch pending
 tags 516306 + patch pending
 thanks

 Hi,

 I prepared a patch to address these issues.  I'll send a message to
 debian-ment...@l.d.o later to ask for someone to sponsor the upload.

 The patch for the upload is attached.

 Regards,
 Ansgar

 --
 PGP: 1024D/595FAD19  739E 2D09 0969 BEA9 9797  B055 DDB0 2FF7 595F AD19




-- 
Sandro Tosi (aka morph, morpheus, matrixhasu)
My website: http://matrixhasu.altervista.org/
Me at Debian: http://wiki.debian.org/SandroTosi



--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org