[SCM] morituri/master: * morituri/common/Makefile.am: Add missing result.py * morituri/test/Makefile.am: * morituri/test/test_image_toc.py: * morituri/test/JoséGonzález.toc (added): * morituri/test/José González.toc (deleted): automake doesn't handle spaces in names, so move it.
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Oct 19 20:09:15 UTC 2014
The following commit has been merged in the master branch:
commit c6d374bd1640d7154c6cd9dbf2a1c433a572cc66
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Mon Mar 15 15:16:14 2010 +0000
* morituri/common/Makefile.am:
Add missing result.py
* morituri/test/Makefile.am:
* morituri/test/test_image_toc.py:
* morituri/test/JoséGonzález.toc (added):
* morituri/test/José González.toc (deleted):
automake doesn't handle spaces in names, so move it.
diff --git a/ChangeLog b/ChangeLog
index 8ec55ff..0943ef0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2010-03-15 Thomas Vander Stichele <thomas at apestaart dot org>
+ * morituri/common/Makefile.am:
+ Add missing result.py
+ * morituri/test/Makefile.am:
+ * morituri/test/test_image_toc.py:
+ * morituri/test/JoséGonzález.toc (added):
+ * morituri/test/José González.toc (deleted):
+ automake doesn't handle spaces in names, so move it.
+
+2010-03-15 Thomas Vander Stichele <thomas at apestaart dot org>
+
* bin/rip.in:
Add our PYTHONLIBDIR to sys.path if needed. Should make this
work when doing ./configure; sudo checkinstall make install
diff --git a/morituri/common/Makefile.am b/morituri/common/Makefile.am
index 4b08b87..1d6e909 100644
--- a/morituri/common/Makefile.am
+++ b/morituri/common/Makefile.am
@@ -13,5 +13,6 @@ morituri_PYTHON = \
logcommand.py \
program.py \
renamer.py \
+ result.py \
task.py \
taskgtk.py
diff --git "a/morituri/test/Jos\303\251 Gonz\303\241lez.toc" "b/morituri/test/Jos\303\251Gonz\303\241lez.toc"
similarity index 100%
rename from "morituri/test/Jos\303\251 Gonz\303\241lez.toc"
rename to "morituri/test/Jos\303\251Gonz\303\241lez.toc"
diff --git a/morituri/test/Makefile.am b/morituri/test/Makefile.am
index 6021e74..0c73b52 100644
--- a/morituri/test/Makefile.am
+++ b/morituri/test/Makefile.am
@@ -22,6 +22,7 @@ EXTRA_DIST = \
capital.2.toc \
cure.cue \
cure.toc \
+ JoséGonzález.toc \
dBAR-011-0010e284-009228a3-9809ff0b.bin \
dBAR-020-002e5023-029d8e49-040eaa14.bin \
kanye.cue \
@@ -35,6 +36,7 @@ EXTRA_DIST = \
silentalarm.result.pickle \
track.flac
+
# re-generation of test files when needed
regenerate: track.flac
@@ -44,4 +46,3 @@ regenerate: track.flac
track.flac:
gst-launch audiotestsrc num-buffers=10 samplesperbuffer=588 ! audioconvert ! audio/x-raw-int,channels=2,width=16,height=16,rate=44100 ! flacenc ! filesink location=track.flac
-
diff --git a/morituri/test/test_image_toc.py b/morituri/test/test_image_toc.py
index d740089..cee03ba 100644
--- a/morituri/test/test_image_toc.py
+++ b/morituri/test/test_image_toc.py
@@ -210,9 +210,9 @@ class CapitalMergeTestCase(unittest.TestCase):
class UnicodeTestCase(unittest.TestCase):
def setUp(self):
+ path = u'Jos\xe9Gonz\xe1lez.toc'
self._performer = u'Jos\xe9 Gonz\xe1lez'
- self.toc = toc.TocFile(os.path.join(os.path.dirname(__file__),
- '%s.toc' % self._performer))
+ self.toc = toc.TocFile(os.path.join(os.path.dirname(__file__), path))
self.toc.parse()
self.assertEquals(len(self.toc.table.tracks), 10)
--
morituri packaging
More information about the pkg-multimedia-commits
mailing list