Initialize git-dpm

6 files changed, 84 insertions, 34 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 0000000..4d410d0
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,8 @@
+# see git-dpm(1) from git-dpm package
+3349909aee8825a659aaabc8387da7f75455cf5b
+3349909aee8825a659aaabc8387da7f75455cf5b
+27f1c75f86b5816a618174e98f593e60664ec360
+27f1c75f86b5816a618174e98f593e60664ec360
+python-dsv_1.4.1.orig.tar.gz
+4cfdb824c5f66a8488f3fc8e441d54f23e0405f1
+14682
diff --git a/debian/patches/01-leave-env-alone.patch b/debian/patches/01-leave-env-alone.patch
index c2e7aee..a254f6c 100644
--- a/debian/patches/01-leave-env-alone.patch
+++ b/debian/patches/01-leave-env-alone.patch
@@ -1,8 +1,18 @@
-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 @@
+From 251aa46ecd5c1e4ff3811a748e47a6c309b1321f Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 11:58:07 -0700
+Subject: 01-leave-env-alone
+
+Patch-Name: 01-leave-env-alone.patch
+---
+ DSV/DSV.py | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/DSV/DSV.py b/DSV/DSV.py
+index 24fd6a1..8ba7f1e 100644
+--- a/DSV/DSV.py
++++ b/DSV/DSV.py
+@@ -127,11 +127,11 @@ import re
  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 c4b819f..d413c20 100644
--- a/debian/patches/02-wx-namespace-transition.patch
+++ b/debian/patches/02-wx-namespace-transition.patch
@@ -1,7 +1,17 @@
-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
+From b10117e7dd06f70f73bd941082fc131f94c2ce6e Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 11:58:08 -0700
+Subject: 02-wx-namespace-transition
+
+Patch-Name: 02-wx-namespace-transition.patch
+---
+ DSV/DSV.py | 205 ++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 107 insertions(+), 98 deletions(-)
+
+diff --git a/DSV/DSV.py b/DSV/DSV.py
+index 8ba7f1e..b17a91b 100644
+--- a/DSV/DSV.py
++++ b/DSV/DSV.py
 @@ -2,6 +2,9 @@
  DSV.py - Cliff Wells, 2002
    Import/export DSV (delimiter separated values, a generalization of CSV).
@@ -12,7 +22,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
  Basic use:
  
     from DSV import DSV
-@@ -133,8 +136,14 @@
+@@ -133,8 +136,14 @@ import string
  # import os
  # os.putenv('LANG', 'C')
  
@@ -28,7 +38,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
  except ImportError:
      wx = None
  
-@@ -625,19 +634,19 @@
+@@ -625,19 +634,19 @@ def exportDSV(input, delimiter = ',', textQualifier = '"', quoteall = 0, newline
  
  if wx is not None:
      # ------------------------------------------------------------------------------
@@ -53,7 +63,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
          ARGUMENTS:
            - parent is the parent window
            - id is the id of this wizard panel
-@@ -657,24 +666,24 @@
+@@ -657,24 +666,24 @@ if wx is not None:
          """
  
          def __init__(self, parent, id, file, data, isValidCallback = None,
@@ -86,7 +96,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
              textQualifier = guessTextQualifier(data)
              dlg.Update(1)
              newdata = organizeIntoLines(data, textQualifier = textQualifier, limit = 100)
-@@ -686,13 +695,13 @@
+@@ -686,13 +695,13 @@ if wx is not None:
              # -------------
              msg = ("This screen lets you set the delimiters your data contains.\n"
                     "You can see how your data is affected in the preview below.")
@@ -105,7 +115,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
  
              delims = {
                  'Tab':       '\t',
-@@ -704,36 +713,36 @@
+@@ -704,36 +713,36 @@ if wx is not None:
              self.delimChecks = {}
  
              for label, value in delims.items():
@@ -157,7 +167,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
              wx.EVT_CHOICE(self, self.textQualifierChoice.GetId(), self.BuildPreview)
              if textQualifier is not None:
                  self.textQualifierChoice.SetStringSelection(textQualifier)
-@@ -741,52 +750,52 @@
+@@ -741,52 +750,52 @@ if wx is not None:
                  self.textQualifierChoice.SetStringSelection('{None}')
                  
              tqSizer.AddMany([
@@ -230,7 +240,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
                  ])
  
              # -------------
-@@ -804,28 +813,28 @@
+@@ -804,28 +813,28 @@ if wx is not None:
                  hasHeaders = 0
                  cols = 1
  
@@ -270,7 +280,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
                  ])
  
              self.Layout()
-@@ -855,9 +864,9 @@
+@@ -855,9 +864,9 @@ if wx is not None:
              if not self.initialized:
                  return # got triggered before initialization was completed
  
@@ -283,7 +293,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
              self.preview.BeginBatch()
              self.preview.DeleteCols(0, self.preview.GetNumberCols())
              self.preview.DeleteRows(0, self.preview.GetNumberRows())
-@@ -892,7 +901,7 @@
+@@ -892,7 +901,7 @@ if wx is not None:
                  for col in range(cols):
                      try:    self.preview.SetColLabelValue(col, str(previewData[0][col]))
                      except: self.preview.SetColLabelValue(col, "")
@@ -292,7 +302,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
              else:
                  self.preview.SetColLabelSize(0)
  
-@@ -902,13 +911,13 @@
+@@ -902,13 +911,13 @@ if wx is not None:
                      except: pass
  
              # if not hasHeaders:
@@ -309,7 +319,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
  
              self.delimiters = delimiter
              self.textQualifier = textQualifier
-@@ -928,17 +937,17 @@
+@@ -928,17 +937,17 @@ if wx is not None:
              return self.hasHeaders
  
      # ------------------------------------------------------------------------------        
@@ -331,7 +341,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
          ARGUMENTS:
            - parent: the parent window
            - id: the id of this window
-@@ -955,22 +964,22 @@
+@@ -955,22 +964,22 @@ if wx is not None:
          """
  
          def __init__(self, parent, id, title, file,
@@ -361,7 +371,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
                  ])
  
              self.SetSizer(sizer)
-@@ -980,15 +989,15 @@
+@@ -980,15 +989,15 @@ if wx is not None:
              self.Centre()
  
          def ButtonBox(self):
@@ -384,7 +394,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
                  ])
              panel.Layout()
              panel.Fit()
-@@ -1002,11 +1011,11 @@
+@@ -1002,11 +1011,11 @@ if wx is not None:
          def ImportData(self, errorHandler = skipRow):
              delimiters, qualifier, hasHeaders = self.GetImportInfo()
              self.data = organizeIntoLines(self.data, textQualifier = qualifier)
@@ -398,7 +408,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
              self.data = importDSV(self.data,
                                    delimiter = delimiters,
                                    textQualifier = qualifier,
-@@ -1034,12 +1043,12 @@
+@@ -1034,12 +1043,12 @@ if __name__ == '__main__':
  
  
      def demo():
@@ -415,7 +425,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
                      path = dlg.GetPath()
                      dlg.Destroy()
  
-@@ -1049,7 +1058,7 @@
+@@ -1049,7 +1058,7 @@ if __name__ == '__main__':
                          file.write("LINE %d: %s\n" % (linenumber, oldrow))
  
                      dlg = ImportWizardDialog(None, -1, 'CSV Import Wizard (v.%s)' % __version__, path)
@@ -424,7 +434,7 @@ Index: python-dsv-1.4.1/DSV/DSV.py
                          results = dlg.ImportData(errorHandler = logErrors)
                          dlg.Destroy()
                          errorLog.close()
-@@ -1074,7 +1083,7 @@
+@@ -1074,7 +1083,7 @@ if __name__ == '__main__':
                  else:
                      dlg.Destroy()
  
diff --git a/debian/patches/03-avoid-unicoditis.patch b/debian/patches/03-avoid-unicoditis.patch
index 39faebe..debdb9d 100644
--- a/debian/patches/03-avoid-unicoditis.patch
+++ b/debian/patches/03-avoid-unicoditis.patch
@@ -1,8 +1,18 @@
-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 @@
+From 744cbe48d6379316137b5fb32264289d7886b17a Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 11:58:09 -0700
+Subject: 03-avoid-unicoditis
+
+Patch-Name: 03-avoid-unicoditis.patch
+---
+ DSV/DSV.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/DSV/DSV.py b/DSV/DSV.py
+index b17a91b..a925dd7 100644
+--- a/DSV/DSV.py
++++ b/DSV/DSV.py
+@@ -486,8 +486,14 @@ def importDSV(input, delimiter = ',', textQualifier = '"', columns = 0,
        list of lists of data
      """
      if type(input) != type([]):
diff --git a/debian/patches/04-wx3.0-compat.patch b/debian/patches/04-wx3.0-compat.patch
index c5ed573..1721dca 100644
--- a/debian/patches/04-wx3.0-compat.patch
+++ b/debian/patches/04-wx3.0-compat.patch
@@ -1,3 +1,15 @@
+From 3349909aee8825a659aaabc8387da7f75455cf5b Mon Sep 17 00:00:00 2001
+From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
+Date: Thu, 8 Oct 2015 11:58:10 -0700
+Subject: 04-wx3.0-compat
+
+Patch-Name: 04-wx3.0-compat.patch
+---
+ DSV/DSV.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/DSV/DSV.py b/DSV/DSV.py
+index a925dd7..36a0158 100644
 --- a/DSV/DSV.py
 +++ b/DSV/DSV.py
 @@ -676,7 +676,7 @@ if wx is not None:
diff --git a/debian/patches/series b/debian/patches/series
index eb38fd3..00fb96a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-01-leave-env-alone.patch -p1
-02-wx-namespace-transition.patch -p1
-03-avoid-unicoditis.patch -p1
+01-leave-env-alone.patch
+02-wx-namespace-transition.patch
+03-avoid-unicoditis.patch
 04-wx3.0-compat.patch