[Python-modules-commits] r18886 - in packages/python-simpy/trunk/debian (6 files)

Wed Oct 12 20:04:38 UTC 2011

Date: Wednesday, October 12, 2011 @ 20:04:36
  Author: dandrimont-guest
Revision: 18886

Update for new upstream release

The upstream tarball now contains the documentation sources, so remove
the get-orig-docs-tarball rule and README.source.

Modified:
  packages/python-simpy/trunk/debian/changelog
  packages/python-simpy/trunk/debian/python-simpy-doc.doc-base
  packages/python-simpy/trunk/debian/python-simpy-doc.docs
  packages/python-simpy/trunk/debian/python-simpy.install
  packages/python-simpy/trunk/debian/rules
Deleted:
  packages/python-simpy/trunk/debian/README.source

Deleted: packages/python-simpy/trunk/debian/README.source
===================================================================

--- packages/python-simpy/trunk/debian/README.source	2011-10-12 19:57:46 UTC (rev 18885)
+++ packages/python-simpy/trunk/debian/README.source	2011-10-12 20:04:36 UTC (rev 18886)
@@ -1,11 +0,0 @@
-SimPy for Debian
-----------------
-
-The Sphinx input files for the documentation are checked out from svn,
-as seen in the 'get-orig-docs-tarball' target in debian/rules.
-
-The resulting file, python-simpy_<version>.orig_docs.tar.gz, should be
-put alongside python-simpy_<version>.orig.tar.gz for it to be
-recognized by dpkg-source.
-
- -- Nicolas Dandrimont <nicolas.dandrimont at crans.org>, Thu, 18 Aug 2011 23:35:33 +0200

Modified: packages/python-simpy/trunk/debian/changelog
===================================================================
--- packages/python-simpy/trunk/debian/changelog	2011-10-12 19:57:46 UTC (rev 18885)
+++ packages/python-simpy/trunk/debian/changelog	2011-10-12 20:04:36 UTC (rev 18886)
@@ -1,3 +1,9 @@
+python-simpy (2.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Nicolas Dandrimont <nicolas.dandrimont at crans.org>  Wed, 12 Oct 2011 22:00:13 +0200
+
 python-simpy (2.1.0-1) unstable; urgency=low
 
   * New upstream release (Closes: #463044)

Modified: packages/python-simpy/trunk/debian/python-simpy-doc.doc-base
===================================================================
--- packages/python-simpy/trunk/debian/python-simpy-doc.doc-base	2011-10-12 19:57:46 UTC (rev 18885)
+++ packages/python-simpy/trunk/debian/python-simpy-doc.doc-base	2011-10-12 20:04:36 UTC (rev 18886)
@@ -1,11 +1,11 @@
 Document: python-simpy
 Title: SimPy Manual
 Author: Tony Vignaux and Klaus Muller
-Abstract: This manual describes version 2.1.0 of SimPy,
+Abstract: This manual describes version 2.2 of SimPy,
  a Python-based simulation package.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/python-simpy-doc/SimPyDocs/index.html
-Files: /usr/share/doc/python-simpy-doc/SimPyDocs/*.html
+Index: /usr/share/doc/python-simpy-doc/html/index.html
+Files: /usr/share/doc/python-simpy-doc/html/*.html
 

Modified: packages/python-simpy/trunk/debian/python-simpy-doc.docs
===================================================================
--- packages/python-simpy/trunk/debian/python-simpy-doc.docs	2011-10-12 19:57:46 UTC (rev 18885)
+++ packages/python-simpy/trunk/debian/python-simpy-doc.docs	2011-10-12 20:04:36 UTC (rev 18886)
@@ -1,2 +1 @@
-SimPyDocs/
-SimPyModels/
+docs/html

Modified: packages/python-simpy/trunk/debian/python-simpy.install
===================================================================
--- packages/python-simpy/trunk/debian/python-simpy.install	2011-10-12 19:57:46 UTC (rev 18885)
+++ packages/python-simpy/trunk/debian/python-simpy.install	2011-10-12 20:04:36 UTC (rev 18886)
@@ -3,22 +3,11 @@
 /usr/lib/python2.*/dist-packages/SimPy/Lib.py
 /usr/lib/python2.*/dist-packages/SimPy/Lister.py
 /usr/lib/python2.*/dist-packages/SimPy/Monitor.py
-/usr/lib/python2.*/dist-packages/SimPy/MonitorTest.py
 /usr/lib/python2.*/dist-packages/SimPy/Recording.py
 /usr/lib/python2.*/dist-packages/SimPy/Simulation.py
 /usr/lib/python2.*/dist-packages/SimPy/SimulationRT.py
 /usr/lib/python2.*/dist-packages/SimPy/SimulationStep.py
 /usr/lib/python2.*/dist-packages/SimPy/SimulationTrace.py
 /usr/lib/python2.*/dist-packages/SimPy/stepping.py
-/usr/lib/python2.*/dist-packages/SimPy/testRT_Behavior_OO.py
-/usr/lib/python2.*/dist-packages/SimPy/testRT_Behavior.py
-/usr/lib/python2.*/dist-packages/SimPy/testSimPyOO.py
-/usr/lib/python2.*/dist-packages/SimPy/testSimPy.py
-/usr/lib/python2.*/dist-packages/SimPy/testSimPyRTOO.py
-/usr/lib/python2.*/dist-packages/SimPy/testSimPyRT.py
-/usr/lib/python2.*/dist-packages/SimPy/testSimPy_simident.py
-/usr/lib/python2.*/dist-packages/SimPy/testSimPyStepOO.py
-/usr/lib/python2.*/dist-packages/SimPy/testSimPyStep.py
-/usr/lib/python2.*/dist-packages/SimPy/testSimPyTraceOO.py
-/usr/lib/python2.*/dist-packages/SimPy/testSimPyTrace.py
-/usr/lib/python2.*/dist-packages/SimPy-2.1.0.egg-info
+/usr/lib/python2.*/dist-packages/SimPy/test/*
+/usr/lib/python2.*/dist-packages/SimPy-2.2.egg-info

Modified: packages/python-simpy/trunk/debian/rules
===================================================================
--- packages/python-simpy/trunk/debian/rules	2011-10-12 19:57:46 UTC (rev 18885)
+++ packages/python-simpy/trunk/debian/rules	2011-10-12 20:04:36 UTC (rev 18886)
@@ -10,17 +10,15 @@
 
 override_dh_auto_build:
 	dh_auto_build
+	mv docs/html docs/html.old && make -C docs html
 
-	mv SimPyDocs SimPyDocs.orig
-	sphinx-build docs SimPyDocs
-
 override_dh_install:
 	dh_install --fail-missing
 
 override_dh_installchangelogs:
 	dh_installchangelogs
 	# install the upstream changelog at the right place in the doc package
-	dh_installchangelogs -ppython-simpy-doc docs/Manuals/HISTORY.rst
+	dh_installchangelogs -ppython-simpy-doc docs/source/Manuals/HISTORY.rst
 
 override_dh_compress:
 	dh_compress -X.py -X.txt
@@ -33,11 +31,5 @@
 
 override_dh_auto_clean:
 	dh_auto_clean
-	if [ -d SimPyDocs.orig ]; then rm -r SimPyDocs; mv SimPyDocs.orig SimPyDocs; fi
 
-get-orig-docs-tarball:
-	mkdir -p get-orig-docs-tarball
-	svn export https://simpy.svn.sourceforge.net/svnroot/simpy/SimPy/SphinxStuff/tags/$(VERSION)release/ get-orig-docs-tarball/SphinxStuff
-	cd get-orig-docs-tarball/SphinxStuff/Tutorials && \
-            svn export https://simpy.svn.sourceforge.net/svnroot/simpy/SimPy/SphinxInputs/Tutorials/bankprograms/bankprograms_OO/
-	cd get-orig-docs-tarball/SphinxStuff && tar czvf ../python-simpy_$(VERSION).orig-docs.tar.gz .
+	if [ -d docs/html.old ]; then make -C docs clean && mv docs/html.old docs/html; fi


