[Python-modules-commits] r15627 - in packages/ldaptor/trunk/debian (9 files)

jandd at users.alioth.debian.org jandd at users.alioth.debian.org
Sun Feb 13 16:57:10 UTC 2011 

    Date: Sunday, February 13, 2011 @ 16:57:00
  Author: jandd
Revision: 15627

* remove broken binary package ldaptor-webui
  - change debian/control and debian/rules
  - add patch debian/patches/remove-webui.patch to stop building of
    ldaptor-webui documentation
  - remove debian/ldaptor-webui.*
* remove build dependencies python-twisted-web, python-nevow, python-
  webut only required for ldaptor-webui
* switch from python-support to dh_python2
  - add --with python2 to debian/rules
  - remove python-support build dependency
  - bump python dependency to 2.6.5~
  - change XS-Python-Version to X-Python-Version
  - add Breaks: ${python:Breaks} for Python binary packages
* bump Standards-Version to 3.9.1
* don't compress api-objects.txt in debian/rules

Added:
  packages/ldaptor/trunk/debian/patches/remove-webui.patch
Modified:
  packages/ldaptor/trunk/debian/changelog
  packages/ldaptor/trunk/debian/control
  packages/ldaptor/trunk/debian/patches/series
  packages/ldaptor/trunk/debian/rules
Deleted:
  packages/ldaptor/trunk/debian/ldaptor-webui.1
  packages/ldaptor/trunk/debian/ldaptor-webui.examples
  packages/ldaptor/trunk/debian/ldaptor-webui.install
  packages/ldaptor/trunk/debian/ldaptor-webui.manpages

Modified: packages/ldaptor/trunk/debian/changelog
===================================================================
--- packages/ldaptor/trunk/debian/changelog	2011-02-13 15:03:46 UTC (rev 15626)
+++ packages/ldaptor/trunk/debian/changelog	2011-02-13 16:57:00 UTC (rev 15627)
@@ -1,3 +1,23 @@
+ldaptor (0.0.43+debian1-4) UNRELEASED; urgency=low
+
+  * remove broken binary package ldaptor-webui
+    - change debian/control and debian/rules
+    - add patch debian/patches/remove-webui.patch to stop building of
+      ldaptor-webui documentation
+    - remove debian/ldaptor-webui.*
+  * remove build dependencies python-twisted-web, python-nevow, python-
+    webut only required for ldaptor-webui
+  * switch from python-support to dh_python2
+    - add --with python2 to debian/rules
+    - remove python-support build dependency
+    - bump python dependency to 2.6.5~
+    - change XS-Python-Version to X-Python-Version
+    - add Breaks: ${python:Breaks} for Python binary packages
+  * bump Standards-Version to 3.9.1
+  * don't compress api-objects.txt in debian/rules
+
+ -- Jan Dittberner <jandd at debian.org>  Sun, 13 Feb 2011 16:57:43 +0100
+
 ldaptor (0.0.43+debian1-3) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/ldaptor/trunk/debian/control
===================================================================
--- packages/ldaptor/trunk/debian/control	2011-02-13 15:03:46 UTC (rev 15626)
+++ packages/ldaptor/trunk/debian/control	2011-02-13 16:57:00 UTC (rev 15627)
@@ -3,14 +3,13 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Jan Dittberner <jandd at debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Build-Depends-Indep: docbook-slides (>= 3.2.0), xsltproc,
  source-highlight, python-epydoc, dia (>= 0.93-2), python-docutils,
  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), python (>= 2.5.4-1~)
-Build-Depends: debhelper (>= 7.0.50)
-XS-Python-Version: all
+ python-pyparsing, python-openssl, python-crypto, python (>= 2.6.5~)
+Build-Depends: debhelper (>= 7.0.50~)
+X-Python-Version: all
 Homepage: http://www.inoi.fi/open/trac/ldaptor
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/ldaptor/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/ldaptor/trunk/
@@ -18,6 +17,7 @@
 Package: ldaptor-utils
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-ldaptor
+Breaks: ${python:Breaks}
 Description: command-line LDAP utilities
  A set of LDAP utilities for use from the command line, including:
  .
@@ -37,17 +37,6 @@
   * ldaptor-ldap2pdns -- pdns pipe backend.
   * ldaptor-fetchschema -- Fetch schema from a server.
 
-Package: ldaptor-webui
-Architecture: all
-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.
- .
- The included utility ldaptor-webui starts an HTTP server on a
- configurable port.
-
 Package: python-ldaptor
 Section: python
 Architecture: all
@@ -56,6 +45,7 @@
  python-twisted-mail (>= 0.2), python-twisted-web (>= 0.5),
  python-pyparsing
 Provides: ${python:Provides}
+Breaks: ${python:Breaks}
 Replaces: python2.3-ldaptor, ldaptor-common
 Conflicts: python2.3-ldaptor, ldaptor-common
 Description: pure-Python library for LDAP operations

Deleted: packages/ldaptor/trunk/debian/ldaptor-webui.1
===================================================================
--- packages/ldaptor/trunk/debian/ldaptor-webui.1	2011-02-13 15:03:46 UTC (rev 15626)
+++ packages/ldaptor/trunk/debian/ldaptor-webui.1	2011-02-13 16:57:00 UTC (rev 15627)
@@ -1,22 +0,0 @@
-.TH ldaptor\-webui 1 "Sat, 28 Mar 2009" "Jan Dittberner" "User Commands"
-
-.SH NAME
-ldaptor\-webui - web based user interface for ldaptor
-
-.SH SYNOPSIS
-.B ldaptor\-webui
-[\fIoptions\fR]
-
-.SH OPTIONS
-.TP
-\fB\-\-http\-port=\fR
-listen on this port [default: 38980]
-
-.SH DESCRIPTION
-.B ldaptor\-webui
-starts an http server providing a web based interface for ldaptor at
-the specified tcp port.
-
-.SH AUTHOR
-This man page was written by Jan Dittberner <jandd at debian.org> for the
-Debian GNU/Linux System (but may be used by others).

Deleted: packages/ldaptor/trunk/debian/ldaptor-webui.examples
===================================================================
--- packages/ldaptor/trunk/debian/ldaptor-webui.examples	2011-02-13 15:03:46 UTC (rev 15626)
+++ packages/ldaptor/trunk/debian/ldaptor-webui.examples	2011-02-13 16:57:00 UTC (rev 15627)
@@ -1 +0,0 @@
-doc/examples.webui/*

Deleted: packages/ldaptor/trunk/debian/ldaptor-webui.install
===================================================================
--- packages/ldaptor/trunk/debian/ldaptor-webui.install	2011-02-13 15:03:46 UTC (rev 15626)
+++ packages/ldaptor/trunk/debian/ldaptor-webui.install	2011-02-13 16:57:00 UTC (rev 15627)
@@ -1,3 +0,0 @@
-debian/tmp/usr/bin/ldaptor-webui
-debian/tmp/usr/lib/python*/*-packages/ldaptor/apps/webui
-debian/tmp/usr/share/locale/*/*/ldaptor-webui.mo

Deleted: packages/ldaptor/trunk/debian/ldaptor-webui.manpages
===================================================================
--- packages/ldaptor/trunk/debian/ldaptor-webui.manpages	2011-02-13 15:03:46 UTC (rev 15626)
+++ packages/ldaptor/trunk/debian/ldaptor-webui.manpages	2011-02-13 16:57:00 UTC (rev 15627)
@@ -1 +0,0 @@
-debian/ldaptor-webui.1
\ No newline at end of file

Added: packages/ldaptor/trunk/debian/patches/remove-webui.patch
===================================================================
--- packages/ldaptor/trunk/debian/patches/remove-webui.patch	                        (rev 0)
+++ packages/ldaptor/trunk/debian/patches/remove-webui.patch	2011-02-13 16:57:00 UTC (rev 15627)
@@ -0,0 +1,57 @@
+Subject: remove ldaptor-webui
+Author: Jan Dittberner <jandd at debian.org>
+Description: This patch removes ldaptor-webui. The ldaptor-webui code depends
+ on an ancient version of the twisted framework and is not supportable without
+ upstream porting it to a more recent version.
+
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -137,6 +137,6 @@
+ 	        -o api \
+ 		--name Ldaptor \
+ 		--url http://www.inoi.fi/open/trac/ldaptor/ \
+-		$$(find ../ldaptor \( -name SCCS -prune \) -o -name '*.py' -print)
++		$$(find ../ldaptor \( -name SCCS -prune \) -o -name '*.py' -a ! -regex '.*/webui/.*' -a ! -regex '.*/test/web/.*' -a ! -regex '.*/test/test_webui\.py' -a ! -regex '.*/test/mockweb\.py' -a ! -name 'weave.py' -print)
+ 
+ .PHONY: api
+--- a/setup.py
++++ b/setup.py
+@@ -165,11 +165,9 @@
+         "ldaptor.protocols.ldap.autofill",
+ 	"ldaptor.samba",
+ 	"ldaptor.apps",
+-	"ldaptor.apps.webui",
+ 	"ldaptor.test",
+ 	],
+ 	  scripts=[
+-	"bin/ldaptor-webui",
+ 	"bin/ldaptor-ldap2dhcpconf",
+ 	"bin/ldaptor-ldap2maradns",
+ 	"bin/ldaptor-ldap2dnszones",
+@@ -183,25 +181,4 @@
+ 	"bin/ldaptor-rename",
+ 	"bin/ldaptor-fetchschema",
+ 	],
+-          data_files=[
+-        (os.path.join(sysconfig.get_python_lib(), 'ldaptor/apps/webui'),
+-         [
+-        'ldaptor/apps/webui/add-really.xhtml',
+-        'ldaptor/apps/webui/add.xhtml',
+-        'ldaptor/apps/webui/basedn.xhtml',
+-        'ldaptor/apps/webui/change_password.xhtml',
+-        'ldaptor/apps/webui/change_service_passwords.xhtml',
+-        'ldaptor/apps/webui/delete-nodn.xhtml',
+-        'ldaptor/apps/webui/delete.xhtml',
+-        'ldaptor/apps/webui/edit-really.xhtml',
+-        'ldaptor/apps/webui/edit.xhtml',
+-        'ldaptor/apps/webui/login.xhtml',
+-        'ldaptor/apps/webui/mass_change_password-really.xhtml',
+-        'ldaptor/apps/webui/mass_change_password.xhtml',
+-        'ldaptor/apps/webui/move.xhtml',
+-        'ldaptor/apps/webui/search.xhtml',
+-
+-        'ldaptor/apps/webui/ldaptor.css',
+-        'ldaptor/apps/webui/skin-default.html',
+-        ]),
+-        ])
++        )

Modified: packages/ldaptor/trunk/debian/patches/series
===================================================================
--- packages/ldaptor/trunk/debian/patches/series	2011-02-13 15:03:46 UTC (rev 15626)
+++ packages/ldaptor/trunk/debian/patches/series	2011-02-13 16:57:00 UTC (rev 15627)
@@ -2,3 +2,4 @@
 02_fix_526522.patch
 03_fix_dia_invocation_545663.patch
 04_replace_string_exceptions_585240_585298_.patch
+remove-webui.patch

Modified: packages/ldaptor/trunk/debian/rules
===================================================================
--- packages/ldaptor/trunk/debian/rules	2011-02-13 15:03:46 UTC (rev 15626)
+++ packages/ldaptor/trunk/debian/rules	2011-02-13 16:57:00 UTC (rev 15627)
@@ -11,7 +11,7 @@
 PYDEFAULT=$(shell pyversions -d)
 
 %:
-	dh $@
+	dh --with python2 $@
 
 override_dh_install:
 	dh_install
@@ -28,7 +28,7 @@
 	touch $@
 
 override_dh_compress:
-	dh_compress -X.py -X.js
+	dh_compress -X.py -X.js -Xapi-objects.txt
 
 override_dh_auto_clean:
 	find . -type f -name '*.pyc' -delete

More information about the Python-modules-commits mailing list