[Python-modules-commits] r10160 - in packages/ldaptor/trunk/debian (9 files)
jandd at users.alioth.debian.org
jandd at users.alioth.debian.org
Wed Oct 21 13:15:24 UTC 2009
Date: Wednesday, October 21, 2009 @ 13:14:59
Author: jandd
Revision: 10160
switch from cdbs to dh7, prepare for upload
Added:
packages/ldaptor/trunk/debian/global.cfg
packages/ldaptor/trunk/debian/ldaptor-doc.docs
packages/ldaptor/trunk/debian/ldaptor-doc.examples
packages/ldaptor/trunk/debian/ldaptor-webui.examples
Modified:
packages/ldaptor/trunk/debian/README.source
packages/ldaptor/trunk/debian/changelog
packages/ldaptor/trunk/debian/compat
packages/ldaptor/trunk/debian/control
packages/ldaptor/trunk/debian/rules
Modified: packages/ldaptor/trunk/debian/README.source
===================================================================
--- packages/ldaptor/trunk/debian/README.source 2009-10-21 10:09:43 UTC (rev 10159)
+++ packages/ldaptor/trunk/debian/README.source 2009-10-21 13:14:59 UTC (rev 10160)
@@ -1,7 +1,9 @@
The original source tarball contained a debian directory. This has
been removed for version 0.43-4.
-This package uses dpatch to handle patches against upstream source
-code; you can find additional information about dpatch at
+This package uses quilt to handle patches against upstream source
+code; you can find information about how to use quilt at
- /usr/share/doc/dpatch/
+ /usr/share/doc/quilt/
+
+ -- Jan Dittberner <jandd at debian.org>, Wed, 21 Oct 2009 15:12:45 +0200
Modified: packages/ldaptor/trunk/debian/changelog
===================================================================
--- packages/ldaptor/trunk/debian/changelog 2009-10-21 10:09:43 UTC (rev 10159)
+++ packages/ldaptor/trunk/debian/changelog 2009-10-21 13:14:59 UTC (rev 10160)
@@ -1,6 +1,7 @@
-ldaptor (0.0.43-4) UNRELEASED; urgency=low
+ldaptor (0.0.43-4) unstable; urgency=low
- * switch to quilt
+ * switch from cdbs to debhelper
+ * switch from dpatch to quilt
* replaced debian/patches/00list with debian/patches/series
* replaced debian/patches/01_restore_pristine_code.dpatch with
debian/patches/01_restore_pristine_code.patch
@@ -15,11 +16,13 @@
* debian/README.source:
- add information about the removed debian directory in original
tarball
+ - replace dpatch information with quilt information
* debian/control:
- change to d.o email address
- update Standards-Version to 3.8.3 (no changes needed)
- - remove dpatch from Build-Depends
+ - remove dpatch and cdbs from Build-Depends
- add quilt to Build-Depends
+ - set minimum debhelper version to 7.0.50
- add python-docutils to Build-Depends-Indep to fix an epydoc warning
* debian/ldaptor-ldap2passwd.1, debian/ldaptor-find-server.1,
debian/ldaptor-ldap2dnszones.1, debian/ldaptor-ldap2pdns.1,
@@ -30,8 +33,12 @@
debian/ldaptor-webui.1: update email address
* debian/rules:
- use quilt instead of dpatch macros
+ - use dh instead of cdbs
+ * add debian/global.cfg, debian/ldaptor-doc.docs,
+ debian/ldaptor-doc.examples and debian/ldaptor-webui.examples from
+ removed upstream debian directory
- -- Jan Dittberner <jan at dittberner.info> Mon, 08 Jun 2009 22:26:16 +0200
+ -- Jan Dittberner <jandd at debian.org> Wed, 21 Oct 2009 15:13:00 +0200
ldaptor (0.0.43-3) unstable; urgency=low
Modified: packages/ldaptor/trunk/debian/compat
===================================================================
--- packages/ldaptor/trunk/debian/compat 2009-10-21 10:09:43 UTC (rev 10159)
+++ packages/ldaptor/trunk/debian/compat 2009-10-21 13:14:59 UTC (rev 10160)
@@ -1 +1 @@
-6
+7
Modified: packages/ldaptor/trunk/debian/control
===================================================================
--- packages/ldaptor/trunk/debian/control 2009-10-21 10:09:43 UTC (rev 10159)
+++ packages/ldaptor/trunk/debian/control 2009-10-21 13:14:59 UTC (rev 10160)
@@ -9,7 +9,7 @@
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, quilt (>= 0.40)
+Build-Depends: debhelper (>= 7.0.50), python-all-dev, quilt (>= 0.40)
XS-Python-Version: all
Homepage: http://www.inoi.fi/open/trac/ldaptor
Vcs-Svn: svn://svn.debian.org/python-modules/packages/ldaptor/trunk/
Added: packages/ldaptor/trunk/debian/global.cfg
===================================================================
--- packages/ldaptor/trunk/debian/global.cfg (rev 0)
+++ packages/ldaptor/trunk/debian/global.cfg 2009-10-21 13:14:59 UTC (rev 10160)
@@ -0,0 +1,8 @@
+# This is the global configuration file for the Ldaptor library. All
+# programs using ldaptor will obey the settings given here. User
+# configuration files in ~/.ldaptor/global.cfg and any possible
+# application-specific configuration files will override the settings
+# given here.
+#
+# Please see /usr/share/doc/ldaptor-doc/examples/global.cfg for example
+# contents.
Added: packages/ldaptor/trunk/debian/ldaptor-doc.docs
===================================================================
--- packages/ldaptor/trunk/debian/ldaptor-doc.docs (rev 0)
+++ packages/ldaptor/trunk/debian/ldaptor-doc.docs 2009-10-21 13:14:59 UTC (rev 10160)
@@ -0,0 +1,5 @@
+README
+TODO
+doc/api
+doc/addressbook-slides
+doc/ldap-intro
Added: packages/ldaptor/trunk/debian/ldaptor-doc.examples
===================================================================
--- packages/ldaptor/trunk/debian/ldaptor-doc.examples (rev 0)
+++ packages/ldaptor/trunk/debian/ldaptor-doc.examples 2009-10-21 13:14:59 UTC (rev 10160)
@@ -0,0 +1 @@
+doc/examples/*
Added: packages/ldaptor/trunk/debian/ldaptor-webui.examples
===================================================================
--- packages/ldaptor/trunk/debian/ldaptor-webui.examples (rev 0)
+++ packages/ldaptor/trunk/debian/ldaptor-webui.examples 2009-10-21 13:14:59 UTC (rev 10160)
@@ -0,0 +1 @@
+doc/examples.webui/*
Modified: packages/ldaptor/trunk/debian/rules
===================================================================
--- packages/ldaptor/trunk/debian/rules 2009-10-21 10:09:43 UTC (rev 10159)
+++ packages/ldaptor/trunk/debian/rules 2009-10-21 13:14:59 UTC (rev 10160)
@@ -1,37 +1,31 @@
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
-DEB_PYTHON_SYSTEM=pysupport
+#DEB_PYTHON_SYSTEM=pysupport
PYDEFAULT=$(shell pyversions -d)
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
+%:
+ dh --with quilt $@
-DEB_COMPRESS_EXCLUDE := .py .js
-DEB_DH_ALWAYS_EXCLUDE := .svn
-
-install/python-ldaptor::
- PYTHONPATH='debian/tmp/usr/lib/$(PYDEFAULT)/site-packages' \
- trial --tbformat=emacs --reporter=text ldaptor
-
-
-binary-install/python-ldaptor::
+override_dh_install:
+ dh_install
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
+ 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/ldaptor-utils/usr/bin/ldaptor-webui
+ PYTHONPATH=$(CURDIR)/debian/python-ldaptor/usr/lib/$(PYDEFAULT)/site-packages \
+ trial --tbformat=emacs --reporter=text ldaptor
-
-build/ldaptor-doc:: doc-stamp
+override_dh_auto_build: doc-stamp
doc-stamp:
make -C doc
touch $@
-binary-post-install/ldaptor-utils::
- rm -rf debian/ldaptor-utils/usr/bin/ldaptor-webui
+override_dh_compress:
+ dh_compress -X.py -X.js
-clean::
+override_dh_auto_clean:
find . -type f -name '*.pyc' -delete
make -C doc clean
- rm -rf _trial_temp
rm -f doc-stamp
+ rm -rf _trial_temp
More information about the Python-modules-commits
mailing list