[Python-modules-commits] r19955 - in packages/python-graph/trunk/debian (8 files)

[morph at users.alioth.debian.org]

    Date: Monday, January 9, 2012 @ 17:18:00
  Author: morph
Revision: 19955

Switch to 3.0 (quilt) source format

Added:
  packages/python-graph/trunk/debian/patches/20_remove_reset.patch
  packages/python-graph/trunk/debian/patches/series
Modified:
  packages/python-graph/trunk/debian/changelog
  packages/python-graph/trunk/debian/control
  packages/python-graph/trunk/debian/rules
  packages/python-graph/trunk/debian/source/format
Deleted:
  packages/python-graph/trunk/debian/patches/00list
  packages/python-graph/trunk/debian/patches/20_remove_reset.dpatch

Modified: packages/python-graph/trunk/debian/changelog
===================================================================
--- packages/python-graph/trunk/debian/changelog	2012-01-09 17:17:42 UTC (rev 19954)
+++ packages/python-graph/trunk/debian/changelog	2012-01-09 17:18:00 UTC (rev 19955)
@@ -9,8 +9,9 @@
     - updated copyright years
   * debian/patches/10_exceptions_catch_fix.dpatch
     - removed, we don't support 2.5 anymore
+  * Switch to 3.0 (quilt) source format
 
- -- Sandro Tosi <morph at debian.org>  Mon, 09 Jan 2012 15:36:39 +0100
+ -- Sandro Tosi <morph at debian.org>  Mon, 09 Jan 2012 18:16:03 +0100
 
 python-graph (1.8.0-2) unstable; urgency=low
 

Modified: packages/python-graph/trunk/debian/control
===================================================================
--- packages/python-graph/trunk/debian/control	2012-01-09 17:17:42 UTC (rev 19954)
+++ packages/python-graph/trunk/debian/control	2012-01-09 17:18:00 UTC (rev 19955)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Sandro Tosi <morph at debian.org>
-Build-Depends: debhelper (>= 7), dpatch
+Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: python-support, python (>= 2.5.3-1~), python-epydoc, python-setuptools, python-pydot
 Standards-Version: 3.9.2
 Homepage: http://code.google.com/p/python-graph/

Deleted: packages/python-graph/trunk/debian/patches/00list
===================================================================
--- packages/python-graph/trunk/debian/patches/00list	2012-01-09 17:17:42 UTC (rev 19954)
+++ packages/python-graph/trunk/debian/patches/00list	2012-01-09 17:18:00 UTC (rev 19955)
@@ -1 +0,0 @@
-20_remove_reset

Deleted: packages/python-graph/trunk/debian/patches/20_remove_reset.dpatch
===================================================================
--- packages/python-graph/trunk/debian/patches/20_remove_reset.dpatch	2012-01-09 17:17:42 UTC (rev 19954)
+++ packages/python-graph/trunk/debian/patches/20_remove_reset.dpatch	2012-01-09 17:18:00 UTC (rev 19955)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_remove_reset.dpatch by Sandro Tosi <morph at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't use reset to clean the screen before running tests (play bad
-## DP: with our build systems)
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' python-graph~/Makefile python-graph/Makefile
---- python-graph~/Makefile	2010-01-11 01:38:13.000000000 +0100
-+++ python-graph/Makefile	2010-03-23 21:29:56.027546041 +0100
-@@ -63,13 +63,10 @@
- 
- # Tests --------------------------------------------------------------
- 
--test-pre:
--	reset
--
--test: test-pre
-+test:
- 	export PYTHONPATH=${PYTHONPATH} && cd ${TESTS_DIR} && python testrunner.py
- 
--test3: test-pre
-+test3:
- 	export PYTHONPATH=${PYTHONPATH} && cd ${TESTS_DIR} && python3 testrunner.py
- 
- tests: test

Added: packages/python-graph/trunk/debian/patches/20_remove_reset.patch
===================================================================
--- packages/python-graph/trunk/debian/patches/20_remove_reset.patch	                        (rev 0)
+++ packages/python-graph/trunk/debian/patches/20_remove_reset.patch	2012-01-09 17:18:00 UTC (rev 19955)
@@ -0,0 +1,21 @@
+Author: Sandro Tosi <morph at debian.org>
+Description: Don't use reset to clean the screen before running tests (play bad
+with our build systems)
+--- python-graph-1.8.1.orig/Makefile
++++ python-graph-1.8.1/Makefile
+@@ -63,13 +63,10 @@
+ 
+ # Tests --------------------------------------------------------------
+ 
+-test-pre:
+-	reset
+-
+-test: test-pre
++test:
+ 	export PYTHONPATH=${PYTHONPATH} && cd ${TESTS_DIR} && python testrunner.py
+ 
+-test3: test-pre
++test3:
+ 	export PYTHONPATH=${PYTHONPATH} && cd ${TESTS_DIR} && python3 testrunner.py
+ 
+ tests: test

Added: packages/python-graph/trunk/debian/patches/series
===================================================================
--- packages/python-graph/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-graph/trunk/debian/patches/series	2012-01-09 17:18:00 UTC (rev 19955)
@@ -0,0 +1 @@
+20_remove_reset.patch

Modified: packages/python-graph/trunk/debian/rules
===================================================================
--- packages/python-graph/trunk/debian/rules	2012-01-09 17:17:42 UTC (rev 19954)
+++ packages/python-graph/trunk/debian/rules	2012-01-09 17:18:00 UTC (rev 19955)
@@ -4,9 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
-
-build: patch-stamp build-stamp
+build: build-stamp
 build-stamp:
 	dh_testdir
 
@@ -20,7 +18,7 @@
 
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 

Modified: packages/python-graph/trunk/debian/source/format
===================================================================
--- packages/python-graph/trunk/debian/source/format	2012-01-09 17:17:42 UTC (rev 19954)
+++ packages/python-graph/trunk/debian/source/format	2012-01-09 17:18:00 UTC (rev 19955)
@@ -1 +1 @@
-1.0
+3.0 (quilt)