[Python-modules-commits] r7836 - in packages/ldaptor/trunk/debian (4 files)

[jandd-guest at users.alioth.debian.org]

    Date: Tuesday, March 10, 2009 @ 05:22:51
  Author: jandd-guest
Revision: 7836

integrate and acknowledge Ansgar Burchardt's changes

Modified:
  packages/ldaptor/trunk/debian/changelog
  packages/ldaptor/trunk/debian/control
  packages/ldaptor/trunk/debian/postinst
  packages/ldaptor/trunk/debian/rules

Modified: packages/ldaptor/trunk/debian/changelog
===================================================================
--- packages/ldaptor/trunk/debian/changelog	2009-03-09 23:26:49 UTC (rev 7835)
+++ packages/ldaptor/trunk/debian/changelog	2009-03-10 05:22:51 UTC (rev 7836)
@@ -1,8 +1,19 @@
 ldaptor (0.0.43-3) UNRELEASED; urgency=low
 
+  [ Sandro Tosi ]
   * debian/{control, rules, patches/*}
     - added dpatch, to prevent direct upstream code modification
 
+  [ Ansgar Burchardt ]
+  * debian/control:
+    - `python-pyopenssl' has been renamed into `python-openssl'. Update
+      dependencies accordingly. (Closes: #494904)
+    - Bump Standards Version to 3.8.0 (no changes)
+    - 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.
+
  -- Sandro Tosi <morph at debian.org>  Mon, 09 Mar 2009 20:06:25 +0100
 
 ldaptor (0.0.43-2) unstable; urgency=low

Modified: packages/ldaptor/trunk/debian/control
===================================================================
--- packages/ldaptor/trunk/debian/control	2009-03-09 23:26:49 UTC (rev 7835)
+++ packages/ldaptor/trunk/debian/control	2009-03-10 05:22:51 UTC (rev 7836)
@@ -2,15 +2,14 @@
 Section: admin
 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), dpatch
+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), dpatch
 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

Modified: packages/ldaptor/trunk/debian/postinst
===================================================================
--- packages/ldaptor/trunk/debian/postinst	2009-03-09 23:26:49 UTC (rev 7835)
+++ packages/ldaptor/trunk/debian/postinst	2009-03-10 05:22:51 UTC (rev 7836)
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/sh -e
 
 #DEBHELPER#

Modified: packages/ldaptor/trunk/debian/rules
===================================================================
--- packages/ldaptor/trunk/debian/rules	2009-03-09 23:26:49 UTC (rev 7835)
+++ packages/ldaptor/trunk/debian/rules	2009-03-10 05:22:51 UTC (rev 7836)
@@ -15,11 +15,13 @@
 	PYTHONPATH='debian/tmp/usr/lib/$(PYDEFAULT)/site-packages' \
 		trial --tbformat=emacs --reporter=text ldaptor
 
-binary-post-install/python-ldaptor::
+
+binary-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
+	 debian/python-ldaptor/usr/lib/python*/site-packages/ldaptor/apps/webui \
+	 debian/python-ldaptor/usr/lib/python*/site-packages/ldaptor/test/test_webui.py
 
+
 build/ldaptor-doc:: doc-stamp
 doc-stamp:
 	make -C doc