[med-svn] r1784 - in trunk/packages/minc/trunk/debian: . patches

[hanska-guest at alioth.debian.org]

Author: hanska-guest
Date: 2008-04-16 21:14:11 +0000 (Wed, 16 Apr 2008)
New Revision: 1784

Removed:
   trunk/packages/minc/trunk/debian/patches/02_testdir-runtests.diff
Modified:
   trunk/packages/minc/trunk/debian/changelog
   trunk/packages/minc/trunk/debian/patches/01_mincedit-sensible-viewer.diff
Log:
debian/patches/:
- 01_mincedit-sensible-viewer.diff updated
- 02_testdir-runtests.diff removed, it has been merged upstream

Modified: trunk/packages/minc/trunk/debian/changelog
===================================================================
--- trunk/packages/minc/trunk/debian/changelog	2008-04-16 21:01:35 UTC (rev 1783)
+++ trunk/packages/minc/trunk/debian/changelog	2008-04-16 21:14:11 UTC (rev 1784)
@@ -5,8 +5,11 @@
 
   [ David Paleino ]
   * New upstream release
+  * debian/patches/:
+    - 01_mincedit-sensible-viewer.diff updated
+    - 02_testdir-runtests.diff removed, it has been merged upstream
 
- -- David Paleino <d.paleino at gmail.com>  Wed, 16 Apr 2008 22:55:35 +0200
+ -- David Paleino <d.paleino at gmail.com>  Wed, 16 Apr 2008 23:13:30 +0200
 
 minc (2.0.14-2) unstable; urgency=low
 

Modified: trunk/packages/minc/trunk/debian/patches/01_mincedit-sensible-viewer.diff
===================================================================
--- trunk/packages/minc/trunk/debian/patches/01_mincedit-sensible-viewer.diff	2008-04-16 21:01:35 UTC (rev 1783)
+++ trunk/packages/minc/trunk/debian/patches/01_mincedit-sensible-viewer.diff	2008-04-16 21:14:11 UTC (rev 1784)
@@ -1,11 +1,11 @@
---- minc-1.5.orig/progs/mincedit/mincedit
-+++ minc-1.5/progs/mincedit/mincedit
-@@ -65,7 +65,7 @@
- set working_dir = $TMPDIR
- 
- # Set default editor
--set editor = emacs
-+set editor = sensible-editor
- 
- # Check arguments
- switch ("$#argv")
+--- minc-2.0.15.orig/progs/mincedit/mincedit
++++ minc-2.0.15/progs/mincedit/mincedit
+@@ -109,7 +109,7 @@
+          then
+             editor=${EDITOR}
+          else
+-            editor="emacs"
++            editor="sensible-editor"
+          fi
+       fi
+       ;;

Deleted: trunk/packages/minc/trunk/debian/patches/02_testdir-runtests.diff
===================================================================
--- trunk/packages/minc/trunk/debian/patches/02_testdir-runtests.diff	2008-04-16 21:01:35 UTC (rev 1783)
+++ trunk/packages/minc/trunk/debian/patches/02_testdir-runtests.diff	2008-04-16 21:14:11 UTC (rev 1784)
@@ -1,27 +0,0 @@
-This patch has been applied to upstream CVS.  
-I expect the fix to appear in MINC 2.0.15.
-
-diff -u -r tarballs/minc-2.0.14/testdir/run_test2.sh build-area/minc-2.0.14/testdir/run_test2.sh
---- tarballs/minc-2.0.14/testdir/run_test2.sh	2007-05-17 11:56:08.000000000 -0500
-+++ build-area/minc-2.0.14/testdir/run_test2.sh	2007-12-31 08:45:42.000000000 -0600
-@@ -2,7 +2,7 @@
- 
- set -e
- 
--tests=minc_types icv_range icv icv_dim icv_dim1 icv_fillvalue
-+tests="minc_types icv_range icv icv_dim icv_dim1 icv_fillvalue"
- 
- for test in $tests;
- do
-diff -u -r tarballs/minc-2.0.14/testdir/run_tests.sh build-area/minc-2.0.14/testdir/run_tests.sh
---- tarballs/minc-2.0.14/testdir/run_tests.sh	2007-05-17 11:56:08.000000000 -0500
-+++ build-area/minc-2.0.14/testdir/run_tests.sh	2007-12-31 08:39:27.000000000 -0600
-@@ -2,7 +2,7 @@
- 
- set -e
- 
--tests=minc_types icv_range icv icv_dim icv_dim1 icv_fillvalue
-+tests="minc_types icv_range icv icv_dim icv_dim1 icv_fillvalue"
- 
- for test in $tests;
- do