[SCM] morituri/master: Drop all patches: Applied upstream.

js at users.alioth.debian.org js at users.alioth.debian.org
Sun Jun 5 17:35:20 UTC 2011


The following commit has been merged in the master branch:
commit 4a60f63234a497b575f871184f03e7abdc318355
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 5 18:42:25 2011 +0200

    Drop all patches: Applied upstream.

diff --git a/debian/patches/0001_fix_support_non-utf-8_console.patch b/debian/patches/0001_fix_support_non-utf-8_console.patch
deleted file mode 100644
index c666bcf..0000000
--- a/debian/patches/0001_fix_support_non-utf-8_console.patch
+++ /dev/null
@@ -1,570 +0,0 @@
-Description: Fix support non-UTF-8 build environment
-From: Jonas Smedegaard <dr at jones.dk>
-Forwarded: yes
-Last-Update: 2010-04-08
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,17 @@
-+2010-04-18  Thomas Vander Stichele  <thomas at apestaart dot org>
-+
-+	* morituri/test/Makefile.am:
-+	* morituri/test/jose.toc (added):
-+	* morituri/test/JoséGonzález.toc (deleted):
-+	  Rename utf-8 file to a normal file.
-+	* morituri/test/common.py:
-+	* morituri/test/test_common_checksum.py:
-+	* morituri/test/test_common_encode.py:
-+	* morituri/test/test_image_image.py:
-+	* morituri/test/test_image_toc.py:
-+	  Copy the normal file first to the utf-8 filename, if supported.
-+	  Skip tests that need unicode when we are not in a utf-8 locale.
-+
- === release 0.1.1 ===
- 
- 2010-04-16  Thomas Vander Stichele  <thomas at apestaart dot org>
---- a/morituri/test/JoséGonzález.toc
-+++ /dev/null
-@@ -1,167 +0,0 @@
--CD_DA
--
--CD_TEXT {
--  LANGUAGE_MAP {
--    0: 9
--  }
--  LANGUAGE 0 {
--    TITLE "In Our Nature"
--    PERFORMER "Jos\351 Gonz\341lez"
--    GENRE { 0,  0,  0}
--    SIZE_INFO { 1,  1, 10,  0, 12, 13,  0,  0,  0,  0,  0,  1,
--                0,  0,  0,  0,  0,  0,  0,  3, 28,  0,  0,  0,
--                0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0}
--  }
--}
--
--// Track 1
--TRACK AUDIO
--NO COPY
--NO PRE_EMPHASIS
--TWO_CHANNEL_AUDIO
--ISRC "SEVVX0700301"
--CD_TEXT {
--  LANGUAGE 0 {
--    TITLE "How Low"
--    PERFORMER "Jos\351 Gonz\341lez"
--  }
--}
--FILE "data.wav" 0 02:40:01
--
--
--// Track 2
--TRACK AUDIO
--NO COPY
--NO PRE_EMPHASIS
--TWO_CHANNEL_AUDIO
--ISRC "SEVVX0700302"
--CD_TEXT {
--  LANGUAGE 0 {
--    TITLE "Down The Line"
--    PERFORMER "Jos\351 Gonz\341lez"
--  }
--}
--FILE "data.wav" 02:40:01 03:10:62
--
--
--// Track 3
--TRACK AUDIO
--NO COPY
--NO PRE_EMPHASIS
--TWO_CHANNEL_AUDIO
--ISRC "SEVVX0700303"
--CD_TEXT {
--  LANGUAGE 0 {
--    TITLE "Killing For Love"
--    PERFORMER "Jos\351 Gonz\341lez"
--  }
--}
--FILE "data.wav" 05:50:63 03:02:67
--
--
--// Track 4
--TRACK AUDIO
--NO COPY
--NO PRE_EMPHASIS
--TWO_CHANNEL_AUDIO
--ISRC "SEVVX0700304"
--CD_TEXT {
--  LANGUAGE 0 {
--    TITLE "In Our Nature"
--    PERFORMER "Jos\351 Gonz\341lez"
--  }
--}
--FILE "data.wav" 08:53:55 02:42:51
--
--
--// Track 5
--TRACK AUDIO
--NO COPY
--NO PRE_EMPHASIS
--TWO_CHANNEL_AUDIO
--ISRC "SEVVX0700305"
--CD_TEXT {
--  LANGUAGE 0 {
--    TITLE "Teardrop"
--    PERFORMER "Jos\351 Gonz\341lez"
--  }
--}
--FILE "data.wav" 11:36:31 03:20:64
--
--
--// Track 6
--TRACK AUDIO
--NO COPY
--NO PRE_EMPHASIS
--TWO_CHANNEL_AUDIO
--ISRC "SEVVX0700306"
--CD_TEXT {
--  LANGUAGE 0 {
--    TITLE "Abram"
--    PERFORMER "Jos\351 Gonz\341lez"
--  }
--}
--FILE "data.wav" 14:57:20 01:58:56
--START 00:12:24
--
--
--// Track 7
--TRACK AUDIO
--NO COPY
--NO PRE_EMPHASIS
--TWO_CHANNEL_AUDIO
--ISRC "SEVVX0700307"
--CD_TEXT {
--  LANGUAGE 0 {
--    TITLE "Time To Send Someone Away"
--    PERFORMER "Jos\351 Gonz\341lez"
--  }
--}
--FILE "data.wav" 16:56:01 02:49:68
--START 00:02:05
--
--
--// Track 8
--TRACK AUDIO
--NO COPY
--NO PRE_EMPHASIS
--TWO_CHANNEL_AUDIO
--ISRC "SEVVX0700308"
--CD_TEXT {
--  LANGUAGE 0 {
--    TITLE "The Nest"
--    PERFORMER "Jos\351 Gonz\341lez"
--  }
--}
--FILE "data.wav" 19:45:69 02:23:66
--
--
--// Track 9
--TRACK AUDIO
--NO COPY
--NO PRE_EMPHASIS
--TWO_CHANNEL_AUDIO
--ISRC "SEVVX0700309"
--CD_TEXT {
--  LANGUAGE 0 {
--    TITLE "Fold"
--    PERFORMER "Jos\351 Gonz\341lez"
--  }
--}
--FILE "data.wav" 22:09:60 02:54:58
--
--
--// Track 10
--TRACK AUDIO
--NO COPY
--NO PRE_EMPHASIS
--TWO_CHANNEL_AUDIO
--ISRC "SEVVX0700310"
--CD_TEXT {
--  LANGUAGE 0 {
--    TITLE "Cycling Trivialities"
--    PERFORMER "Jos\351 Gonz\341lez"
--  }
--}
--FILE "data.wav" 25:04:43 08:09:16
--
---- a/morituri/test/Makefile.am
-+++ b/morituri/test/Makefile.am
-@@ -22,7 +22,7 @@
- 	capital.2.toc \
- 	cure.cue \
- 	cure.toc \
--	JoséGonzález.toc \
-+	Jose.toc \
- 	dBAR-011-0010e284-009228a3-9809ff0b.bin \
- 	dBAR-020-002e5023-029d8e49-040eaa14.bin \
- 	kanye.cue \
---- a/morituri/test/common.py
-+++ b/morituri/test/common.py
-@@ -1,8 +1,11 @@
- # -*- Mode: Python -*-
- # vi:si:et:sw=4:sts=4:ts=4
- 
-+import os
- import sys
--import unittest
-+
-+# twisted's unittests have skip support, standard unittest don't
-+from twisted.trial import unittest
- 
- from morituri.common import log
- 
-@@ -53,3 +56,13 @@
-                                         % (exception.__name__, result))
- 
-     assertRaises = failUnlessRaises
-+
-+class UnicodeTestMixin:
-+    # A helper mixin to skip tests if we're not in a UTF-8 locale
-+    try:
-+        os.stat(u'morituri.test.B\xeate Noire.empty')
-+    except UnicodeEncodeError:
-+        skip = 'No UTF-8 locale'
-+    except OSError:
-+        pass
-+
---- /dev/null
-+++ b/morituri/test/jose.toc
-@@ -0,0 +1,167 @@
-+CD_DA
-+
-+CD_TEXT {
-+  LANGUAGE_MAP {
-+    0: 9
-+  }
-+  LANGUAGE 0 {
-+    TITLE "In Our Nature"
-+    PERFORMER "Jos\351 Gonz\341lez"
-+    GENRE { 0,  0,  0}
-+    SIZE_INFO { 1,  1, 10,  0, 12, 13,  0,  0,  0,  0,  0,  1,
-+                0,  0,  0,  0,  0,  0,  0,  3, 28,  0,  0,  0,
-+                0,  0,  0,  0,  9,  0,  0,  0,  0,  0,  0,  0}
-+  }
-+}
-+
-+// Track 1
-+TRACK AUDIO
-+NO COPY
-+NO PRE_EMPHASIS
-+TWO_CHANNEL_AUDIO
-+ISRC "SEVVX0700301"
-+CD_TEXT {
-+  LANGUAGE 0 {
-+    TITLE "How Low"
-+    PERFORMER "Jos\351 Gonz\341lez"
-+  }
-+}
-+FILE "data.wav" 0 02:40:01
-+
-+
-+// Track 2
-+TRACK AUDIO
-+NO COPY
-+NO PRE_EMPHASIS
-+TWO_CHANNEL_AUDIO
-+ISRC "SEVVX0700302"
-+CD_TEXT {
-+  LANGUAGE 0 {
-+    TITLE "Down The Line"
-+    PERFORMER "Jos\351 Gonz\341lez"
-+  }
-+}
-+FILE "data.wav" 02:40:01 03:10:62
-+
-+
-+// Track 3
-+TRACK AUDIO
-+NO COPY
-+NO PRE_EMPHASIS
-+TWO_CHANNEL_AUDIO
-+ISRC "SEVVX0700303"
-+CD_TEXT {
-+  LANGUAGE 0 {
-+    TITLE "Killing For Love"
-+    PERFORMER "Jos\351 Gonz\341lez"
-+  }
-+}
-+FILE "data.wav" 05:50:63 03:02:67
-+
-+
-+// Track 4
-+TRACK AUDIO
-+NO COPY
-+NO PRE_EMPHASIS
-+TWO_CHANNEL_AUDIO
-+ISRC "SEVVX0700304"
-+CD_TEXT {
-+  LANGUAGE 0 {
-+    TITLE "In Our Nature"
-+    PERFORMER "Jos\351 Gonz\341lez"
-+  }
-+}
-+FILE "data.wav" 08:53:55 02:42:51
-+
-+
-+// Track 5
-+TRACK AUDIO
-+NO COPY
-+NO PRE_EMPHASIS
-+TWO_CHANNEL_AUDIO
-+ISRC "SEVVX0700305"
-+CD_TEXT {
-+  LANGUAGE 0 {
-+    TITLE "Teardrop"
-+    PERFORMER "Jos\351 Gonz\341lez"
-+  }
-+}
-+FILE "data.wav" 11:36:31 03:20:64
-+
-+
-+// Track 6
-+TRACK AUDIO
-+NO COPY
-+NO PRE_EMPHASIS
-+TWO_CHANNEL_AUDIO
-+ISRC "SEVVX0700306"
-+CD_TEXT {
-+  LANGUAGE 0 {
-+    TITLE "Abram"
-+    PERFORMER "Jos\351 Gonz\341lez"
-+  }
-+}
-+FILE "data.wav" 14:57:20 01:58:56
-+START 00:12:24
-+
-+
-+// Track 7
-+TRACK AUDIO
-+NO COPY
-+NO PRE_EMPHASIS
-+TWO_CHANNEL_AUDIO
-+ISRC "SEVVX0700307"
-+CD_TEXT {
-+  LANGUAGE 0 {
-+    TITLE "Time To Send Someone Away"
-+    PERFORMER "Jos\351 Gonz\341lez"
-+  }
-+}
-+FILE "data.wav" 16:56:01 02:49:68
-+START 00:02:05
-+
-+
-+// Track 8
-+TRACK AUDIO
-+NO COPY
-+NO PRE_EMPHASIS
-+TWO_CHANNEL_AUDIO
-+ISRC "SEVVX0700308"
-+CD_TEXT {
-+  LANGUAGE 0 {
-+    TITLE "The Nest"
-+    PERFORMER "Jos\351 Gonz\341lez"
-+  }
-+}
-+FILE "data.wav" 19:45:69 02:23:66
-+
-+
-+// Track 9
-+TRACK AUDIO
-+NO COPY
-+NO PRE_EMPHASIS
-+TWO_CHANNEL_AUDIO
-+ISRC "SEVVX0700309"
-+CD_TEXT {
-+  LANGUAGE 0 {
-+    TITLE "Fold"
-+    PERFORMER "Jos\351 Gonz\341lez"
-+  }
-+}
-+FILE "data.wav" 22:09:60 02:54:58
-+
-+
-+// Track 10
-+TRACK AUDIO
-+NO COPY
-+NO PRE_EMPHASIS
-+TWO_CHANNEL_AUDIO
-+ISRC "SEVVX0700310"
-+CD_TEXT {
-+  LANGUAGE 0 {
-+    TITLE "Cycling Trivialities"
-+    PERFORMER "Jos\351 Gonz\341lez"
-+  }
-+}
-+FILE "data.wav" 25:04:43 08:09:16
-+
---- a/morituri/test/test_common_checksum.py
-+++ b/morituri/test/test_common_checksum.py
-@@ -40,10 +40,12 @@
-         self.failUnless(isinstance(e.exception, gst.QueryError))
-         os.unlink(path)
- 
-+class UnicodePathTestCase(PathTestCase, common.UnicodeTestMixin):
-     def testUnicodePath(self):
-         # this test makes sure we can checksum a unicode path
-         self._testSuffix(u'morituri.test.B\xeate Noire.empty')
- 
-+class NormalPathTestCase(PathTestCase):
-     def testSingleQuote(self):
-         self._testSuffix(u"morituri.test.Guns 'N Roses")
- 
---- a/morituri/test/test_image_image.py
-+++ b/morituri/test/test_image_image.py
-@@ -3,7 +3,6 @@
- 
- import os
- import tempfile
--import unittest
- 
- import gobject
- gobject.threads_init()
-@@ -19,7 +18,7 @@
- def h(i):
-     return "0x%08x" % i
- 
--class TrackSingleTestCase(unittest.TestCase):
-+class TrackSingleTestCase(tcommon.TestCase):
-     def setUp(self):
-         self.image = image.Image(os.path.join(os.path.dirname(__file__),
-             u'track-single.cue'))
-@@ -49,7 +48,7 @@
-         self.assertEquals(self.image.table.getAccurateRipIds(), (
-             "00000016", "0000005b"))
- 
--class TrackSeparateTestCase(unittest.TestCase):
-+class TrackSeparateTestCase(tcommon.TestCase):
-     def setUp(self):
-         self.image = image.Image(os.path.join(os.path.dirname(__file__),
-             u'track-separate.cue'))
-@@ -79,7 +78,7 @@
-         self.assertEquals(self.image.table.getAccurateRipIds(), (
-             "00000064", "00000191"))
- 
--class AudioLengthTestCase(unittest.TestCase):
-+class AudioLengthTestCase(tcommon.TestCase):
-     def testLength(self):
-         path = os.path.join(os.path.dirname(__file__), u'track.flac')
-         t = image.AudioLengthTask(path)
-@@ -101,10 +100,7 @@
-         self.assertEquals(e.exception.code, gst.STREAM_ERROR_TYPE_NOT_FOUND)
-         os.unlink(path)
- 
--    def testUnicodePath(self):
--        # this test makes sure we can checksum a unicode path
--        self._testSuffix(u'morituri.test.B\xeate Noire.empty')
--
-+class NormalAudioLengthPathTestCase(AudioLengthPathTestCase):
-     def testSingleQuote(self):
-         self._testSuffix(u"morituri.test.Guns 'N Roses")
- 
-@@ -112,3 +108,9 @@
-         # This test makes sure we can checksum files with double quote in
-         # their name
-         self._testSuffix(u'morituri.test.12" edit')
-+
-+class UnicodeAudioLengthPathTestCase(AudioLengthPathTestCase, tcommon.UnicodeTestMixin):
-+    def testUnicodePath(self):
-+        # this test makes sure we can checksum a unicode path
-+        self._testSuffix(u'morituri.test.B\xeate Noire.empty')
-+        
---- a/morituri/test/test_image_toc.py
-+++ b/morituri/test/test_image_toc.py
-@@ -3,13 +3,14 @@
- 
- import os
- import copy
--import unittest
-+import shutil
-+import tempfile
- 
- from morituri.image import toc
- 
- from morituri.test import common
- 
--class CureTestCase(unittest.TestCase):
-+class CureTestCase(common.TestCase):
-     def setUp(self):
-         self.toc = toc.TocFile(os.path.join(os.path.dirname(__file__),
-             u'cure.toc'))
-@@ -90,7 +91,7 @@
-             '3/c/4/dBAR-013-0019d4c3-00fe8924-b90c650d.bin')
- 
- # Bloc Party - Silent Alarm has a Hidden Track One Audio
--class BlocTestCase(unittest.TestCase):
-+class BlocTestCase(common.TestCase):
-     def setUp(self):
-         self.toc = toc.TocFile(os.path.join(os.path.dirname(__file__),
-             u'bloc.toc'))
-@@ -137,7 +138,7 @@
-             'e/d/2/dBAR-013-001af2de-0105994e-ad0be00d.bin')
- 
- # The Breeders - Mountain Battles has CDText
--class BreedersTestCase(unittest.TestCase):
-+class BreedersTestCase(common.TestCase):
-     def setUp(self):
-         self.toc = toc.TocFile(os.path.join(os.path.dirname(__file__),
-             u'breeders.toc'))
-@@ -163,7 +164,7 @@
-         self.assertEquals(cue, ref)
- 
- # Ladyhawke has a data track
--class LadyhawkeTestCase(unittest.TestCase):
-+class LadyhawkeTestCase(common.TestCase):
-     def setUp(self):
-         self.toc = toc.TocFile(os.path.join(os.path.dirname(__file__),
-             u'ladyhawke.toc'))
-@@ -179,7 +180,7 @@
-         # c60af50d 13 150 15687 31841 51016 66616 81352 99559 116070 133243
-         # 149997 161710 177832 207256 2807
- 
--class CapitalMergeTestCase(unittest.TestCase):
-+class CapitalMergeTestCase(common.TestCase):
-     def setUp(self):
-         self.toc1 = toc.TocFile(os.path.join(os.path.dirname(__file__),
-             u'capital.1.toc'))
-@@ -208,14 +209,23 @@
-         self.assertEquals(self.table.getMusicBrainzDiscId(),
-             "MAj3xXf6QMy7G.BIFOyHyq4MySE-")
- 
--class UnicodeTestCase(unittest.TestCase):
-+class UnicodeTestCase(common.TestCase, common.UnicodeTestMixin):
-     def setUp(self):
-+        # we copy the normal non-utf8 filename to a utf-8 filename
-+        # in this test because builds with LANG=C fail if we include
-+        # utf-8 filenames in the dist
-         path = u'Jos\xe9Gonz\xe1lez.toc'
-         self._performer = u'Jos\xe9 Gonz\xe1lez'
--        self.toc = toc.TocFile(os.path.join(os.path.dirname(__file__), path))
-+        source = os.path.join(os.path.dirname(__file__), 'jose.toc')
-+        self.dest = os.path.join(os.path.dirname(__file__), path)
-+        shutil.copy(source, self.dest)
-+        self.toc = toc.TocFile(self.dest)
-         self.toc.parse()
-         self.assertEquals(len(self.toc.table.tracks), 10)
- 
-+    def tearDown(self):
-+        os.unlink(self.dest)
-+
-     def testGetTrackLength(self):
-         t = self.toc.table.tracks[0]
-         # first track has known length because the .toc is a single file
---- a/morituri/test/Makefile.in
-+++ b/morituri/test/Makefile.in
-@@ -158,7 +158,7 @@
- 	capital.2.toc \
- 	cure.cue \
- 	cure.toc \
--	JoséGonzález.toc \
-+	Jose.toc \
- 	dBAR-011-0010e284-009228a3-9809ff0b.bin \
- 	dBAR-020-002e5023-029d8e49-040eaa14.bin \
- 	kanye.cue \
diff --git a/debian/patches/1001_fix-non-ascii-htoa.patch b/debian/patches/1001_fix-non-ascii-htoa.patch
deleted file mode 100644
index cc9cb0c..0000000
--- a/debian/patches/1001_fix-non-ascii-htoa.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix encoding of non-ASCII HTOA track in .m3u
-From: Loïc Minier <lool at dooz.org>
-Forwarded: https://thomas.apestaart.org/morituri/trac/ticket/49
-Last-Update: 2010-10-10
---- a/morituri/rip/cd.py
-+++ b/morituri/rip/cd.py
-@@ -242,10 +242,12 @@
-         handle = open(m3uPath, 'w')
-         handle.write(u'#EXTM3U\n')
-         if htoapath:
--            handle.write(u'#EXTINF:%d,%s\n' % (
-+            u = u'#EXTINF:%d,%s\n' % (
-                 itable.getTrackStart(1) / common.FRAMES_PER_SECOND,
--                    os.path.basename(htoapath[:-4])))
--            handle.write(u'%s\n' % os.path.basename(htoapath))
-+                    os.path.basename(htoapath[:-4]))
-+            handle.write(u.encode('utf-8'))
-+            u = u'%s\n' % os.path.basename(htoapath)
-+            handle.write(u.encode('utf-8'))
- 
-         for i, track in enumerate(itable.tracks):
-             if not track.audio:
diff --git a/debian/patches/1002_fix-htoa-m3u-filename.patch b/debian/patches/1002_fix-htoa-m3u-filename.patch
deleted file mode 100644
index 36d39bb..0000000
--- a/debian/patches/1002_fix-htoa-m3u-filename.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix extension of HTOA track in .m3u
-From: Loïc Minier <lool at dooz.org>
-Forwarded: https://thomas.apestaart.org/morituri/trac/ticket/50
-Last-Update: 2010-10-10
---- a/morituri/rip/cd.py
-+++ b/morituri/rip/cd.py
-@@ -244,7 +244,7 @@
-         if htoapath:
-             u = u'#EXTINF:%d,%s\n' % (
-                 itable.getTrackStart(1) / common.FRAMES_PER_SECOND,
--                    os.path.basename(htoapath[:-4]))
-+                    os.path.basename(htoapath))
-             handle.write(u.encode('utf-8'))
-             u = u'%s\n' % os.path.basename(htoapath)
-             handle.write(u.encode('utf-8'))
diff --git a/debian/patches/1003_ignore-other-matches.patch b/debian/patches/1003_ignore-other-matches.patch
deleted file mode 100644
index 9597623..0000000
--- a/debian/patches/1003_ignore-other-matches.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Ignore matches in other AccurateRip database responses
-From: Loïc Minier <lool at dooz.org>
-Forwarded: https://thomas.apestaart.org/morituri/trac/ticket/5
-Last-Update: 2010-10-14
---- a/morituri/common/program.py
-+++ b/morituri/common/program.py
-@@ -503,10 +503,9 @@
-                     if not response:
-                         response = r
-                     else:
--                        assert r == response, \
--                            "checksum %s for %d matches wrong response %d, "\
--                            "checksum %s" % (
--                                csum, i + 1, j + 1, response.checksums[i])
-+                        if r != response:
-+                            self.warning("Track: %02d: checksum %08x matches wrong response %d" % (i + 1, csum, j + 1))
-+                            continue
-                     self.debug("Track: %02d matched in AccurateRip database",
-                         i + 1)
-                     trackResult.accurip = True
diff --git a/debian/patches/1004_fix-non-ascii-date.patch b/debian/patches/1004_fix-non-ascii-date.patch
deleted file mode 100644
index e55849d..0000000
--- a/debian/patches/1004_fix-non-ascii-date.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix encoding of non-ASCII dates in log file
-From: Loïc Minier <lool at dooz.org>
-Forwarded: https://thomas.apestaart.org/morituri/trac/ticket/49
-Last-Update: 2010-12-02
---- a/morituri/result/logger.py
-+++ b/morituri/result/logger.py
-@@ -20,6 +20,7 @@
- # You should have received a copy of the GNU General Public License
- # along with morituri.  If not, see <http://www.gnu.org/licenses/>.
- 
-+import locale
- import time
- 
- from morituri.common import common
-@@ -40,6 +41,7 @@
- 
-         lines.append("Logfile created by: morituri %s" % configure.version)
-         date = time.strftime("%b %d %H:%M:%S", time.localtime(epoch))
-+        date = unicode(date, locale.getpreferredencoding())
-         lines.append("Logfile created on: %s" % date)
-         lines.append("")
- 
diff --git a/debian/patches/README b/debian/patches/README
deleted file mode 100644
index 80c1584..0000000
--- a/debian/patches/README
+++ /dev/null
@@ -1,3 +0,0 @@
-0xxx: Grabbed from upstream development.
-1xxx: Possibly relevant for upstream adoption.
-2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6e71430..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-0001_fix_support_non-utf-8_console.patch
-1001_fix-non-ascii-htoa.patch
-1002_fix-htoa-m3u-filename.patch
-1003_ignore-other-matches.patch
-1004_fix-non-ascii-date.patch

-- 
morituri packaging



More information about the pkg-multimedia-commits mailing list