[Python-modules-commits] r19737 - in packages/nose/trunk/debian (29 files)
cjsmo-guest at users.alioth.debian.org
cjsmo-guest at users.alioth.debian.org
Mon Dec 26 17:41:04 UTC 2011
Date: Monday, December 26, 2011 @ 17:41:02
Author: cjsmo-guest
Revision: 19737
* New Upstream release. Closes: #646394
* Switched to source format 3.0 (quilt).
* Package builds twice in a row now. Closes: #608678
* Increased debian/compat to 7.
* Removed debian/pyversions, moving to debian/rules.
* Updated debian/copyright to DEP5.
* Updated debian/watch so it now works.
* debian/control
- update to build py3 package. Closes: #604038, #647920
- added X-P-V and X-P3-V.
- increased debhelper version to >= 7.0.50~
- increased python version to python-all (>= 2.6.6-3~)
- B-D on python3-all
- B-D on python3-setuptools
- B-D on libjs-jquery
- B-D on libjs-underscore.
- B-D on python-coverage for unittests.
- remove B-D on cdbs and python-support
- added python3-nose binary stanza
- depend on python3-pkg-resources for py3 package.
- removed python-coverage from py3-nose Suggest: field
- updated py3-nose Description.
- add myself to uploaders
* debian/rules
- updated to use dh_python2 Closes: #631406
- removed embeded jquery.js, underscore.js and linked to system libs.
Closes: #636079
Added:
packages/nose/trunk/debian/patches/
packages/nose/trunk/debian/patches/01_setup.py_fix.patch
packages/nose/trunk/debian/patches/02_manpage_fix.patch
packages/nose/trunk/debian/patches/series
packages/nose/trunk/debian/python-nose.doc-base
packages/nose/trunk/debian/python-nose.docs
packages/nose/trunk/debian/python-nose.examples
packages/nose/trunk/debian/python-nose.links
packages/nose/trunk/debian/python-nose.postinst
packages/nose/trunk/debian/python-nose.prerm
packages/nose/trunk/debian/python3-nose.doc-base
packages/nose/trunk/debian/python3-nose.docs
packages/nose/trunk/debian/python3-nose.examples
packages/nose/trunk/debian/python3-nose.links
packages/nose/trunk/debian/python3-nose.postinst
packages/nose/trunk/debian/python3-nose.prerm
Modified:
packages/nose/trunk/debian/changelog
packages/nose/trunk/debian/compat
packages/nose/trunk/debian/control
packages/nose/trunk/debian/copyright
packages/nose/trunk/debian/rules
packages/nose/trunk/debian/source/format
packages/nose/trunk/debian/watch
Deleted:
packages/nose/trunk/debian/doc-base
packages/nose/trunk/debian/docs
packages/nose/trunk/debian/examples
packages/nose/trunk/debian/links
packages/nose/trunk/debian/manpages
packages/nose/trunk/debian/pyversions
Modified: packages/nose/trunk/debian/changelog
===================================================================
--- packages/nose/trunk/debian/changelog 2011-12-26 15:59:18 UTC (rev 19736)
+++ packages/nose/trunk/debian/changelog 2011-12-26 17:41:02 UTC (rev 19737)
@@ -1,10 +1,35 @@
-nose (1.0.0-2) UNRELEASED; urgency=low
+nose (1.1.2-1) UNRELEASED; urgency=low
- [ Piotr Ożarowski ]
- * New binary package: python3-nose (closes: #604038)
- - bump minimum required CDBS version to 0.4.90
+ [ Charlie Smotherman ]
+ * New Upstream release. Closes: #646394
+ * Switched to source format 3.0 (quilt).
+ * Package builds twice in a row now. Closes: #608678
+ * Increased debian/compat to 7.
+ * Removed debian/pyversions, moving to debian/rules.
+ * Updated debian/copyright to DEP5.
+ * Updated debian/watch so it now works.
+ * debian/control
+ - update to build py3 package. Closes: #604038, #647920
+ - added X-P-V and X-P3-V.
+ - increased debhelper version to >= 7.0.50~
+ - increased python version to python-all (>= 2.6.6-3~)
+ - B-D on python3-all
+ - B-D on python3-setuptools
+ - B-D on libjs-jquery
+ - B-D on libjs-underscore.
+ - B-D on python-coverage for unittests.
+ - remove B-D on cdbs and python-support
+ - added python3-nose binary stanza
+ - depend on python3-pkg-resources for py3 package.
+ - removed python-coverage from py3-nose Suggest: field
+ - updated py3-nose Description.
+ - add myself to uploaders
+ * debian/rules
+ - updated to use dh_python2 Closes: #631406
+ - removed embeded jquery.js, underscore.js and linked to system libs.
+ Closes: #636079
- -- Piotr Ożarowski <piotr at debian.org> Fri, 17 Dec 2010 22:21:39 +0100
+ -- Charlie Smotherman <cjsmo at cableone.net> Mon, 26 Dec 2011 19:38:12 -0500
nose (1.0.0-1) unstable; urgency=low
@@ -19,6 +44,7 @@
* Remove build dir in clean target
-- Piotr Ożarowski <piotr at debian.org> Sun, 17 Apr 2011 22:13:12 +0200
+
nose (0.11.1-1) unstable; urgency=low
* New upstream release
Modified: packages/nose/trunk/debian/compat
===================================================================
--- packages/nose/trunk/debian/compat 2011-12-26 15:59:18 UTC (rev 19736)
+++ packages/nose/trunk/debian/compat 2011-12-26 17:41:02 UTC (rev 19737)
@@ -1 +1 @@
-5
+7
Modified: packages/nose/trunk/debian/control
===================================================================
--- packages/nose/trunk/debian/control 2011-12-26 15:59:18 UTC (rev 19736)
+++ packages/nose/trunk/debian/control 2011-12-26 17:41:02 UTC (rev 19737)
@@ -2,17 +2,29 @@
Section: python
Priority: optional
Maintainer: Gustavo Noronha Silva <kov at debian.org>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>, Torsten Marek <shlomme at debian.org>
-Build-Depends: python (>= 2.5.4-1~), python3, python-setuptools (>= 0.6a9), python3-setuptools, debhelper (>= 5.0.38), cdbs (>= 0.4.90), python-support (>= 0.8.1), python-sphinx (>= 0.6.1), libjs-jquery
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>,
+ Torsten Marek <shlomme at debian.org>, Charlie Smotherman <cjsmo at cableone.net>
+Build-Depends: debhelper (>= 7.0.50~),
+ python-all (>= 2.6.6-3~),
+ python3-all,
+ python-setuptools (>= 0.6a9),
+ python3-setuptools,
+ python-sphinx (>= 0.6.1),
+ python3-sphinx,
+ python-nose,
+ python-coverage,
+ libjs-jquery,
+ libjs-underscore
+X-Python-Version: >= 2.5
+X-Python3-Version: >= 3.2
+Standards-Version: 3.9.2
Homepage: http://somethingaboutorange.com/mrl/projects/nose/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/nose/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/nose/trunk/
-Standards-Version: 3.8.1
Package: python-nose
Architecture: all
Depends: ${python:Depends}, python-pkg-resources, ${misc:Depends}
-Suggests: python-coverage
Description: test discovery and running for Python's unittest
nose provides an alternate test discovery and running process for
unittest, one that is intended to mimic the behavior of py.test as
@@ -21,7 +33,7 @@
Package: python3-nose
Architecture: all
Depends: ${python3:Depends}, python3-pkg-resources, ${misc:Depends}
-Description: test discovery and running for Python's unittest
- nose provides an alternate test discovery and running process for
+Description: test discovery and running for Python3 unittest
+ nose provides an alternate test discovery and running process for Python3
unittest, one that is intended to mimic the behavior of py.test as
much as is reasonably possible without resorting to too much magic
Modified: packages/nose/trunk/debian/copyright
===================================================================
--- packages/nose/trunk/debian/copyright 2011-12-26 15:59:18 UTC (rev 19736)
+++ packages/nose/trunk/debian/copyright 2011-12-26 17:41:02 UTC (rev 19737)
@@ -1,27 +1,68 @@
-This package was debianized by Gustavo Noronha Silva <kov at debian.org> on
-Sun, 07 May 2006 22:54:10 -0300.
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Upstream-Name: nose
+Upstream-Contact: Jason Pellerin
+Source: http://somethingaboutorange.com/mrl/projects/nose/
-It was downloaded from http://somethingaboutorange.com/mrl/projects/nose/
+Files: *
+Copyright: 2005-2006 Jason Pellerin
+License: LGPL
-Copyright:
+Files: debian/*
+Copyright: 2006-2010 Gustavo Noronha Silva <kov at debian.org>,
+ 2010 Charlie Smotherman <cjsmo at cableone.net>
+License: LGPL
-Copyright (C) 2005-2006 Jason Pellerin
+Files: patch.py
+Copyright: 2008-2010 Anatoly Techtonik
+ 2010 Alex Stewart <alex at foogod.com>
+License: EXPAT
-License:
+Files: doc/manpage.py
+Copyright: Engelbert Gruber <grubert at users.sourceforge.net>
+License: public-domain
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+Files: nose/ext/dtcompat.py
+Copyright: Tim Peters (tim at python.org),
+ Jim Fulton,
+ Edward Loper
+License: public-domain
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
+License: LGPL
+ This library is free software; you can redistribute it and/or modify it under
+ the terms of the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at your option) any
+ later version.
+ .
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU Lesser General Public License along
+ with this library; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+Comment: On Debian systems, the LGPL version 2 license can be found at
+ /usr/share/common-licenses/LGPL-2.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+License: EXPAT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
- On Debian systems, the LGPL version 2 license can be found at
- /usr/share/common-licenses/LGPL-2.
+License: public-domain
+ No license required for any purpose, the work is not subject to copyright in
+ any jurisdiction.s
Deleted: packages/nose/trunk/debian/doc-base
===================================================================
--- packages/nose/trunk/debian/doc-base 2011-12-26 15:59:18 UTC (rev 19736)
+++ packages/nose/trunk/debian/doc-base 2011-12-26 17:41:02 UTC (rev 19737)
@@ -1,13 +0,0 @@
-Document: nose
-Title: Unit Testing Extensions for Python
-Author: Phil Thompson
-Abstract: Unit Testing Extensions for Python
- This is the documentation for nose, an extension of the
- Python unittest framework that supports simple test
- collection, a simplified API for writing tests
- and many useful plugins.
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-nose/html/index.html
-Files: /usr/share/doc/python-nose/html/*.html
Deleted: packages/nose/trunk/debian/docs
===================================================================
--- packages/nose/trunk/debian/docs 2011-12-26 15:59:18 UTC (rev 19736)
+++ packages/nose/trunk/debian/docs 2011-12-26 17:41:02 UTC (rev 19737)
@@ -1,2 +0,0 @@
-README.txt
-build/sphinx/html/
Deleted: packages/nose/trunk/debian/examples
===================================================================
--- packages/nose/trunk/debian/examples 2011-12-26 15:59:18 UTC (rev 19736)
+++ packages/nose/trunk/debian/examples 2011-12-26 17:41:02 UTC (rev 19737)
@@ -1 +0,0 @@
-examples/*
Deleted: packages/nose/trunk/debian/links
===================================================================
--- packages/nose/trunk/debian/links 2011-12-26 15:59:18 UTC (rev 19736)
+++ packages/nose/trunk/debian/links 2011-12-26 17:41:02 UTC (rev 19737)
@@ -1 +0,0 @@
-usr/share/javascript/jquery/jquery.js usr/share/doc/python-nose/html/_static/jquery.js
Deleted: packages/nose/trunk/debian/manpages
===================================================================
--- packages/nose/trunk/debian/manpages 2011-12-26 15:59:18 UTC (rev 19736)
+++ packages/nose/trunk/debian/manpages 2011-12-26 17:41:02 UTC (rev 19737)
@@ -1 +0,0 @@
-nosetests.1
Added: packages/nose/trunk/debian/patches/01_setup.py_fix.patch
===================================================================
--- packages/nose/trunk/debian/patches/01_setup.py_fix.patch (rev 0)
+++ packages/nose/trunk/debian/patches/01_setup.py_fix.patch 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1,17 @@
+Description: Not install manpage with setup.py, we do this with debhelper so
+ we can use update-alternatives to manage the manpages.
+Author: Charlie Smotherman <cjsmo at cableone.net>
+
+Index: nose-1.1.2/setup.py
+===================================================================
+--- nose-1.1.2.orig/setup.py 2011-07-30 18:49:15.000000000 -0500
++++ nose-1.1.2/setup.py 2011-12-23 23:34:11.931711403 -0600
+@@ -102,7 +102,7 @@
+ license = 'GNU LGPL',
+ keywords = 'test unittest doctest automatic discovery',
+ url = 'http://readthedocs.org/docs/nose/',
+- data_files = [('man/man1', ['nosetests.1'])],
++ #data_files = [('man/man1', ['nosetests.1'])],
+ package_data = {'': ['*.txt',
+ 'examples/*.py',
+ 'examples/*/*.py']},
Added: packages/nose/trunk/debian/patches/02_manpage_fix.patch
===================================================================
--- packages/nose/trunk/debian/patches/02_manpage_fix.patch (rev 0)
+++ packages/nose/trunk/debian/patches/02_manpage_fix.patch 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1,34 @@
+Description: Fixes formatting errors, this quiets lintian.
+Author: Charlie Smotherman <cjsmo at cableone.net>
+
+Index: nose-1.1.2/nosetests.1
+===================================================================
+--- nose-1.1.2.orig/nosetests.1 2011-12-24 00:39:58.000000000 -0600
++++ nose-1.1.2/nosetests.1 2011-12-24 01:24:15.387678280 -0600
+@@ -2,16 +2,10 @@
+ .SH NAME
+ nosetests \- nicer testing for python
+ .\" Man page generated from reStructeredText.
+-.INDENT 0.0
+-.UNINDENT
+
+ .SH SYNOPSIS
+-.INDENT 0.0
+-.INDENT 3.5
+-nosetests [options] [names]
+
+-.UNINDENT
+-.UNINDENT
++nosetests [options] [names]
+
+ .SH DESCRIPTION
+ nose collects tests automatically from python source files,
+@@ -82,7 +76,7 @@
+ In addition to passing command\-line options, you may also put
+ configuration options in your project\'s \fIsetup.cfg\fP file, or a .noserc
+ or nose.cfg file in your home directory. In any of these standard
+-.ini\-style config files, you put your nosetests configuration in a
++ini\-style config files, you put your nosetests configuration in a
+ \fB[nosetests]\fP section. Options are the same as on the command line,
+ with the \-\- prefix removed. For options that are simple switches, you
+ must supply a value:
Added: packages/nose/trunk/debian/patches/series
===================================================================
--- packages/nose/trunk/debian/patches/series (rev 0)
+++ packages/nose/trunk/debian/patches/series 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1,2 @@
+02_manpage_fix.patch
+01_setup.py_fix.patch
Added: packages/nose/trunk/debian/python-nose.doc-base
===================================================================
--- packages/nose/trunk/debian/python-nose.doc-base (rev 0)
+++ packages/nose/trunk/debian/python-nose.doc-base 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1,13 @@
+Document: nose
+Title: Unit Testing Extensions for Python
+Author: Phil Thompson
+Abstract: Unit Testing Extensions for Python
+ This is the documentation for nose, an extension of the
+ Python unittest framework that supports simple test
+ collection, a simplified API for writing tests
+ and many useful plugins.
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-nose/html/index.html
+Files: /usr/share/doc/python-nose/html/*.html
Added: packages/nose/trunk/debian/python-nose.docs
===================================================================
--- packages/nose/trunk/debian/python-nose.docs (rev 0)
+++ packages/nose/trunk/debian/python-nose.docs 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1,2 @@
+README.txt
+build/sphinx/html/
Added: packages/nose/trunk/debian/python-nose.examples
===================================================================
--- packages/nose/trunk/debian/python-nose.examples (rev 0)
+++ packages/nose/trunk/debian/python-nose.examples 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1 @@
+examples/*
Added: packages/nose/trunk/debian/python-nose.links
===================================================================
--- packages/nose/trunk/debian/python-nose.links (rev 0)
+++ packages/nose/trunk/debian/python-nose.links 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1,2 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/python-nose/html/_static/jquery.js
+usr/share/javascript/underscore/underscore.js usr/share/doc/python-nose/html/_static/underscore.js
Added: packages/nose/trunk/debian/python-nose.postinst
===================================================================
--- packages/nose/trunk/debian/python-nose.postinst (rev 0)
+++ packages/nose/trunk/debian/python-nose.postinst 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ configure)
+ #make sure /usr/bin/nosetests is removed then let
+ #update-alternatives create the needed symlink.
+ if [ -f /usr/bin/nosetests ] && [ ! -h /usr/bin/nosetests ]; then
+ rm -f /usr/bin/nosetests
+ fi
+ update-alternatives --install /usr/bin/nosetests \
+ nosetests \
+ /usr/bin/nosetests_py2 10 \
+ --slave /usr/share/man/man1/nosetests.1.gz \
+ nosetests.1.gz \
+ /usr/share/man/man1/nosetests_py2.1.gz
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: packages/nose/trunk/debian/python-nose.prerm
===================================================================
--- packages/nose/trunk/debian/python-nose.prerm (rev 0)
+++ packages/nose/trunk/debian/python-nose.prerm 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ remove|deconfigure)
+ update-alternatives --remove nosetests /usr/bin/nosetests_py2
+ ;;
+
+ upgrade|failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: packages/nose/trunk/debian/python3-nose.doc-base
===================================================================
--- packages/nose/trunk/debian/python3-nose.doc-base (rev 0)
+++ packages/nose/trunk/debian/python3-nose.doc-base 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1,13 @@
+Document: nose
+Title: Unit Testing Extensions for Python3
+Author: Phil Thompson
+Abstract: Unit Testing Extensions for Python3
+ This is the documentation for nose, an extension of the
+ Python3 unittest framework that supports simple test
+ collection, a simplified API for writing tests
+ and many useful plugins.
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python3-nose/html/index.html
+Files: /usr/share/doc/python3-nose/html/*.html
Added: packages/nose/trunk/debian/python3-nose.docs
===================================================================
--- packages/nose/trunk/debian/python3-nose.docs (rev 0)
+++ packages/nose/trunk/debian/python3-nose.docs 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1,2 @@
+README.txt
+build/sphinx/html/
Added: packages/nose/trunk/debian/python3-nose.examples
===================================================================
--- packages/nose/trunk/debian/python3-nose.examples (rev 0)
+++ packages/nose/trunk/debian/python3-nose.examples 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1 @@
+examples/*
Added: packages/nose/trunk/debian/python3-nose.links
===================================================================
--- packages/nose/trunk/debian/python3-nose.links (rev 0)
+++ packages/nose/trunk/debian/python3-nose.links 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1,2 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/python3-nose/html/_static/jquery.js
+usr/share/javascript/underscore/underscore.js usr/share/doc/python3-nose/html/_static/underscore.js
Added: packages/nose/trunk/debian/python3-nose.postinst
===================================================================
--- packages/nose/trunk/debian/python3-nose.postinst (rev 0)
+++ packages/nose/trunk/debian/python3-nose.postinst 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ configure)
+ #make sure /usr/bin/nosetests is removed then let
+ #update-alternatives create the needed symlink.
+ if [ -f /usr/bin/nosetests ] && [ ! -h /usr/bin/nosetests ]; then
+ rm -f /usr/bin/nosetests
+ fi
+ update-alternatives --install /usr/bin/nosetests \
+ nosetests \
+ /usr/bin/nosetests_py3 10 \
+ --slave /usr/share/man/man1/nosetests.1.gz \
+ nosetests.1.gz \
+ /usr/share/man/man1/nosetests_py3.1.gz
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Added: packages/nose/trunk/debian/python3-nose.prerm
===================================================================
--- packages/nose/trunk/debian/python3-nose.prerm (rev 0)
+++ packages/nose/trunk/debian/python3-nose.prerm 2011-12-26 17:41:02 UTC (rev 19737)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ remove|deconfigure)
+ update-alternatives --remove nosetests /usr/bin/nosetests_py3
+ ;;
+
+ upgrade|failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Deleted: packages/nose/trunk/debian/pyversions
===================================================================
--- packages/nose/trunk/debian/pyversions 2011-12-26 15:59:18 UTC (rev 19736)
+++ packages/nose/trunk/debian/pyversions 2011-12-26 17:41:02 UTC (rev 19737)
@@ -1 +0,0 @@
-2.3-
Modified: packages/nose/trunk/debian/rules
===================================================================
--- packages/nose/trunk/debian/rules 2011-12-26 15:59:18 UTC (rev 19736)
+++ packages/nose/trunk/debian/rules 2011-12-26 17:41:02 UTC (rev 19737)
@@ -1,28 +1,62 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM=pysupport
-DEB_PYTHON_DESTDIR=debian/python-nose
-DEB_PYTHON3_DESTDIR=debian/python3-nose
-DEB_COMPRESS_EXCLUDE= .js .inv
+#get our python versions
+PYVERS := $(shell pyversions -r)
+PY3VERS := $(shell py3versions -r)
+DESTDIR2 := $(CURDIR)/debian/python-nose
+DESTDIR3 := $(CURDIR)/debian/python3-nose
-include /usr/share/cdbs/1/rules/buildcore.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/class/python3-distutils.mk
+%:
+ dh $@ --with python2,python3
-DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed --install-layout=deb
+override_dh_auto_build:
+ set -e; \
+ for py in $(PYVERS) $(PY3VERS); do \
+ $$py setup.py build; \
+ done
+ set -e; \
+ for py in $(PYVERS); do\
+ $$py setup.py build_sphinx; \
+ done
+ set -e; \
+ for py in $(PY3VERS); do \
+ $$py setup.py build_sphinx; \
+ done
-common-build-indep/$(DEB_PYTHON_MODULE_PACKAGES)::
- python setup.py build_sphinx
+override_dh_auto_test:
+ set -e; \
+ for py in $(PYVERS); do \
+ $$py setup.py nosetests -v; \
+ done
-binary-post-install/python-nose::
- # the manpage is already being installed at the correct place
- # remove the incorrect path
- rm -rf debian/python-nose/usr/man debian/python3-nose/usr/man
+override_dh_auto_clean:
+ rm -rf build
-binary-post-install/python3-nose::
- # nosetests is provided in python-nose package
- cd debian/python3-nose/usr/bin/ && mv nosetests nosetests-3
+override_dh_auto_install:
+ set -e; \
+ for py in $(PYVERS); do \
+ $$py setup.py install --skip-build --root debian/python-nose \
+ --install-layout deb; \
+ done
+ set -e; \
+ for py in $(PY3VERS); do \
+ $$py setup.py install --skip-build --root debian/python3-nose \
+ --install-layout deb; \
+ done
+ mv $(DESTDIR2)/usr/bin/nosetests \
+ $(DESTDIR2)/usr/bin/nosetests_py2
+ mv $(DESTDIR3)/usr/bin/nosetests \
+ $(DESTDIR3)/usr/bin/nosetests_py3
+ rm $(DESTDIR2)/usr/bin/nosetests-*
+ rm $(DESTDIR3)/usr/bin/nosetests-*
-clean::
- rm -rf build
\ No newline at end of file
+override_dh_install:
+ dh_install -Xjquery.js -Xunderscore.js
+
+override_dh_installman:
+ cp nosetests.1 nosetests_py2.1
+ dh_installman -p python-nose nosetests_py2.1
+ cp nosetests.1 nosetests_py3.1
+ dh_installman -p python3-nose nosetests_py3.1
+
+
Modified: packages/nose/trunk/debian/source/format
===================================================================
--- packages/nose/trunk/debian/source/format 2011-12-26 15:59:18 UTC (rev 19736)
+++ packages/nose/trunk/debian/source/format 2011-12-26 17:41:02 UTC (rev 19737)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
Modified: packages/nose/trunk/debian/watch
===================================================================
--- packages/nose/trunk/debian/watch 2011-12-26 15:59:18 UTC (rev 19736)
+++ packages/nose/trunk/debian/watch 2011-12-26 17:41:02 UTC (rev 19737)
@@ -1,4 +1,2 @@
version=3
-opts="downloadurlmangle=s|/([0-9.]+)/$|/nose-$1.tar.gz|,filenamemangle=s|.*/([0-9.]+)/|nose-$1.tar.gz|" \
- http://somethingaboutorange.com/mrl/projects/nose/ \
- ./([0-9.]+)/
+http://pypi.python.org/packages/source/n/nose/nose-([0-9.]+).tar.gz
More information about the Python-modules-commits
mailing list