Hi Pierre,
Thank you for your diff.
I have ready a new package from the last release of SimPy 1.7.1 using
the new Python Policy
If you would like to check it, I'm waiting for my sponsor check it too
http://cic.puj.edu.co/~abuss/debian/
Antal A. Buss
On 07/02/2006 08:42:24 AM, Pierre HABOUZIT wrote:
Hi,
Attached is the diff for my python-simpy 1.6-1.1 NMU.
--
·O· Pierre Habouzit
··O
[EMAIL PROTECTED]
OOO
http://www.madism.org
diff -u python-simpy-1.6/debian/changelog
python-simpy-1.6/debian/changelog
--- python-simpy-1.6/debian/changelog
+++ python-simpy-1.6/debian/changelog
@@ -1,3 +1,10 @@
+python-simpy (1.6-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update package to the last python policy (Closes: #373354).
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Sun, 2 Jul 2006 15:25:51
+0200
+
python-simpy (1.6-1) unstable; urgency=low
* New upstream release (closes: #313350)
diff -u python-simpy-1.6/debian/control
python-simpy-1.6/debian/control
--- python-simpy-1.6/debian/control
+++ python-simpy-1.6/debian/control
@@ -2,30 +2,22 @@
Section: python
Priority: optional
Maintainer: Antal A. Buss <[EMAIL PROTECTED]>
-Build-Depends-Indep: debhelper (>= 4.1.89), python (>= 2.3), python
(<< 2.4), python-dev
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11)
+Build-Depends-Indep: python-support (>= 0.3)
+Standards-Version: 3.7.2
Package: python-simpy
Architecture: all
Depends: ${python:Depends}
-Recommends: python-simpy-doc, python2.3-simpy-gui
+Provides: ${python:Provides}
+Replaces: python2.3-simpy
+Conflicts: python2.3-simpy
+XB-Python-Version: ${python:Versions}
+Recommends: python-simpy-doc, python-simpy-gui
Description: python-based simulation package [dummy package]
SimPy is a process-based discrete-event simulation language based
on
standard Python.
.
- This package is an empty dummy package that always depends on a
- package built for Debian's default Python version.
- .
- SimPy's homepage is http://simpy.sourceforge.net/.
-
-Package: python2.3-simpy
-Architecture: all
-Replaces: python2.2-simpy
-Depends: ${python:Depends}
-Description: python-based simulation package
- SimPy is a process-based discrete-event simulation language based
on
- standard Python.
- .
It provides the modeller with components of a simulation model.
These include processes, for active components like customers,
messages, and vehicles, and resources, for passive components that
@@ -35,9 +27,13 @@
.
SimPy's homepage is http://simpy.sourceforge.net/.
-Package: python2.3-simpy-gui
+Package: python-simpy-gui
Architecture: all
-Depends: ${python:Depends}, python2.3-simpy, python2.3-tk
+Depends: ${python:Depends}, python-simpy, python-tk
+Provides: ${python:Provides}
+Replaces: python2.3-simpy-gui
+Conflicts: python2.3-simpy-gui
+XB-Python-Version: ${python:Versions}
Description: python-based simulation package, GUI
SimPy is a process-based discrete-event simulation language based
on
standard Python.
reverted:
--- python-simpy-1.6/debian/python2.3-simpy-gui.install
+++ python-simpy-1.6.orig/debian/python2.3-simpy-gui.install
@@ -1,9 +0,0 @@
-debian/tmp/usr/lib/python2.3/site-packages/SimPy/SimGUI.py
-debian/tmp/usr/lib/python2.3/site-packages/SimPy/SimPlot.py
-debian/tmp/usr/lib/python2.3/site-packages/SimPy/tkconsole.py
-debian/tmp/usr/lib/python2.3/site-packages/SimPy/tkprogressbar.py
-debian/tmp/usr/share/doc/python2.3-simpy/html/SimGUIManual/*
-debian/tmp/usr/share/doc/python2.3-simpy/html/SimPlotManual/*
-debian/tmp/usr/share/doc/python2.3-simpy/examples/*GUI*
-debian/tmp/usr/share/doc/python2.3-simpy/examples/*Plot*
-debian/tmp/usr/share/doc/python2.3-simpy/examples/MM1.py
diff -u python-simpy-1.6/debian/rules python-simpy-1.6/debian/rules
--- python-simpy-1.6/debian/rules
+++ python-simpy-1.6/debian/rules
@@ -7,6 +7,7 @@
# This is the debhelper compatibility version to use.
export DH_COMPAT=4
+PYVERS := $(shell pyversions -r)
P23S=$(shell pwd)/debian/tmp
@@ -18,7 +19,8 @@
build-stamp: configure-stamp
dh_testdir
- python setup.py build
+ set -e; for py in $(PYVERS); do \
+ $$py setup.py build; done
touch build-stamp
build: build-stamp
@@ -28,9 +30,9 @@
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
-
+
-rm -R build
-
+
dh_clean
install: build
@@ -39,23 +41,25 @@
dh_clean -k
dh_installdirs
- python setup.py install --no-compile -O0 --root=${P23S}
+ set -e; for py in $(PYVERS); do \
+ $$py setup.py install --no-compile -O0 --root=${P23S}; \
+ done
# Copy docs
- mkdir -p ${P23S}/usr/share/doc/python2.3-simpy/html
- cp -R SimPyDocs/* ${P23S}/usr/share/doc/python2.3-simpy/html
- ln -s ../python2.3-simpy/html
${P23S}/usr/share/doc/python2.3-simpy/html/
+ mkdir -p ${P23S}/usr/share/doc/python-simpy/html
+ cp -R SimPyDocs/* ${P23S}/usr/share/doc/python-simpy/html
+ ln -s ../python-simpy/html
${P23S}/usr/share/doc/python-simpy/html/
# Copy examples
- mkdir -p ${P23S}/usr/share/doc/python2.3-simpy/examples
- cp -R SimPyModels/*
${P23S}/usr/share/doc/python2.3-simpy/examples
- ln -s ../examples
${P23S}/usr/share/doc/python2.3-simpy/html/SimPyModels
- ln -s ../html
${P23S}/usr/share/doc/python2.3-simpy/examples/SimPyDocs
+ mkdir -p ${P23S}/usr/share/doc/python-simpy/examples
+ cp -R SimPyModels/* ${P23S}/usr/share/doc/python-simpy/examples
+ ln -s ../examples
${P23S}/usr/share/doc/python-simpy/html/SimPyModels
+ ln -s ../html
${P23S}/usr/share/doc/python-simpy/examples/SimPyDocs
dh_install
# Removing '#!' call in Simpy modules (used with import)
- for i in `find debian/python2.3-simpy*/usr/lib/ -name '*.py'
-type f`; do \
+ for i in `find debian/python-simpy*/usr/lib/ -name '*.py'
-type f`; do \
sed '1s/#!.*python//' $$i > $$i.temp; \
if cmp --quiet $$i $$i.temp; then \
rm -f $$i.temp; \
@@ -94,6 +98,7 @@
dh_testroot -i
dh_installdocs -i
dh_installchangelogs CHANGES_FROM_PREVIOUS_VERSION.txt -i
+ dh_pysupport
dh_python
dh_link -i
dh_compress -i
reverted:
--- python-simpy-1.6/debian/python2.3-simpy.install
+++ python-simpy-1.6.orig/debian/python2.3-simpy.install
@@ -1,7 +0,0 @@
-debian/tmp/usr/lib/python2.3/site-packages/SimPy/Lister.py
-debian/tmp/usr/lib/python2.3/site-packages/SimPy/Monitor.py
-debian/tmp/usr/lib/python2.3/site-packages/SimPy/Simulation.py
-debian/tmp/usr/lib/python2.3/site-packages/SimPy/SimulationRT.py
-debian/tmp/usr/lib/python2.3/site-packages/SimPy/SimulationStep.py
-debian/tmp/usr/lib/python2.3/site-packages/SimPy/SimulationTrace.py
-debian/tmp/usr/lib/python2.3/site-packages/SimPy/__init__.py
diff -u python-simpy-1.6/debian/python-simpy-doc.docs
python-simpy-1.6/debian/python-simpy-doc.docs
--- python-simpy-1.6/debian/python-simpy-doc.docs
+++ python-simpy-1.6/debian/python-simpy-doc.docs
@@ -1 +1 @@
-debian/tmp/usr/share/doc/python2.3-simpy/html/html
+debian/tmp/usr/share/doc/python-simpy/html/html
diff -u python-simpy-1.6/debian/python-simpy-doc.doc-base
python-simpy-1.6/debian/python-simpy-doc.doc-base
--- python-simpy-1.6/debian/python-simpy-doc.doc-base
+++ python-simpy-1.6/debian/python-simpy-doc.doc-base
@@ -1,4 +1,4 @@
-Document: python2.3-simpy
+Document: python-simpy
Title: SimPy Manual
Author: Tony Vignaux and Klaus Muller
Abstract: This manual describes version 1.5 of SimPy,
@@ -8,4 +8,4 @@
Format: HTML
-Index: /usr/share/doc/python2.3-simpy/html/Manual.html
-Files: /usr/share/doc/python2.3-simpy/html/*.html
+Index: /usr/share/doc/python-simpy/html/Manual.html
+Files: /usr/share/doc/python-simpy/html/*.html
diff -u python-simpy-1.6/debian/python-simpy-doc.install
python-simpy-1.6/debian/python-simpy-doc.install
--- python-simpy-1.6/debian/python-simpy-doc.install
+++ python-simpy-1.6/debian/python-simpy-doc.install
@@ -1,35 +1,35 @@
-debian/tmp/usr/share/doc/python2.3-simpy/html/TheBank.html
-debian/tmp/usr/share/doc/python2.3-simpy/html/TheBank2.html
-debian/tmp/usr/share/doc/python2.3-simpy/html/Interfacing/Interfacing.html
-debian/tmp/usr/share/doc/python2.3-simpy/html/Interfacing/images
-debian/tmp/usr/share/doc/python2.3-simpy/html/Manual*
-debian/tmp/usr/share/doc/python2.3-simpy/html/SimPy_Sourcecode_Documentation
-debian/tmp/usr/share/doc/python2.3-simpy/html/SimRTManual*
-debian/tmp/usr/share/doc/python2.3-simpy/html/SimPyModels
-debian/tmp/usr/share/doc/python2.3-simpy/html/SimStepManual
-debian/tmp/usr/share/doc/python2.3-simpy/html/bankprograms
-debian/tmp/usr/share/doc/python2.3-simpy/html/TheBank.html
-debian/tmp/usr/share/doc/python2.3-simpy/html/Tracing*
-debian/tmp/usr/share/doc/python2.3-simpy/html/cheatsheet*
-debian/tmp/usr/share/doc/python2.3-simpy/html/default.css
-debian/tmp/usr/share/doc/python2.3-simpy/examples/CellularAutomata.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/Movie_renege.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/bank08renege.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/LISTOFMODELS*
-debian/tmp/usr/share/doc/python2.3-simpy/html/LISTOFMODELS*
-debian/tmp/usr/share/doc/python2.3-simpy/examples/MMC.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/Machineshop.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/Market.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/SimPy_worker_extend.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/airport.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/bcc.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/cellphone.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/centralserver.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/jacksonnetwork.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/lemmings.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/shortestPath_SimPy.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/demoSimPyEvents.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/needResources.py
-debian/tmp/usr/share/doc/python2.3-simpy/examples/SimPyDocs
-debian/tmp/usr/share/doc/python2.3-simpy/html/images
-debian/tmp/usr/share/doc/python2.3-simpy/html/index*
+debian/tmp/usr/share/doc/python-simpy/html/TheBank.html
+debian/tmp/usr/share/doc/python-simpy/html/TheBank2.html
+debian/tmp/usr/share/doc/python-simpy/html/Interfacing/Interfacing.html
+debian/tmp/usr/share/doc/python-simpy/html/Interfacing/images
+debian/tmp/usr/share/doc/python-simpy/html/Manual*
+debian/tmp/usr/share/doc/python-simpy/html/SimPy_Sourcecode_Documentation
+debian/tmp/usr/share/doc/python-simpy/html/SimRTManual*
+debian/tmp/usr/share/doc/python-simpy/html/SimPyModels
+debian/tmp/usr/share/doc/python-simpy/html/SimStepManual
+debian/tmp/usr/share/doc/python-simpy/html/bankprograms
+debian/tmp/usr/share/doc/python-simpy/html/TheBank.html
+debian/tmp/usr/share/doc/python-simpy/html/Tracing*
+debian/tmp/usr/share/doc/python-simpy/html/cheatsheet*
+debian/tmp/usr/share/doc/python-simpy/html/default.css
+debian/tmp/usr/share/doc/python-simpy/examples/CellularAutomata.py
+debian/tmp/usr/share/doc/python-simpy/examples/Movie_renege.py
+debian/tmp/usr/share/doc/python-simpy/examples/bank08renege.py
+debian/tmp/usr/share/doc/python-simpy/examples/LISTOFMODELS*
+debian/tmp/usr/share/doc/python-simpy/html/LISTOFMODELS*
+debian/tmp/usr/share/doc/python-simpy/examples/MMC.py
+debian/tmp/usr/share/doc/python-simpy/examples/Machineshop.py
+debian/tmp/usr/share/doc/python-simpy/examples/Market.py
+debian/tmp/usr/share/doc/python-simpy/examples/SimPy_worker_extend.py
+debian/tmp/usr/share/doc/python-simpy/examples/airport.py
+debian/tmp/usr/share/doc/python-simpy/examples/bcc.py
+debian/tmp/usr/share/doc/python-simpy/examples/cellphone.py
+debian/tmp/usr/share/doc/python-simpy/examples/centralserver.py
+debian/tmp/usr/share/doc/python-simpy/examples/jacksonnetwork.py
+debian/tmp/usr/share/doc/python-simpy/examples/lemmings.py
+debian/tmp/usr/share/doc/python-simpy/examples/shortestPath_SimPy.py
+debian/tmp/usr/share/doc/python-simpy/examples/demoSimPyEvents.py
+debian/tmp/usr/share/doc/python-simpy/examples/needResources.py
+debian/tmp/usr/share/doc/python-simpy/examples/SimPyDocs
+debian/tmp/usr/share/doc/python-simpy/html/images
+debian/tmp/usr/share/doc/python-simpy/html/index*
only in patch2:
unchanged:
--- python-simpy-1.6.orig/debian/python-simpy.install
+++ python-simpy-1.6/debian/python-simpy.install
@@ -0,0 +1,7 @@
+debian/tmp/usr/lib/python*/site-packages/SimPy/Lister.py
+debian/tmp/usr/lib/python*/site-packages/SimPy/Monitor.py
+debian/tmp/usr/lib/python*/site-packages/SimPy/Simulation.py
+debian/tmp/usr/lib/python*/site-packages/SimPy/SimulationRT.py
+debian/tmp/usr/lib/python*/site-packages/SimPy/SimulationStep.py
+debian/tmp/usr/lib/python*/site-packages/SimPy/SimulationTrace.py
+debian/tmp/usr/lib/python*/site-packages/SimPy/__init__.py
only in patch2:
unchanged:
--- python-simpy-1.6.orig/debian/python-simpy-gui.install
+++ python-simpy-1.6/debian/python-simpy-gui.install
@@ -0,0 +1,9 @@
+debian/tmp/usr/lib/python*/site-packages/SimPy/SimGUI.py
+debian/tmp/usr/lib/python*/site-packages/SimPy/SimPlot.py
+debian/tmp/usr/lib/python*/site-packages/SimPy/tkconsole.py
+debian/tmp/usr/lib/python*/site-packages/SimPy/tkprogressbar.py
+debian/tmp/usr/share/doc/python-simpy/html/SimGUIManual/*
+debian/tmp/usr/share/doc/python-simpy/html/SimPlotManual/*
+debian/tmp/usr/share/doc/python-simpy/examples/*GUI*
+debian/tmp/usr/share/doc/python-simpy/examples/*Plot*
+debian/tmp/usr/share/doc/python-simpy/examples/MM1.py
only in patch2:
unchanged:
--- python-simpy-1.6.orig/debian/pycompat
+++ python-simpy-1.6/debian/pycompat
@@ -0,0 +1 @@
+2