debian/patches/*.patch: formally refresh. (All still apply.)

4 files changed, 34 insertions, 30 deletions

diff --git a/debian/changelog b/debian/changelog
index a379ffa..5052208 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 python-dsv (1.4.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches/*.patch: formally refresh.  (All still apply.)
 
- -- Aaron M. Ucko <ucko@debian.org>  Tue, 26 Jan 2010 20:51:20 -0500
+ -- Aaron M. Ucko <ucko@debian.org>  Tue, 26 Jan 2010 20:52:23 -0500
 
 python-dsv (1.4.0-8) UNRELEASED; urgency=low
 
diff --git a/debian/patches/01-leave-env-alone.patch b/debian/patches/01-leave-env-alone.patch
index e9e8544..c2e7aee 100644
--- a/debian/patches/01-leave-env-alone.patch
+++ b/debian/patches/01-leave-env-alone.patch
@@ -1,7 +1,8 @@
-diff -Nur python-dsv-TRUNK/DSV/DSV.py python-dsv-TRUNK.new/DSV/DSV.py
---- python-dsv-TRUNK/DSV/DSV.py	2003-01-22 17:50:40.000000000 -0500
-+++ python-dsv-TRUNK.new/DSV/DSV.py	2006-04-18 09:47:32.000000000 -0400
-@@ -117,11 +117,11 @@
+Index: python-dsv-1.4.1/DSV/DSV.py
+===================================================================
+--- python-dsv-1.4.1.orig/DSV/DSV.py	2003-08-09 06:37:32.000000000 -0400
++++ python-dsv-1.4.1/DSV/DSV.py	2010-01-26 20:38:02.000000000 -0500
+@@ -127,11 +127,11 @@
  import copy
  import exceptions
  import string
diff --git a/debian/patches/02-wx-namespace-transition.patch b/debian/patches/02-wx-namespace-transition.patch
index 54ede7d..c4b819f 100644
--- a/debian/patches/02-wx-namespace-transition.patch
+++ b/debian/patches/02-wx-namespace-transition.patch
@@ -1,6 +1,7 @@
-diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
---- python-dsv-1.4.0/DSV/DSV.py	2007-03-06 20:04:46.569562161 -0500
-+++ python-dsv-1.4.0.new/DSV/DSV.py	2007-03-06 20:05:05.755362392 -0500
+Index: python-dsv-1.4.1/DSV/DSV.py
+===================================================================
+--- python-dsv-1.4.1.orig/DSV/DSV.py	2010-01-26 20:35:23.000000000 -0500
++++ python-dsv-1.4.1/DSV/DSV.py	2010-01-26 20:37:59.000000000 -0500
 @@ -2,6 +2,9 @@
  DSV.py - Cliff Wells, 2002
    Import/export DSV (delimiter separated values, a generalization of CSV).
@@ -11,7 +12,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
  Basic use:
  
     from DSV import DSV
-@@ -123,8 +126,14 @@
+@@ -133,8 +136,14 @@
  # import os
  # os.putenv('LANG', 'C')
  
@@ -27,7 +28,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
  except ImportError:
      wx = None
  
-@@ -602,19 +611,19 @@
+@@ -625,19 +634,19 @@
  
  if wx is not None:
      # ------------------------------------------------------------------------------
@@ -52,7 +53,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
          ARGUMENTS:
            - parent is the parent window
            - id is the id of this wizard panel
-@@ -634,24 +643,24 @@
+@@ -657,24 +666,24 @@
          """
  
          def __init__(self, parent, id, file, data, isValidCallback = None,
@@ -85,7 +86,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
              textQualifier = guessTextQualifier(data)
              dlg.Update(1)
              newdata = organizeIntoLines(data, textQualifier = textQualifier, limit = 100)
-@@ -663,13 +672,13 @@
+@@ -686,13 +695,13 @@
              # -------------
              msg = ("This screen lets you set the delimiters your data contains.\n"
                     "You can see how your data is affected in the preview below.")
@@ -104,7 +105,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
  
              delims = {
                  'Tab':       '\t',
-@@ -681,36 +690,36 @@
+@@ -704,36 +713,36 @@
              self.delimChecks = {}
  
              for label, value in delims.items():
@@ -156,7 +157,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
              wx.EVT_CHOICE(self, self.textQualifierChoice.GetId(), self.BuildPreview)
              if textQualifier is not None:
                  self.textQualifierChoice.SetStringSelection(textQualifier)
-@@ -718,52 +727,52 @@
+@@ -741,52 +750,52 @@
                  self.textQualifierChoice.SetStringSelection('{None}')
                  
              tqSizer.AddMany([
@@ -229,7 +230,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
                  ])
  
              # -------------
-@@ -781,28 +790,28 @@
+@@ -804,28 +813,28 @@
                  hasHeaders = 0
                  cols = 1
  
@@ -269,7 +270,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
                  ])
  
              self.Layout()
-@@ -832,9 +841,9 @@
+@@ -855,9 +864,9 @@
              if not self.initialized:
                  return # got triggered before initialization was completed
  
@@ -282,7 +283,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
              self.preview.BeginBatch()
              self.preview.DeleteCols(0, self.preview.GetNumberCols())
              self.preview.DeleteRows(0, self.preview.GetNumberRows())
-@@ -869,7 +878,7 @@
+@@ -892,7 +901,7 @@
                  for col in range(cols):
                      try:    self.preview.SetColLabelValue(col, str(previewData[0][col]))
                      except: self.preview.SetColLabelValue(col, "")
@@ -291,7 +292,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
              else:
                  self.preview.SetColLabelSize(0)
  
-@@ -879,13 +888,13 @@
+@@ -902,13 +911,13 @@
                      except: pass
  
              # if not hasHeaders:
@@ -308,7 +309,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
  
              self.delimiters = delimiter
              self.textQualifier = textQualifier
-@@ -905,17 +914,17 @@
+@@ -928,17 +937,17 @@
              return self.hasHeaders
  
      # ------------------------------------------------------------------------------        
@@ -330,7 +331,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
          ARGUMENTS:
            - parent: the parent window
            - id: the id of this window
-@@ -932,22 +941,22 @@
+@@ -955,22 +964,22 @@
          """
  
          def __init__(self, parent, id, title, file,
@@ -360,7 +361,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
                  ])
  
              self.SetSizer(sizer)
-@@ -957,15 +966,15 @@
+@@ -980,15 +989,15 @@
              self.Centre()
  
          def ButtonBox(self):
@@ -383,7 +384,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
                  ])
              panel.Layout()
              panel.Fit()
-@@ -979,11 +988,11 @@
+@@ -1002,11 +1011,11 @@
          def ImportData(self, errorHandler = skipRow):
              delimiters, qualifier, hasHeaders = self.GetImportInfo()
              self.data = organizeIntoLines(self.data, textQualifier = qualifier)
@@ -397,7 +398,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
              self.data = importDSV(self.data,
                                    delimiter = delimiters,
                                    textQualifier = qualifier,
-@@ -1011,12 +1020,12 @@
+@@ -1034,12 +1043,12 @@
  
  
      def demo():
@@ -414,8 +415,8 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
                      path = dlg.GetPath()
                      dlg.Destroy()
  
-@@ -1026,7 +1035,7 @@
-                         file.write(oldrow + '\n')
+@@ -1049,7 +1058,7 @@
+                         file.write("LINE %d: %s\n" % (linenumber, oldrow))
  
                      dlg = ImportWizardDialog(None, -1, 'CSV Import Wizard (v.%s)' % __version__, path)
 -                    if dlg.ShowModal() == wx.wxID_OK:
@@ -423,7 +424,7 @@ diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
                          results = dlg.ImportData(errorHandler = logErrors)
                          dlg.Destroy()
                          errorLog.close()
-@@ -1051,7 +1060,7 @@
+@@ -1074,7 +1083,7 @@
                  else:
                      dlg.Destroy()
  
diff --git a/debian/patches/03-avoid-unicoditis.patch b/debian/patches/03-avoid-unicoditis.patch
index 471f88b..39faebe 100644
--- a/debian/patches/03-avoid-unicoditis.patch
+++ b/debian/patches/03-avoid-unicoditis.patch
@@ -1,7 +1,8 @@
-diff -Nur python-dsv-1.4.0/DSV/DSV.py python-dsv-1.4.0.new/DSV/DSV.py
---- python-dsv-1.4.0/DSV/DSV.py	2007-03-06 19:54:13.000000000 -0500
-+++ python-dsv-1.4.0.new/DSV/DSV.py	2007-04-19 17:55:20.514048095 -0400
-@@ -471,8 +471,14 @@
+Index: python-dsv-1.4.1/DSV/DSV.py
+===================================================================
+--- python-dsv-1.4.1.orig/DSV/DSV.py	2010-01-26 20:35:23.000000000 -0500
++++ python-dsv-1.4.1/DSV/DSV.py	2010-01-26 20:35:23.000000000 -0500
+@@ -486,8 +486,14 @@
        list of lists of data
      """
      if type(input) != type([]):