[Python-modules-commits] r15116 - in packages/objgraph/trunk/debian (13 files)

stefanor-guest at users.alioth.debian.org stefanor-guest at users.alioth.debian.org
Sat Dec 18 15:18:31 UTC 2010


    Date: Saturday, December 18, 2010 @ 15:18:25
  Author: stefanor-guest
Revision: 15116

* New upstream release.
  - Adds Python 3.x support (LP: #687601)
* Refresh patches.
* Use upstream example images, rather than re-generating. (LP: #686731)

Added:
  packages/objgraph/trunk/debian/python-objgraph.doc-base
    (from rev 15098, packages/objgraph/trunk/debian/doc-base)
  packages/objgraph/trunk/debian/python-objgraph.docs
    (from rev 15098, packages/objgraph/trunk/debian/docs)
  packages/objgraph/trunk/debian/python-objgraph.links
    (from rev 15098, packages/objgraph/trunk/debian/links)
  packages/objgraph/trunk/debian/python3-objgraph.doc-base
    (from rev 15098, packages/objgraph/trunk/debian/doc-base)
  packages/objgraph/trunk/debian/python3-objgraph.docs
    (from rev 15098, packages/objgraph/trunk/debian/docs)
  packages/objgraph/trunk/debian/python3-objgraph.links
    (from rev 15098, packages/objgraph/trunk/debian/links)
Modified:
  packages/objgraph/trunk/debian/changelog
  packages/objgraph/trunk/debian/control
  packages/objgraph/trunk/debian/patches/excise-setuptools.diff
  packages/objgraph/trunk/debian/rules
Deleted:
  packages/objgraph/trunk/debian/doc-base
  packages/objgraph/trunk/debian/docs
  packages/objgraph/trunk/debian/links

Modified: packages/objgraph/trunk/debian/changelog
===================================================================
--- packages/objgraph/trunk/debian/changelog	2010-12-18 14:10:53 UTC (rev 15115)
+++ packages/objgraph/trunk/debian/changelog	2010-12-18 15:18:25 UTC (rev 15116)
@@ -1,3 +1,12 @@
+objgraph (1.6.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - Adds Python 3.x support (LP: #687601)
+  * Refresh patches.
+  * Use upstream example images, rather than re-generating. (LP: #686731)
+
+ -- Stefano Rivera <stefano at rivera.za.net>  Sat, 18 Dec 2010 16:35:11 +0200
+
 objgraph (1.5.0-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/objgraph/trunk/debian/control
===================================================================
--- packages/objgraph/trunk/debian/control	2010-12-18 14:10:53 UTC (rev 15115)
+++ packages/objgraph/trunk/debian/control	2010-12-18 15:18:25 UTC (rev 15116)
@@ -7,12 +7,14 @@
  debhelper (>= 7.0.50~),
  graphviz,
  python-all (>= 2.6.5-13~),
- python-sphinx
+ python-sphinx,
+ python3-all (>= 3.1.2-6~)
 Standards-Version: 3.9.1
 Homepage: http://mg.pov.lt/objgraph/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/objgraph/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/objgraph/trunk/
 X-Python-Version: >= 2.4
+X-Python3-Version: >= 3.0
 
 Package: python-objgraph
 Architecture: all
@@ -26,3 +28,15 @@
  It can be used for counting and statistics, finding root references
  responsible for large object trees and export the object reference graphs in
  graphviz format.
+
+Package: python3-objgraph
+Architecture: all
+Depends: libjs-jquery, ${misc:Depends}, ${python3:Depends}
+Recommends: graphviz
+Suggests: xdot
+Description: Module for exploring Python object reference graphs
+ objgraph is a module that lets you visually explore Python object graphs.
+ .
+ It can be used for counting and statistics, finding root references
+ responsible for large object trees and export the object reference graphs in
+ graphviz format.

Deleted: packages/objgraph/trunk/debian/doc-base
===================================================================
--- packages/objgraph/trunk/debian/doc-base	2010-12-18 14:10:53 UTC (rev 15115)
+++ packages/objgraph/trunk/debian/doc-base	2010-12-18 15:18:25 UTC (rev 15116)
@@ -1,9 +0,0 @@
-Document: python-objgraph
-Title: Python Object Graphs
-Author: Marius Gedminas
-Abstract: objgraph is a module that lets you visually explore Python object graphs
-Section: Programming/Python
-
-Format: HTML
-Index: /usr/share/doc/python-objgraph/html/index.html
-Files: /usr/share/doc/python-objgraph/html/*.html

Deleted: packages/objgraph/trunk/debian/docs
===================================================================
--- packages/objgraph/trunk/debian/docs	2010-12-18 14:10:53 UTC (rev 15115)
+++ packages/objgraph/trunk/debian/docs	2010-12-18 15:18:25 UTC (rev 15116)
@@ -1 +0,0 @@
-_build/html

Deleted: packages/objgraph/trunk/debian/links
===================================================================
--- packages/objgraph/trunk/debian/links	2010-12-18 14:10:53 UTC (rev 15115)
+++ packages/objgraph/trunk/debian/links	2010-12-18 15:18:25 UTC (rev 15116)
@@ -1,2 +0,0 @@
-/usr/share/javascript/jquery/jquery.js       /usr/share/doc/python-objgraph/html/_static/jquery.js
-/usr/share/doc/python-objgraph/html/_sources /usr/share/doc/python-objgraph/text

Modified: packages/objgraph/trunk/debian/patches/excise-setuptools.diff
===================================================================
--- packages/objgraph/trunk/debian/patches/excise-setuptools.diff	2010-12-18 14:10:53 UTC (rev 15115)
+++ packages/objgraph/trunk/debian/patches/excise-setuptools.diff	2010-12-18 15:18:25 UTC (rev 15116)
@@ -7,7 +7,7 @@
 +++ b/setup.py
 @@ -1,10 +1,7 @@
  #!/usr/bin/python
- import os, sys, unittest, doctest, glob
+ import os, re, sys, unittest, doctest
  
 -try:
 -    from setuptools import setup

Copied: packages/objgraph/trunk/debian/python-objgraph.doc-base (from rev 15098, packages/objgraph/trunk/debian/doc-base)
===================================================================
--- packages/objgraph/trunk/debian/python-objgraph.doc-base	                        (rev 0)
+++ packages/objgraph/trunk/debian/python-objgraph.doc-base	2010-12-18 15:18:25 UTC (rev 15116)
@@ -0,0 +1,9 @@
+Document: python-objgraph
+Title: Python Object Graphs
+Author: Marius Gedminas
+Abstract: objgraph is a module that lets you visually explore Python object graphs
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python-objgraph/html/index.html
+Files: /usr/share/doc/python-objgraph/html/*.html

Copied: packages/objgraph/trunk/debian/python-objgraph.docs (from rev 15098, packages/objgraph/trunk/debian/docs)
===================================================================
--- packages/objgraph/trunk/debian/python-objgraph.docs	                        (rev 0)
+++ packages/objgraph/trunk/debian/python-objgraph.docs	2010-12-18 15:18:25 UTC (rev 15116)
@@ -0,0 +1 @@
+docs/_build/html

Copied: packages/objgraph/trunk/debian/python-objgraph.links (from rev 15098, packages/objgraph/trunk/debian/links)
===================================================================
--- packages/objgraph/trunk/debian/python-objgraph.links	                        (rev 0)
+++ packages/objgraph/trunk/debian/python-objgraph.links	2010-12-18 15:18:25 UTC (rev 15116)
@@ -0,0 +1,2 @@
+/usr/share/javascript/jquery/jquery.js       /usr/share/doc/python-objgraph/html/_static/jquery.js
+/usr/share/doc/python-objgraph/html/_sources /usr/share/doc/python-objgraph/text

Copied: packages/objgraph/trunk/debian/python3-objgraph.doc-base (from rev 15098, packages/objgraph/trunk/debian/doc-base)
===================================================================
--- packages/objgraph/trunk/debian/python3-objgraph.doc-base	                        (rev 0)
+++ packages/objgraph/trunk/debian/python3-objgraph.doc-base	2010-12-18 15:18:25 UTC (rev 15116)
@@ -0,0 +1,9 @@
+Document: python3-objgraph
+Title: Python Object Graphs
+Author: Marius Gedminas
+Abstract: objgraph is a module that lets you visually explore Python object graphs
+Section: Programming/Python
+
+Format: HTML
+Index: /usr/share/doc/python3-objgraph/html/index.html
+Files: /usr/share/doc/python3-objgraph/html/*.html

Copied: packages/objgraph/trunk/debian/python3-objgraph.docs (from rev 15098, packages/objgraph/trunk/debian/docs)
===================================================================
--- packages/objgraph/trunk/debian/python3-objgraph.docs	                        (rev 0)
+++ packages/objgraph/trunk/debian/python3-objgraph.docs	2010-12-18 15:18:25 UTC (rev 15116)
@@ -0,0 +1 @@
+docs/_build/html

Copied: packages/objgraph/trunk/debian/python3-objgraph.links (from rev 15098, packages/objgraph/trunk/debian/links)
===================================================================
--- packages/objgraph/trunk/debian/python3-objgraph.links	                        (rev 0)
+++ packages/objgraph/trunk/debian/python3-objgraph.links	2010-12-18 15:18:25 UTC (rev 15116)
@@ -0,0 +1,2 @@
+/usr/share/javascript/jquery/jquery.js        /usr/share/doc/python3-objgraph/html/_static/jquery.js
+/usr/share/doc/python3-objgraph/html/_sources /usr/share/doc/python3-objgraph/text

Modified: packages/objgraph/trunk/debian/rules
===================================================================
--- packages/objgraph/trunk/debian/rules	2010-12-18 14:10:53 UTC (rev 15115)
+++ packages/objgraph/trunk/debian/rules	2010-12-18 15:18:25 UTC (rev 15116)
@@ -1,19 +1,45 @@
 #!/usr/bin/make -f
 
+PYVERS :=  $(shell pyversions -r)
+PY3VERS := $(shell py3versions -r)
+
 %:
-	dh $@ --with python2 --buildsystem=python_distutils
+	dh $@ --with python2,python3
 
 override_dh_auto_build:
-	dh_auto_build --buildsystem=python_distutils
-	$(MAKE) images
+	set -e; \
+		for py in $(PYVERS) $(PY3VERS); do \
+			$$py setup.py build; \
+		done
 	$(MAKE) docs SPHINXOPTS=-NE
 
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	set -e; \
+		for py in $(PYVERS) $(PY3VERS); do \
+			$$py tests.py; \
+		done
+endif
+
+override_dh_auto_install:
+	set -e; \
+		for py in $(PYVERS); do \
+			$$py setup.py install --skip-build --root debian/python-objgraph --install-layout=deb; \
+		done
+	set -e; \
+		for py in $(PY3VERS); do \
+			$$py setup.py install --skip-build --root debian/python3-objgraph --install-layout=deb; \
+		done
+
+override_dh_auto_clean:
+	dh_auto_clean --buildsystem=python_distutils
+	rm -rf build docs/_build
+
 override_dh_installdocs:
 	dh_installdocs -Xhtml/_static/jquery.js
 
+override_dh_installchangelogs:
+	dh_installchangelogs CHANGES.txt
+
 override_dh_compress:
 	dh_compress -X.js
-
-override_dh_clean:
-	dh_clean
-	rm -rf _build




More information about the Python-modules-commits mailing list