[Python-modules-commits] r13998 - in packages/objgraph/trunk/debian (10 files)

Sun Jul 18 18:06:47 UTC 2010

Date: Sunday, July 18, 2010 @ 18:06:39
  Author: stefanor-guest
Revision: 13998

* New upstream release.
* Convert to dh_python2.
* Bump Standards-Version to 3.9.0 (no changes needed).
* Suggest: xdot (now packaged)
* Refresh patches.
* Drop dont-call-xdot.patch: Now builds and runs with or without an xdot in
  PATH.
* Drop README.Debian: Upstream fixed the issues we were warning about.
* Add examples: examples.txt and finalizers.png

Added:
  packages/objgraph/trunk/debian/clean
Modified:
  packages/objgraph/trunk/debian/changelog
  packages/objgraph/trunk/debian/control
  packages/objgraph/trunk/debian/docs
  packages/objgraph/trunk/debian/examples
  packages/objgraph/trunk/debian/patches/excise-setuptools.diff
  packages/objgraph/trunk/debian/patches/series
  packages/objgraph/trunk/debian/rules
Deleted:
  packages/objgraph/trunk/debian/README.Debian
  packages/objgraph/trunk/debian/patches/dont-call-xdot.patch

Deleted: packages/objgraph/trunk/debian/README.Debian
===================================================================

--- packages/objgraph/trunk/debian/README.Debian	2010-07-18 16:44:30 UTC (rev 13997)
+++ packages/objgraph/trunk/debian/README.Debian	2010-07-18 18:06:39 UTC (rev 13998)
@@ -1,11 +0,0 @@
-objgraph for Debian
--------------------
-
-The version of objgraph in Debian has been modified to never call xdot (as it
-isn't available on Debian).
-
-Module-authors using this should be aware that certain functions (show_graph,
-show_refs, show_backrefs) will create files called objects.dot and objects.png
-in the current directory. Use these functions with caution.
-
- -- Stefano Rivera <stefano at rivera.za.net>  Fri, 29 Jan 2010 19:45:10 +0200

Modified: packages/objgraph/trunk/debian/changelog
===================================================================
--- packages/objgraph/trunk/debian/changelog	2010-07-18 16:44:30 UTC (rev 13997)
+++ packages/objgraph/trunk/debian/changelog	2010-07-18 18:06:39 UTC (rev 13998)
@@ -1,8 +1,16 @@
-objgraph (1.2-2) UNRELEASED; urgency=low
+objgraph (1.3.1-1) UNRELEASED; urgency=low
 
-  * Build-Depend on python (to shush lintian).
+  * New upstream release.
+  * Convert to dh_python2.
+  * Bump Standards-Version to 3.9.0 (no changes needed).
+  * Suggest: xdot (now packaged)
+  * Refresh patches.
+  * Drop dont-call-xdot.patch: Now builds and runs with or without an xdot in
+    PATH.
+  * Drop README.Debian: Upstream fixed the issues we were warning about.
+  * Add examples: examples.txt and finalizers.png
 
- -- Stefano Rivera <stefano at rivera.za.net>  Tue, 04 May 2010 17:01:51 +0200
+ -- Stefano Rivera <stefano at rivera.za.net>  Sun, 18 Jul 2010 20:03:58 +0200
 
 objgraph (1.2-1) unstable; urgency=low
 

Added: packages/objgraph/trunk/debian/clean
===================================================================
--- packages/objgraph/trunk/debian/clean	                        (rev 0)
+++ packages/objgraph/trunk/debian/clean	2010-07-18 18:06:39 UTC (rev 13998)
@@ -0,0 +1,3 @@
+*.png
+Makefile
+*.egg-info/*

Modified: packages/objgraph/trunk/debian/control
===================================================================
--- packages/objgraph/trunk/debian/control	2010-07-18 16:44:30 UTC (rev 13997)
+++ packages/objgraph/trunk/debian/control	2010-07-18 18:06:39 UTC (rev 13998)
@@ -3,17 +3,19 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Stefano Rivera <stefano at rivera.za.net>
-Build-Depends: debhelper (>= 7.0.50~), python-support (>= 0.8), python, graphviz
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.5), graphviz
+Standards-Version: 3.9.0
 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/
-XS-Python-Version: all
+XS-Python-Version: >= 2.4
 
 Package: python-objgraph
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
+Breaks: ${python:Breaks}
 Recommends: graphviz
+Suggests: xdot
 Description: Ad-hoc tools for drawing Python object reference graphs with graphviz
  objgraph contains a set of utility functions for exploring Python objects in
  memory.

Modified: packages/objgraph/trunk/debian/docs
===================================================================
--- packages/objgraph/trunk/debian/docs	2010-07-18 16:44:30 UTC (rev 13997)
+++ packages/objgraph/trunk/debian/docs	2010-07-18 18:06:39 UTC (rev 13998)
@@ -1,2 +1 @@
 README.txt
-debian/README.Debian

Modified: packages/objgraph/trunk/debian/examples
===================================================================
--- packages/objgraph/trunk/debian/examples	2010-07-18 16:44:30 UTC (rev 13997)
+++ packages/objgraph/trunk/debian/examples	2010-07-18 18:06:39 UTC (rev 13998)
@@ -1 +1,2 @@
-sample*-graph.png
+*.png
+examples.txt

Deleted: packages/objgraph/trunk/debian/patches/dont-call-xdot.patch
===================================================================
--- packages/objgraph/trunk/debian/patches/dont-call-xdot.patch	2010-07-18 16:44:30 UTC (rev 13997)
+++ packages/objgraph/trunk/debian/patches/dont-call-xdot.patch	2010-07-18 18:06:39 UTC (rev 13998)
@@ -1,33 +0,0 @@
-Description: xdot isn't packaged for Debian, so don't try to call it.
-Author: Stefano Rivera <stefano at rivera.za.net>
-Forwarded: not-needed
-Last-Update: 2010-01-29
-
---- a/objgraph.py
-+++ b/objgraph.py
-@@ -35,7 +35,7 @@
- 
- Object boxes are less crammed with useless information (such as IDs).
- 
--Spawns xdot if it is available.
-+Spawns xdot if it is available [Disabled on Debian].
- """
- # Permission is hereby granted, free of charge, to any person obtaining a
- # copy of this software and associated documentation files (the "Software"),
-@@ -207,6 +207,7 @@
- 
-     Produces a Graphviz .dot file and spawns a viewer (xdot) if one is
-     installed, otherwise converts the graph to a .png image.
-+    The xdot functionality is disabled on Debian.
- 
-     Use ``max_depth`` and ``too_many`` to limit the depth and breadth of the
-     graph.
-@@ -333,7 +334,7 @@
-     print >> f, "}"
-     f.close()
-     print "Graph written to objects.dot (%d nodes)" % nodes
--    if os.system('which xdot >/dev/null') == 0:
-+    if False: # Disabled on Debian: os.system('which xdot >/dev/null') == 0:
-         print "Spawning graph viewer (xdot)"
-         os.system("xdot objects.dot &")
-     else:

Modified: packages/objgraph/trunk/debian/patches/excise-setuptools.diff
===================================================================
--- packages/objgraph/trunk/debian/patches/excise-setuptools.diff	2010-07-18 16:44:30 UTC (rev 13997)
+++ packages/objgraph/trunk/debian/patches/excise-setuptools.diff	2010-07-18 18:06:39 UTC (rev 13998)
@@ -3,16 +3,16 @@
 Author: Stefano Rivera <stefano at rivera.za.net>
 Forwarded: not-needed
 Last-Updated: 2010-01-25
-
 --- a/setup.py
 +++ b/setup.py
-@@ -1,9 +1,6 @@
- import os, sys
+@@ -1,10 +1,7 @@
+ #!/usr/bin/python
+ import os, sys, doctest
  
 -try:
 -    from setuptools import setup
 -except ImportError:
--    from distutils import setup
+-    from distutils.core import setup
 +from distutils.core import setup
  
  

Modified: packages/objgraph/trunk/debian/patches/series
===================================================================
--- packages/objgraph/trunk/debian/patches/series	2010-07-18 16:44:30 UTC (rev 13997)
+++ packages/objgraph/trunk/debian/patches/series	2010-07-18 18:06:39 UTC (rev 13998)
@@ -1,2 +1 @@
-dont-call-xdot.patch
 excise-setuptools.diff

Modified: packages/objgraph/trunk/debian/rules
===================================================================
--- packages/objgraph/trunk/debian/rules	2010-07-18 16:44:30 UTC (rev 13997)
+++ packages/objgraph/trunk/debian/rules	2010-07-18 18:06:39 UTC (rev 13998)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with python2
 
 override_dh_auto_build:
 	dh_auto_build


