[Python-modules-commits] r27343 - in packages/pysrt/trunk/debian (2 files)

[emillon-guest at users.alioth.debian.org]

    Date: Tuesday, January 21, 2014 @ 09:03:53
  Author: emillon-guest
Revision: 27343

pysrt: update to 1.0.0

Modified:
  packages/pysrt/trunk/debian/changelog
  packages/pysrt/trunk/debian/patches/chardet.patch

Modified: packages/pysrt/trunk/debian/changelog
===================================================================
--- packages/pysrt/trunk/debian/changelog	2014-01-21 08:59:42 UTC (rev 27342)
+++ packages/pysrt/trunk/debian/changelog	2014-01-21 09:03:53 UTC (rev 27343)
@@ -1,5 +1,5 @@
-pysrt (0.5.1-1) UNRELEASED; urgency=low
+pysrt (1.0.0-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #729872)
 
- -- Etienne Millon <me at emillon.org>  Mon, 18 Nov 2013 17:02:24 +0100
+ -- Etienne Millon <me at emillon.org>  Tue, 21 Jan 2014 09:52:26 +0100

Modified: packages/pysrt/trunk/debian/patches/chardet.patch
===================================================================
--- packages/pysrt/trunk/debian/patches/chardet.patch	2014-01-21 08:59:42 UTC (rev 27342)
+++ packages/pysrt/trunk/debian/patches/chardet.patch	2014-01-21 09:03:53 UTC (rev 27343)
@@ -4,31 +4,25 @@
 Author: Etienne Millon <me at emillon.org>
 Forwarded: not-needed
 ---
---- a/pysrt/srtfile.py
-+++ b/pysrt/srtfile.py
-@@ -6,10 +6,7 @@
- from itertools import chain
- from copy import copy
+--- a/pysrt/commands.py
++++ b/pysrt/commands.py
+@@ -10,7 +10,7 @@
+ import argparse
+ from textwrap import dedent
  
--try:
--    import charade
--except ImportError:  # For python < 2.6
--    import chardet as charade
-+import chardet as charade
+-from charade import detect
++from chardet import detect
+ from pysrt import SubRipFile, SubRipTime, VERSION_STRING
  
- from pysrt.srtexc import Error
- from pysrt.srtitem import SubRipItem
+ def underline(string):
 --- a/setup.py
 +++ b/setup.py
-@@ -13,10 +13,7 @@
+@@ -12,7 +12,7 @@
+ except:
      pass
  
- REQUIRES = []
--if sys.version_info < (2, 6):
--    REQUIRES.append('chardet')
--else:
--    REQUIRES.append('charade')
-+REQUIRES.append('chardet')
+-REQUIRES = ['charade']
++REQUIRES = ['chardet']
  
  if sys.version_info < (2, 7):
      REQUIRES.append('argparse')