[SCM] mma/master: Remove debian/patches
foka at users.alioth.debian.org
foka at users.alioth.debian.org
Wed Dec 16 05:19:23 UTC 2015
The following commit has been merged in the master branch:
commit ca851198cccf48056966a03d86148acd35f296f7
Author: Anthony Fok <foka at debian.org>
Date: Tue Dec 15 21:35:01 2015 -0700
Remove debian/patches
Upstream has accepted all our patches as of 15.09a (released 2015-10-25,
not packaged for Debian.)
diff --git a/debian/patches/fix-logo-link-in-mma-ref-html.patch b/debian/patches/fix-logo-link-in-mma-ref-html.patch
deleted file mode 100644
index fd51ffc..0000000
--- a/debian/patches/fix-logo-link-in-mma-ref-html.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Fix anchor href to logo.png in MMA Reference Manual (HTML)
-Author: Anthony Fok <foka at debian.org>
-Origin: vendor
-Last-Update: 2015-09-19
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/docs/html/ref/index.html
-+++ b/docs/html/ref/index.html
-@@ -52,7 +52,7 @@
- <P>
- <H1 ALIGN="CENTER"><IMG
- WIDTH="730" HEIGHT="314" ALIGN="BOTTOM" BORDER="0"
-- SRC="../../logo/logo.png"
-+ SRC="../logo.png"
- ALT="LOST LOGO">
-
- <P>
---- a/docs/html/ref/mma.html
-+++ b/docs/html/ref/mma.html
-@@ -52,7 +52,7 @@
- <P>
- <H1 ALIGN="CENTER"><IMG
- WIDTH="730" HEIGHT="314" ALIGN="BOTTOM" BORDER="0"
-- SRC="../../logo/logo.png"
-+ SRC="../logo.png"
- ALT="LOST LOGO">
-
- <P>
---- a/docs/html/ref/node36.html
-+++ b/docs/html/ref/node36.html
-@@ -47,7 +47,7 @@
- </H1>
- <STRONG><IMG
- WIDTH="730" HEIGHT="314" ALIGN="BOTTOM" BORDER="0"
-- SRC="../../logo/logo.png"
-+ SRC="../logo.png"
- ALT="LOST LOGO">
-
- <P>
diff --git a/debian/patches/mma-gb-write-browserDB-to-personal-cache-directory.patch b/debian/patches/mma-gb-write-browserDB-to-personal-cache-directory.patch
deleted file mode 100644
index c4188ef..0000000
--- a/debian/patches/mma-gb-write-browserDB-to-personal-cache-directory.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Patch mma-gb to write browserDB in ~/.cache/mma/ directory
- instead of writing to /usr/share/mma/lib/browserDB.
-Author: Anthony Fok <foka at debian.org>
-Origin: vendor
-Forwarded: no
-Last-Update: 2015-09-17
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/mma-gb
-+++ b/mma-gb
-@@ -67,6 +67,16 @@
- print("The MMA library directory was not found.")
- sys.exit(1)
-
-+if sys.platform.startswith(('linux', 'gnu', 'freebsd', 'netbsd', 'openbsd')):
-+ HOME = os.path.expanduser('~')
-+ XDG_CACHE_HOME = os.environ.get("XDG_CACHE_HOME", os.path.join(HOME, ".cache"))
-+ cachePath = os.path.join(XDG_CACHE_HOME, 'mma')
-+else:
-+ cachePath = libPath
-+
-+if not os.path.exists(cachePath):
-+ os.makedirs(cachePath)
-+
- # these are the options passed to mma for playing a groove.
- # they are modified by the entryboxes at the top of screen
-
-@@ -514,7 +524,7 @@
- if not db:
- print("No data read")
- sys.exit(1)
-- write_db(libPath, dbName, db, self.lbdesc)
-+ write_db(cachePath, dbName, db, self.lbdesc)
- self.updateFileList()
-
-
-@@ -617,7 +627,7 @@
-
- # Start the tk stuff.
-
--db = read_db(libPath, dbName)
-+db = read_db(cachePath, dbName)
- if not db:
- db = update_groove_db(libPath, '', None)
-
-@@ -625,7 +635,7 @@
- print("No data in database")
- sys.exit(1)
-
-- write_db(libPath, dbName, db, None)
-+ write_db(cachePath, dbName, db, None)
-
- root = Tk()
-
diff --git a/debian/patches/mma-splitrec-to-python3.patch b/debian/patches/mma-splitrec-to-python3.patch
deleted file mode 100644
index b58195c..0000000
--- a/debian/patches/mma-splitrec-to-python3.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-Description: Patch mma-splitrec to support both Python 3 and Python 2.6
-Author: Anthony Fok <foka at debian.org>
-Origin: vendor
-Forwarded: no
-Last-Update: 2015-09-17
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/mma-splitrec
-+++ b/mma-splitrec
-@@ -6,6 +6,7 @@
-
- # bvdp Jan/2011
-
-+from __future__ import print_function
- import sys
- import os
- import subprocess
-@@ -81,7 +82,7 @@
- excludelist.append(a.upper())
-
- else:
-- print "Unknown option: %s %s" % (o, a)
-+ print("Unknown option: %s %s" % (o, a))
- usage()
-
- if excludelist and onlylist:
-@@ -96,13 +97,13 @@
-
-
- def usage():
-- print "mma-splitrec, (c) Bob van der Poel"
-- print "Create multi-track wav files from MMA."
-- print "Usage: mma-splitrec [opts] mmafile [opts]"
-- print "Options:"
-+ print("mma-splitrec, (c) Bob van der Poel")
-+ print("Create multi-track wav files from MMA.")
-+ print("Usage: mma-splitrec [opts] mmafile [opts]")
-+ print("Options:")
- for a in optmsg:
-- print a
-- print
-+ print(a)
-+ print()
- sys.exit(1)
-
-
-@@ -117,9 +118,9 @@
-
-
- def error(m, e=None):
-- print "Error - mma-splitrec: %s" % m
-+ print("Error - mma-splitrec: %s" % m)
- if e:
-- print " ", e
-+ print(" ", e)
- sys.exit(1)
-
-
-@@ -130,15 +131,15 @@
- and aplaymidi in the foreground to play the midi file.
- """
-
-- print "Creating: %s.wav" % trackname
-+ print("Creating: %s.wav" % trackname)
-
- # start recording
-
- cmd = [recorder ] + recordopts.split() + ["%s.wav" % trackname]
-- print cmd
-+ print(cmd)
- try:
- recpid = subprocess.Popen(cmd, shell=False)
-- except OSError, e:
-+ except OSError as e:
- error("Can't fork recorder.", e)
-
- # start playing midi
-@@ -147,7 +148,7 @@
-
- try:
- midpid = subprocess.Popen(cmd, shell=False)
-- except OSError, e:
-+ except OSError as e:
- recpid.kill() # stop recorder
- error("Can't fork midi player.", e)
-
-@@ -155,20 +156,20 @@
-
- try:
- recpid.terminate() # stop recorder
-- except OSError, e:
-+ except OSError as e:
- error("Can't stop recorder.", e)
-
-
- def tim2wav(trackname, midifile):
- """ Use timidity to create wav file. """
-
-- print "Creating: %s.wav with timidity" % trackname
-+ print("Creating: %s.wav with timidity" % trackname)
-
- cmd = [timidity] + timopts.split() + [ "-o%s.wav" % trackname, midifile ]
-
- try:
- midpid = subprocess.Popen(cmd, shell=False)
-- except OSError, e:
-+ except OSError as e:
- recpid.kill() # stop recorder
- error("Can't fork midi player.", e)
-
-@@ -185,7 +186,7 @@
-
- try:
- pid = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=False)
-- except OSError, e:
-+ except OSError as e:
- error("Can't fork mma.", e)
-
- data, err = pid.communicate()
-@@ -236,10 +237,10 @@
- if onlylist and a not in onlylist: continue
- tracklist.append(a)
-
--print "MMA file '%s' being split to: " % mmafile,
-+print("MMA file '%s' being split to: " % mmafile, end=' ')
- for a in tracklist:
-- print a,
--print
-+ print(a, end=' ')
-+print()
-
-
- # Now we have a list of tracks ... do the magic.
-@@ -253,7 +254,7 @@
-
- if err or retcode:
- if txt.find("No data created") >= 0:
-- print "NO DATA for '%s', skipping" % trackname
-+ print("NO DATA for '%s', skipping" % trackname)
- continue
- else:
- error("MMA parsing error.", e)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e4d1dda..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-mma-gb-write-browserDB-to-personal-cache-directory.patch
-mma-splitrec-to-python3.patch
-fix-logo-link-in-mma-ref-html.patch
--
mma packaging
More information about the pkg-multimedia-commits
mailing list