[Python-modules-commits] r238 - in
/packages/python-medusa/trunk/debian: changelog control control.in
copyright postinst prerm python-medusa-doc.dirs python-medusa-doc.install
python-medusa.postinst python-medusa.prerm rules
arnau-guest at users.alioth.debian.org
arnau-guest at users.alioth.debian.org
Tue Apr 18 20:34:32 UTC 2006
Author: arnau-guest
Date: Tue Apr 18 20:34:30 2006
New Revision: 238
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=238
Log:
Use python-support. Fix a lot of packaging problems reported by
Torsten Marek.
Added:
packages/python-medusa/trunk/debian/postinst
packages/python-medusa/trunk/debian/prerm
packages/python-medusa/trunk/debian/python-medusa-doc.dirs
packages/python-medusa/trunk/debian/python-medusa-doc.install
packages/python-medusa/trunk/debian/python-medusa.postinst
packages/python-medusa/trunk/debian/python-medusa.prerm
Modified:
packages/python-medusa/trunk/debian/changelog
packages/python-medusa/trunk/debian/control
packages/python-medusa/trunk/debian/control.in
packages/python-medusa/trunk/debian/copyright
packages/python-medusa/trunk/debian/rules
Modified: packages/python-medusa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-medusa/trunk/debian/changelog?rev=238&op=diff
==============================================================================
--- packages/python-medusa/trunk/debian/changelog (original)
+++ packages/python-medusa/trunk/debian/changelog Tue Apr 18 20:34:30 2006
@@ -2,13 +2,14 @@
* New maintainer. Closes: #362532.
* Add debian-python team to the Uploaders field (debian/control.in).
- * Add python-medusa-doc, python2.4-medusa and remove
- python2.1-medusa, python2.2-medusa packages (debian/control.in).
+ * Add python-medusa-doc and remove python2.1-medusa,
+ python2.2-medusa packages (debian/control.in). Closes: #351143.
* Use cdbs in order to build the package.
* Change section from 'net' to 'python' (debian/control.in).
* Update the Standards-Version field to policy version 3.6.2.2
(debian/control.in).
-
+ * Update debian/copyright.
+
-- Arnaud Fontaine <arnaud at andesi.org> Fri, 14 Apr 2006 17:54:30 +0200
python-medusa (0.5.4-2) unstable; urgency=low
Modified: packages/python-medusa/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-medusa/trunk/debian/control?rev=238&op=diff
==============================================================================
--- packages/python-medusa/trunk/debian/control (original)
+++ packages/python-medusa/trunk/debian/control Tue Apr 18 20:34:30 2006
@@ -4,19 +4,18 @@
Maintainer: Arnaud Fontaine <arnaud at andesi.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Standards-Version: 3.6.2.2
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), python-dev (>= 2.3), python2.3-dev, python2.4-dev
+Build-Depends-Indep: cdbs (>= 0.4.23-1.1), debhelper (>= 5), patchutils (>= 0.2.25), python-support, python-dev
Package: python-medusa
Architecture: all
-Depends: python2.3-medusa
+Replaces: python2.1-medusa, python2.2-medusa, python2.3-medusa
+Conflicts: python2.1-medusa, python2.2-medusa, python2.3-medusa
+Depends: python (>=2.3)
Suggests: python-medusa-doc
Description: Framework for implementing asynchronous servers
Medusa is a 'server platform' -- it provides a framework for
implementing asynchronous socket-based servers (TCP/IP and on Unix,
Unix domain, sockets).
- .
- This is a "dummy" package that will cause the Medusa package for
- Debian's default Python version to always be present on your system.
.
Homepage: http://www.amk.ca/python/code/medusa.html
@@ -31,29 +30,3 @@
This package contains the documentation for Medusa.
.
Homepage: http://www.amk.ca/python/code/medusa.html
-
-Package: python2.3-medusa
-Architecture: all
-Depends: ${python:Depends}
-Suggests: python-medusa-doc
-Description: Framework for implementing asynchronous servers
- Medusa is a 'server platform' -- it provides a framework for
- implementing asynchronous socket-based servers (TCP/IP and on Unix,
- Unix domain, sockets).
- .
- This package is for python 2.3.
- .
- Homepage: http://www.amk.ca/python/code/medusa.html
-
-Package: python2.4-medusa
-Architecture: all
-Depends: ${python:Depends}
-Suggests: python-medusa-doc
-Description: Framework for implementing asynchronous servers
- Medusa is a 'server platform' -- it provides a framework for
- implementing asynchronous socket-based servers (TCP/IP and on Unix,
- Unix domain, sockets).
- .
- This package is for Python 2.4.
- .
- Homepage: http://www.amk.ca/python/code/medusa.html
Modified: packages/python-medusa/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/python-modules/packages/python-medusa/trunk/debian/control.in?rev=238&op=diff
==============================================================================
--- packages/python-medusa/trunk/debian/control.in (original)
+++ packages/python-medusa/trunk/debian/control.in Tue Apr 18 20:34:30 2006
@@ -4,19 +4,18 @@
Maintainer: Arnaud Fontaine <arnaud at andesi.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Standards-Version: 3.6.2.2
-Build-Depends: @cdbs@, python-dev (>= 2.3), python2.3-dev, python2.4-dev
+Build-Depends-Indep: @cdbs@, python-support, python-dev
Package: python-medusa
Architecture: all
-Depends: python2.3-medusa
+Replaces: python2.1-medusa, python2.2-medusa, python2.3-medusa
+Conflicts: python2.1-medusa, python2.2-medusa, python2.3-medusa
+Depends: python (>=2.3)
Suggests: python-medusa-doc
Description: Framework for implementing asynchronous servers
Medusa is a 'server platform' -- it provides a framework for
implementing asynchronous socket-based servers (TCP/IP and on Unix,
Unix domain, sockets).
- .
- This is a "dummy" package that will cause the Medusa package for
- Debian's default Python version to always be present on your system.
.
Homepage: http://www.amk.ca/python/code/medusa.html
@@ -31,29 +30,3 @@
This package contains the documentation for Medusa.
.
Homepage: http://www.amk.ca/python/code/medusa.html
-
-Package: python2.3-medusa
-Architecture: all
-Depends: ${python:Depends}
-Suggests: python-medusa-doc
-Description: Framework for implementing asynchronous servers
- Medusa is a 'server platform' -- it provides a framework for
- implementing asynchronous socket-based servers (TCP/IP and on Unix,
- Unix domain, sockets).
- .
- This package is for python 2.3.
- .
- Homepage: http://www.amk.ca/python/code/medusa.html
-
-Package: python2.4-medusa
-Architecture: all
-Depends: ${python:Depends}
-Suggests: python-medusa-doc
-Description: Framework for implementing asynchronous servers
- Medusa is a 'server platform' -- it provides a framework for
- implementing asynchronous socket-based servers (TCP/IP and on Unix,
- Unix domain, sockets).
- .
- This package is for Python 2.4.
- .
- Homepage: http://www.amk.ca/python/code/medusa.html
Modified: packages/python-medusa/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/python-modules/packages/python-medusa/trunk/debian/copyright?rev=238&op=diff
==============================================================================
--- packages/python-medusa/trunk/debian/copyright (original)
+++ packages/python-medusa/trunk/debian/copyright Tue Apr 18 20:34:30 2006
@@ -1,24 +1,26 @@
-This package was debianized by A.M. Kuchling <amk at amk.ca> on
-Fri, 22 Aug 2003 08:54:11 -0400.
+This package was debianized by A.M. Kuchling <amk at amk.ca> on Fri, 22
+Aug 2003 08:54:11 -0400 and is maintained by Arnaud Fontaine
+<arnaud at andesi.org> since April 2006.
It was downloaded from www.amk.ca/python/code/medusa.html
-Upstream Author: A.M. Kuchling <amk at amk.ca>
+Author: A.M. Kuchling <amk at amk.ca>
-Copyright:
+Copyright: 1996-2006 A.M. Kuchling <amk at amk.ca>
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Sam Rushing not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+ Permission to use, copy, modify, and distribute this software and
+ its documentation for any purpose and without fee is hereby
+ granted, provided that the above copyright notice appear in all
+ copies and that both that copyright notice and this permission
+ notice appear in supporting documentation, and that the name of Sam
+ Rushing not be used in advertising or publicity pertaining to
+ distribution of the software without specific, written prior
+ permission.
-SAM RUSHING DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-NO EVENT SHALL SAM RUSHING BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ SAM RUSHING DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ NO EVENT SHALL SAM RUSHING BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Added: packages/python-medusa/trunk/debian/postinst
URL: http://svn.debian.org/wsvn/python-modules/packages/python-medusa/trunk/debian/postinst?rev=238&op=file
==============================================================================
--- packages/python-medusa/trunk/debian/postinst (added)
+++ packages/python-medusa/trunk/debian/postinst Tue Apr 18 20:34:30 2006
@@ -1,0 +1,5 @@
+#! /bin/sh
+set -e
+#DEBHELPER#
+exit 0
+
Added: packages/python-medusa/trunk/debian/prerm
URL: http://svn.debian.org/wsvn/python-modules/packages/python-medusa/trunk/debian/prerm?rev=238&op=file
==============================================================================
--- packages/python-medusa/trunk/debian/prerm (added)
+++ packages/python-medusa/trunk/debian/prerm Tue Apr 18 20:34:30 2006
@@ -1,0 +1,5 @@
+#! /bin/sh
+set -e
+#DEBHELPER#
+exit 0
+
Added: packages/python-medusa/trunk/debian/python-medusa-doc.dirs
URL: http://svn.debian.org/wsvn/python-modules/packages/python-medusa/trunk/debian/python-medusa-doc.dirs?rev=238&op=file
==============================================================================
--- packages/python-medusa/trunk/debian/python-medusa-doc.dirs (added)
+++ packages/python-medusa/trunk/debian/python-medusa-doc.dirs Tue Apr 18 20:34:30 2006
@@ -1,0 +1,2 @@
+usr/share/doc/python-medusa-doc/html
+usr/share/doc/python-medusa-doc/txt
Added: packages/python-medusa/trunk/debian/python-medusa-doc.install
URL: http://svn.debian.org/wsvn/python-modules/packages/python-medusa/trunk/debian/python-medusa-doc.install?rev=238&op=file
==============================================================================
--- packages/python-medusa/trunk/debian/python-medusa-doc.install (added)
+++ packages/python-medusa/trunk/debian/python-medusa-doc.install Tue Apr 18 20:34:30 2006
@@ -1,0 +1,3 @@
+docs/*.{html,gif} usr/share/doc/python-medusa-doc/html
+docs/*.txt usr/share/doc/python-medusa-doc/txt
+
Added: packages/python-medusa/trunk/debian/python-medusa.postinst
URL: http://svn.debian.org/wsvn/python-modules/packages/python-medusa/trunk/debian/python-medusa.postinst?rev=238&op=file
==============================================================================
--- packages/python-medusa/trunk/debian/python-medusa.postinst (added)
+++ packages/python-medusa/trunk/debian/python-medusa.postinst Tue Apr 18 20:34:30 2006
@@ -1,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "configure" ] && which update-python-modules >/dev/null 2>&1; then
+ update-python-modules -i /usr/share/python-support/medusa
+fi
Added: packages/python-medusa/trunk/debian/python-medusa.prerm
URL: http://svn.debian.org/wsvn/python-modules/packages/python-medusa/trunk/debian/python-medusa.prerm?rev=238&op=file
==============================================================================
--- packages/python-medusa/trunk/debian/python-medusa.prerm (added)
+++ packages/python-medusa/trunk/debian/python-medusa.prerm Tue Apr 18 20:34:30 2006
@@ -1,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if which update-python-modules >/dev/null 2>&1; then
+ update-python-modules -c -i /usr/share/python-support/medusa
+fi
Modified: packages/python-medusa/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-medusa/trunk/debian/rules?rev=238&op=diff
==============================================================================
--- packages/python-medusa/trunk/debian/rules (original)
+++ packages/python-medusa/trunk/debian/rules Tue Apr 18 20:34:30 2006
@@ -1,22 +1,32 @@
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
-# Common rules
+# python-distutils before debhelper to avoid it calling dh_python
+# itself
+include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
# Don't compress .py files
DEB_COMPRESS_EXCLUDE := .py
-DEB_INSTALL_DOCS_ALL += README.txt TODO.txt CHANGES.txt
+DEB_INSTALL_DOCS_ALL += README.txt TODO.txt
+DEB_INSTALL_CHANGELOGS_ALL += CHANGES.txt
-binary-install/python-medusa-doc::
- mkdir debian/$(patsubst binary-install/%,%,$@)/usr/share/doc/$(patsubst binary-install/%,%,$@)/{txt,html}
- cp -r docs/*.{gif,html} \
- debian/$(patsubst binary-install/%,%,$@)/usr/share/doc/$(patsubst binary-install/%,%,$@)/html
+# python-support stuff (based on python-cherrypy, thanks to its
+# maintainer)
+DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0
+PYVER=$(shell python -V 2>&1 | cut -d ' ' -f 2 | cut -d . -f 1-2)
- cp -r docs/*.txt \
- debian/$(patsubst binary-install/%,%,$@)/usr/share/doc/$(patsubst binary-install/%,%,$@)/txt
+common-binary-post-install-indep::
+ mkdir -p debian/python-medusa/usr/share/python-support/medusa/
+ mv debian/python-medusa/usr/lib/python${PYVER}/site-packages/* \
+ debian/python-medusa/usr/share/python-support/medusa/
+
+ # Clean the python-medusa-doc packages by removing *.py files
+ rm -rf debian/python-medusa-doc/usr/lib
+
+ # Clean the python-impacket packages by removing obsolete stuff
+ rm -rf debian/python-medusa/usr/lib
$(patsubst %,binary-install/%,$(filter-out python-medusa-doc,$(DEB_ALL_PACKAGES)))::
cp debian/README.Debian \
More information about the Python-modules-commits
mailing list