[Python-modules-commits] r6857 - in packages/matplotlib/trunk/debian (6 files)

Fri Nov 7 23:46:28 UTC 2008

Date: Friday, November 7, 2008 @ 23:46:28
  Author: bdrung-guest
Revision: 6857

Move content of debian/patches/setup.cfg.patch to debian/Debian-setup.cfg and
add debian/Ubuntu-setup.cfg to set the default backend to TkAgg for Ubuntu.

Added:
  packages/matplotlib/trunk/debian/Debian-setup.cfg
  packages/matplotlib/trunk/debian/Ubuntu-setup.cfg
Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/series
  packages/matplotlib/trunk/debian/rules
Deleted:
  packages/matplotlib/trunk/debian/patches/setup.cfg.patch

Added: packages/matplotlib/trunk/debian/Debian-setup.cfg
===================================================================

--- packages/matplotlib/trunk/debian/Debian-setup.cfg	                        (rev 0)
+++ packages/matplotlib/trunk/debian/Debian-setup.cfg	2008-11-07 23:46:28 UTC (rev 6857)
@@ -0,0 +1,13 @@
+[rc_options]
+# User-configurable options
+#
+# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg,
+# GTKCairo, FltkAgg, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
+#
+# The Agg, Ps, Pdf and SVG backends do not require external
+# dependencies. Do not choose GTK, GTKAgg, GTKCairo, TkAgg or WXAgg if
+# you have disabled the relevent extension modules.  Agg will be used
+# by default.
+#
+backend = GTKAgg
+

Added: packages/matplotlib/trunk/debian/Ubuntu-setup.cfg
===================================================================
--- packages/matplotlib/trunk/debian/Ubuntu-setup.cfg	                        (rev 0)
+++ packages/matplotlib/trunk/debian/Ubuntu-setup.cfg	2008-11-07 23:46:28 UTC (rev 6857)
@@ -0,0 +1,13 @@
+[rc_options]
+# User-configurable options
+#
+# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg,
+# GTKCairo, FltkAgg, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
+#
+# The Agg, Ps, Pdf and SVG backends do not require external
+# dependencies. Do not choose GTK, GTKAgg, GTKCairo, TkAgg or WXAgg if
+# you have disabled the relevent extension modules.  Agg will be used
+# by default.
+#
+backend = TkAgg
+

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2008-11-07 23:21:28 UTC (rev 6856)
+++ packages/matplotlib/trunk/debian/changelog	2008-11-07 23:46:28 UTC (rev 6857)
@@ -6,12 +6,15 @@
       python-enthought-traits
     - merged python-tk into GUI Python packages alternative dependency list
     - add myself to uploaders
+  * Move content of debian/patches/setup.cfg.patch to
+    debian/Debian-setup.cfg and add debian/Ubuntu-setup.cfg to set the
+    default backend to TkAgg for Ubuntu
 
   [ Sandro Tosi ]
   * debian/control
     - switch Vcs-Browser field to viewsvn
 
- -- Benjamin Drung <benjamin.drung at gmail.com>  Sat, 01 Nov 2008 00:01:00 +0100
+ -- Benjamin Drung <benjamin.drung at gmail.com>  Sat, 08 Nov 2008 00:33:36 +0100
 
 matplotlib (0.98.3-5) unstable; urgency=medium
 

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2008-11-07 23:21:28 UTC (rev 6856)
+++ packages/matplotlib/trunk/debian/patches/series	2008-11-07 23:46:28 UTC (rev 6857)
@@ -2,5 +2,4 @@
 matplotlibrc_fix.patch
 matplotlibrc.template-typo.patch
 doc_graphviz_errors_fix.patch
-setup.cfg.patch
 bts-498229_axes3d_typo.patch

Deleted: packages/matplotlib/trunk/debian/patches/setup.cfg.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/setup.cfg.patch	2008-11-07 23:21:28 UTC (rev 6856)
+++ packages/matplotlib/trunk/debian/patches/setup.cfg.patch	2008-11-07 23:46:28 UTC (rev 6857)
@@ -1,94 +0,0 @@
-Index: matplotlib-0.98.3/setup.cfg
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ matplotlib-0.98.3/setup.cfg	2008-10-30 19:54:04.578766737 +0100
-@@ -0,0 +1,89 @@
-+## Patch created by Sandro Tosi <morph at debian.org> -- 2008-10-30
-+##
-+## DP: File added (based on setup.cfg.template of 0.98.3) to configure
-+## DP: the default GUI backend (GTKAgg). Could be used to other build configuration
-+
-+
-+
-+# Rename this file to setup.cfg to modify matplotlib's
-+# build options.
-+
-+[egg_info]
-+tag_svn_revision = 1
-+
-+[status]
-+# To suppress display of the dependencies and their versions
-+# at the top of the build log, uncomment the following line:
-+#suppress = True
-+#
-+# Uncomment to insert lots of diagnostic prints in extension code
-+#verbose = True
-+
-+[provide_packages]
-+# By default, matplotlib checks for a few dependencies and
-+# installs them if missing. This feature can be turned off
-+# by uncommenting the following lines. Acceptible values are:
-+#     True: install, overwrite an existing installation
-+#     False: do not install
-+#     auto: install only if the package is unavailable. This
-+#           is the default behavior
-+#
-+## Date/timezone support:
-+#pytz = False
-+#dateutil = False
-+#
-+## Experimental config package support, this should only be enabled by
-+## matplotlib developers, for matplotlib development
-+#enthought.traits = False
-+#configobj = False
-+
-+[gui_support]
-+# Matplotlib supports multiple GUI toolkits, including Cocoa,
-+# GTK, Fltk, Qt, Qt4, Tk, and WX. Support for many of these
-+# toolkits requires AGG, the Anti-Grain Geometry library, which
-+# is provided by matplotlib and built by default.
-+#
-+# Some backends are written in pure Python, and others require
-+# extension code to be compiled. By default, matplotlib checks
-+# for these GUI toolkits during installation and, if present,
-+# compiles the required extensions to support the toolkit. GTK
-+# support requires the GTK runtime environment and PyGTK. Wx
-+# support requires wxWidgets and wxPython. Tk support requires
-+# Tk and Tkinter. The other GUI toolkits do not require any
-+# extension code, and can be used as long as the libraries are
-+# installed on your system.
-+#
-+# You can uncomment any the following lines if you know you do
-+# not want to use the GUI toolkit. Acceptible values are:
-+#     True: build the extension. Exits with a warning if the
-+#           required dependencies are not available
-+#     False: do not build the extension
-+#     auto: build if the required dependencies are available,
-+#           otherwise skip silently. This is the default
-+#           behavior
-+#
-+#gtk = False
-+#gtkagg = False
-+#tkagg = False
-+#wxagg = False
-+
-+[rc_options]
-+# User-configurable options
-+#
-+# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg,
-+# GTKCairo, FltkAgg, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
-+#
-+# The Agg, Ps, Pdf and SVG backends do not require external
-+# dependencies. Do not choose GTK, GTKAgg, GTKCairo, TkAgg or WXAgg if
-+# you have disabled the relevent extension modules.  Agg will be used
-+# by default.
-+#
-+backend = GTKAgg
-+#
-+# The numerix module was historically used to provide
-+# compatibility between the Numeric, numarray, and NumPy array
-+# packages. Now that NumPy has emerge as the universal array
-+# package for python, numerix is not really necessary and is
-+# maintained to provide backward compatibility. Do not change
-+# this unless you have a compelling reason to do so.
-+#numerix = numpy

Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules	2008-11-07 23:21:28 UTC (rev 6856)
+++ packages/matplotlib/trunk/debian/rules	2008-11-07 23:46:28 UTC (rev 6857)
@@ -9,6 +9,7 @@
 PYVERS := $(shell pyversions -v -r debian/control)
 DEFPY := $(shell pyversions -v -d)
 PY_PLATFORM=$(shell python -c 'from distutils.util import get_platform; print get_platform()')
+builddist = $(shell lsb_release -si)
 pd  := python-matplotlib-doc
 p   := python-matplotlib
 pdata := python-matplotlib-data
@@ -34,6 +35,7 @@
 build-stamp-%:
 	dh_testdir
 
+	cp -f debian/${builddist}-setup.cfg setup.cfg
 	python$* ./setup.py build $(PY_BUILD_FLAGS)
 	python$*-dbg ./setup.py build $(PY_BUILD_FLAGS)
 
@@ -55,6 +57,7 @@
 	-rm -rf build *.pyc *.pyo
 
 	rm -f lib/matplotlib/mpl-data/matplotlib.conf lib/matplotlib/mpl-data/matplotlibrc doc/mpl_data/matplotlib.conf doc/mpl_data/matplotlibrc
+	rm -f setup.cfg
 
 	# clean the doc
 	( cd doc ; ./make.py clean )


