[med-svn] r14401 - in trunk/packages/raccoon/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2013-08-08 18:20:05 +0000 (Thu, 08 Aug 2013)
New Revision: 14401

Modified:
   trunk/packages/raccoon/trunk/debian/changelog
   trunk/packages/raccoon/trunk/debian/patches/python_path.patch
   trunk/packages/raccoon/trunk/debian/patches/series
   trunk/packages/raccoon/trunk/debian/patches/syntaxError_columnspan.patch
Log:
Adapt patches


Modified: trunk/packages/raccoon/trunk/debian/changelog
===================================================================
--- trunk/packages/raccoon/trunk/debian/changelog	2013-08-08 18:08:09 UTC (rev 14400)
+++ trunk/packages/raccoon/trunk/debian/changelog	2013-08-08 18:20:05 UTC (rev 14401)
@@ -1,6 +1,9 @@
 raccoon (1.0b-1) UNRELEASED; urgency=low
 
-  * new upstream version
+  * New upstream version
+    Adapted patches: In new version the previously invented patch to fix a
+    syntax problem commented out by upstream actively - so this patch was
+    deactivated.
   * debian/watch: fixed
   * debian/upstream: Added citation information
   * debian/control:

Modified: trunk/packages/raccoon/trunk/debian/patches/python_path.patch
===================================================================
--- trunk/packages/raccoon/trunk/debian/patches/python_path.patch	2013-08-08 18:08:09 UTC (rev 14400)
+++ trunk/packages/raccoon/trunk/debian/patches/python_path.patch	2013-08-08 18:20:05 UTC (rev 14401)
@@ -1,7 +1,9 @@
-Index: raccoon-1.0/raccoon.py
-===================================================================
---- raccoon-1.0.orig/raccoon.py	2011-06-19 13:41:21.226381461 +0200
-+++ raccoon-1.0/raccoon.py	2011-06-19 13:41:30.234426129 +0200
+ Author: Steffen Moeller <moeller at debian.org>
+LastChanged: Sun, 19 Jun 2011 13:20:27 +0200
+Description: Use normalised Python PATH
+
+--- a/raccoon.py
++++ b/raccoon.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python

Modified: trunk/packages/raccoon/trunk/debian/patches/series
===================================================================
--- trunk/packages/raccoon/trunk/debian/patches/series	2013-08-08 18:08:09 UTC (rev 14400)
+++ trunk/packages/raccoon/trunk/debian/patches/series	2013-08-08 18:20:05 UTC (rev 14401)
@@ -1,2 +1 @@
-syntaxError_columnspan.patch
 python_path.patch

Modified: trunk/packages/raccoon/trunk/debian/patches/syntaxError_columnspan.patch
===================================================================
--- trunk/packages/raccoon/trunk/debian/patches/syntaxError_columnspan.patch	2013-08-08 18:08:09 UTC (rev 14400)
+++ trunk/packages/raccoon/trunk/debian/patches/syntaxError_columnspan.patch	2013-08-08 18:20:05 UTC (rev 14401)
@@ -1,13 +1,17 @@
-Index: raccoon-1.0/raccoon.py
-===================================================================
---- raccoon-1.0.orig/raccoon.py	2011-06-19 13:39:11.101736203 +0200
-+++ raccoon-1.0/raccoon.py	2011-06-19 13:42:35.202748288 +0200
-@@ -5610,7 +5610,7 @@
+Author: Steffen Moeller <moeller at debian.org>
+LastChanged: Thu, 08 Aug 2013 19:42:32 +0200
+Description: This patch is deactivated because upstream seems to have
+ actively commented out what Steffen considered a fix for a syntax problem.
+ Andreas Tille <tille at debian.org>
+
+--- a/raccoon.py
++++ b/raccoon.py
+@@ -5610,7 +5610,7 @@ DockSummaryLabel.grid(row = 4, column =
  OutputDirLabel = Label(Summary_group.interior(), textvariable = JobDirectory, justify = LEFT)
  OutputDirLabel.grid(row = 5, column = 2, padx = 5, sticky = W)
  OutputDirLabelInfo = Label(Summary_group.interior(), textvariable = JobDirectoryInfo)
--OutputDirLabelInfo.grid(row = 6, column = 1, columnspan = 3, padx = 5, sticky = S, columnspan = 2)
-+OutputDirLabelInfo.grid(row = 6, column = 1, columnspan = 2, padx = 5, sticky = S)
+-OutputDirLabelInfo.grid(row = 6, column = 1, columnspan = 3, padx = 5, sticky = S) #, columnspan = 2)
++OutputDirLabelInfo.grid(row = 6, column = 1, columnspan = 3, padx = 5, sticky = S, columnspan = 2)
  
  JobsSummaryLabel = Label(Summary_group.interior(), textvariable = JobsSummary)
  JobsSummaryLabel.grid(row = 7, column = 1, columnspan = 2, padx = 5, sticky = S)