[Python-modules-commits] r6865 - in packages/matplotlib/trunk/debian (5 files)

[morph at users.alioth.debian.org]

    Date: Saturday, November 8, 2008 @ 18:06:16
  Author: morph
Revision: 6865

uniform debian/setup.cfg for debian and ubuntu

Added:
  packages/matplotlib/trunk/debian/setup.cfg
    (from rev 6864, packages/matplotlib/trunk/debian/Debian-setup.cfg)
Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/rules
Deleted:
  packages/matplotlib/trunk/debian/Debian-setup.cfg
  packages/matplotlib/trunk/debian/Ubuntu-setup.cfg

Deleted: packages/matplotlib/trunk/debian/Debian-setup.cfg
===================================================================
--- packages/matplotlib/trunk/debian/Debian-setup.cfg	2008-11-08 05:22:18 UTC (rev 6864)
+++ packages/matplotlib/trunk/debian/Debian-setup.cfg	2008-11-08 18:06:16 UTC (rev 6865)
@@ -1,13 +0,0 @@
-[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
-

Deleted: packages/matplotlib/trunk/debian/Ubuntu-setup.cfg
===================================================================
--- packages/matplotlib/trunk/debian/Ubuntu-setup.cfg	2008-11-08 05:22:18 UTC (rev 6864)
+++ packages/matplotlib/trunk/debian/Ubuntu-setup.cfg	2008-11-08 18:06:16 UTC (rev 6865)
@@ -1,13 +0,0 @@
-[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-08 05:22:18 UTC (rev 6864)
+++ packages/matplotlib/trunk/debian/changelog	2008-11-08 18:06:16 UTC (rev 6865)
@@ -7,8 +7,7 @@
     - 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
+    debian/setup.cfg to set the default backend to TkAgg
 
   [ Sandro Tosi ]
   * debian/control

Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules	2008-11-08 05:22:18 UTC (rev 6864)
+++ packages/matplotlib/trunk/debian/rules	2008-11-08 18:06:16 UTC (rev 6865)
@@ -9,7 +9,6 @@
 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
@@ -35,7 +34,7 @@
 build-stamp-%:
 	dh_testdir
 
-	cp -f debian/${builddist}-setup.cfg setup.cfg
+	cp -f debian/setup.cfg setup.cfg
 	python$* ./setup.py build $(PY_BUILD_FLAGS)
 	python$*-dbg ./setup.py build $(PY_BUILD_FLAGS)
 

Copied: packages/matplotlib/trunk/debian/setup.cfg (from rev 6864, packages/matplotlib/trunk/debian/Debian-setup.cfg)
===================================================================
--- packages/matplotlib/trunk/debian/setup.cfg	                        (rev 0)
+++ packages/matplotlib/trunk/debian/setup.cfg	2008-11-08 18:06:16 UTC (rev 6865)
@@ -0,0 +1,12 @@
+[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


Property changes on: packages/matplotlib/trunk/debian/setup.cfg
___________________________________________________________________
Name: svn:mergeinfo
   +