[SCM] isrcsubmit/master: Drop patches merged/from upstream
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Wed Oct 16 15:28:09 UTC 2013
The following commit has been merged in the master branch:
commit 95ba8e1806f478b37bdff3dac9512f301d72a3c2
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Wed Oct 16 17:22:28 2013 +0200
Drop patches merged/from upstream
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
deleted file mode 100644
index 65e4644..0000000
--- a/debian/patches/manpage.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-Description: Build a manpage using Sphinx
-Author: Sebastian Ramacher <sramacher at debian.org>
-Forwarded: https://github.com/JonnyJD/musicbrainz-isrcsubmit/pull/72
-Last-Update: 2013-10-02
-
---- /dev/null
-+++ isrcsubmit-2.0.0~beta.4/doc/conf.py
-@@ -0,0 +1,179 @@
-+# -*- coding: utf-8 -*-
-+#
-+# isrcsubmit documentation build configuration file, created by
-+# sphinx-quickstart on Wed Oct 2 02:40:50 2013.
-+#
-+# This file is execfile()d with the current directory set to its containing dir.
-+#
-+# Note that not all possible configuration values are present in this
-+# autogenerated file.
-+#
-+# All configuration values have a default; values that are commented out
-+# serve to show the default.
-+
-+import sys, os
-+
-+# If extensions (or modules to document with autodoc) are in another directory,
-+# add these directories to sys.path here. If the directory is relative to the
-+# documentation root, use os.path.abspath to make it absolute, like shown here.
-+#sys.path.insert(0, os.path.abspath('.'))
-+
-+# -- General configuration -----------------------------------------------------
-+
-+# If your documentation needs a minimal Sphinx version, state it here.
-+#needs_sphinx = '1.0'
-+
-+# Add any Sphinx extension module names here, as strings. They can be extensions
-+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-+extensions = []
-+
-+# Add any paths that contain templates here, relative to this directory.
-+templates_path = ['_templates']
-+
-+# The suffix of source filenames.
-+source_suffix = '.rst'
-+
-+# The encoding of source files.
-+#source_encoding = 'utf-8-sig'
-+
-+# The master toctree document.
-+master_doc = 'isrcsubmit.1'
-+
-+# General information about the project.
-+project = u'isrcsubmit'
-+copyright = u'2010-2013, Johannes Dewender'
-+
-+# The version info for the project you're documenting, acts as replacement for
-+# |version| and |release|, also used in various other places throughout the
-+# built documents.
-+#
-+# The short X.Y version.
-+version = '2.0.0'
-+# The full version, including alpha/beta/rc tags.
-+release = '2.0.0-dev'
-+
-+# The language for content autogenerated by Sphinx. Refer to documentation
-+# for a list of supported languages.
-+#language = None
-+
-+# There are two options for replacing |today|: either, you set today to some
-+# non-false value, then it is used:
-+#today = ''
-+# Else, today_fmt is used as the format for a strftime call.
-+#today_fmt = '%B %d, %Y'
-+
-+# List of patterns, relative to source directory, that match files and
-+# directories to ignore when looking for source files.
-+exclude_patterns = []
-+
-+# The reST default role (used for this markup: `text`) to use for all documents.
-+#default_role = None
-+
-+# If true, '()' will be appended to :func: etc. cross-reference text.
-+#add_function_parentheses = True
-+
-+# If true, the current module name will be prepended to all description
-+# unit titles (such as .. function::).
-+#add_module_names = True
-+
-+# If true, sectionauthor and moduleauthor directives will be shown in the
-+# output. They are ignored by default.
-+#show_authors = False
-+
-+# The name of the Pygments (syntax highlighting) style to use.
-+pygments_style = 'sphinx'
-+
-+# A list of ignored prefixes for module index sorting.
-+#modindex_common_prefix = []
-+
-+
-+# -- Options for HTML output ---------------------------------------------------
-+
-+# The theme to use for HTML and HTML Help pages. See the documentation for
-+# a list of builtin themes.
-+html_theme = 'default'
-+
-+# Theme options are theme-specific and customize the look and feel of a theme
-+# further. For a list of options available for each theme, see the
-+# documentation.
-+#html_theme_options = {}
-+
-+# Add any paths that contain custom themes here, relative to this directory.
-+#html_theme_path = []
-+
-+# The name for this set of Sphinx documents. If None, it defaults to
-+# "<project> v<release> documentation".
-+#html_title = None
-+
-+# A shorter title for the navigation bar. Default is the same as html_title.
-+#html_short_title = None
-+
-+# The name of an image file (relative to this directory) to place at the top
-+# of the sidebar.
-+#html_logo = None
-+
-+# The name of an image file (within the static path) to use as favicon of the
-+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
-+# pixels large.
-+#html_favicon = None
-+
-+# Add any paths that contain custom static files (such as style sheets) here,
-+# relative to this directory. They are copied after the builtin static files,
-+# so a file named "default.css" will overwrite the builtin "default.css".
-+html_static_path = ['_static']
-+
-+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-+# using the given strftime format.
-+#html_last_updated_fmt = '%b %d, %Y'
-+
-+# If true, SmartyPants will be used to convert quotes and dashes to
-+# typographically correct entities.
-+#html_use_smartypants = True
-+
-+# Custom sidebar templates, maps document names to template names.
-+#html_sidebars = {}
-+
-+# Additional templates that should be rendered to pages, maps page names to
-+# template names.
-+#html_additional_pages = {}
-+
-+# If false, no module index is generated.
-+#html_domain_indices = True
-+
-+# If false, no index is generated.
-+#html_use_index = True
-+
-+# If true, the index is split into individual pages for each letter.
-+#html_split_index = False
-+
-+# If true, links to the reST sources are added to the pages.
-+#html_show_sourcelink = True
-+
-+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-+#html_show_sphinx = True
-+
-+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-+#html_show_copyright = True
-+
-+# If true, an OpenSearch description file will be output, and all pages will
-+# contain a <link> tag referring to it. The value of this option must be the
-+# base URL from which the finished HTML is served.
-+#html_use_opensearch = ''
-+
-+# This is the file name suffix for HTML files (e.g. ".xhtml").
-+#html_file_suffix = None
-+
-+# Output file base name for HTML help builder.
-+htmlhelp_basename = 'isrcsubmitdoc'
-+
-+# -- Options for manual page output --------------------------------------------
-+
-+# One entry per manual page. List of tuples
-+# (source start file, name, description, authors, manual section).
-+man_pages = [
-+ ('isrcsubmit.1', 'isrcsubmit', u'isrcsubmit Documentation',
-+ [u'Johannes Dewender'], 1)
-+]
-+
-+# If true, show URL addresses after external links.
-+#man_show_urls = False
---- /dev/null
-+++ isrcsubmit-2.0.0~beta.4/doc/isrcsubmit.1.rst
-@@ -0,0 +1,49 @@
-+isrcsubmit manual page
-+======================
-+
-+Synopsis
-+--------
-+
-+**isrcsubmit** [*options*] [*user*] [*device*]
-+
-+Description
-+-----------
-+
-+:program:`isrcsubmit` extracts International Standard Recording Codes (ISRC)
-+from audio CDs and allows one to submit the data to MusicBrainz. ISRCs are used
-+to uniquely identifiy sound and music video recordings.
-+
-+Options
-+-------
-+
-+--version
-+ Show program's version number and exit.
-+-h
-+ Short usage help.
-+--help
-+ Complete help for the program.
-+--debug
-+ Show debug messages.
-+-u <username>, --user=<username>
-+ MusicBrainz username, if not given as argument.
-+-d <device>, --device=<device>
-+ CD device with a loaded audio CD, if not given as argument. The default is
-+ /dev/cdrom.
-+--release-id=<release_id>
-+ Optional MusicBrainz ID of the release. This will be gathered if not given.
-+-b <program>, --backend=<program>
-+ Force using a specific backend to extract ISRCs from the disc. Possible
-+ backends are: mediatools, media_info, cdrdao, libdiscid, discisrc. They are
-+ tried in this order otherwise.
-+--browser=<browser>
-+ Program to open URLs. If not given, xdg-open, firefox, chromium, opera and
-+ explorer are tried.
-+--force-submit
-+ Always open TOC/disc ID submission page in browser.
-+--server=<server>
-+ Server to send ISRCs to. If not given, musicbrainz.org is used.
-+
-+Author
-+------
-+
-+:program:`isrcsubmit` was written by Johannes Dewender.
---- isrcsubmit-2.0.0~beta.4.orig/setup.py
-+++ isrcsubmit-2.0.0~beta.4/setup.py
-@@ -1,9 +1,44 @@
- #!/usr/bin/env python
-
- from distutils.core import setup
-+from distutils.command.build import build
-
- from isrcsubmit import __version__
-
-+try:
-+ import sphinx
-+ from sphinx.setup_command import BuildDoc
-+ using_sphinx = True
-+except ImportError:
-+ using_sphinx = False
-+
-+cmdclass = {}
-+if using_sphinx:
-+ # use Sphinx to build the manpage if it is available
-+ class BuildDocMan(BuildDoc):
-+ def initialize_options(self):
-+ BuildDoc.initialize_options(self)
-+ self.builder = 'man'
-+ self.source_dir = 'doc'
-+ self.build_dir = 'build'
-+
-+ # automatically build manpages as sub target of build
-+ build.sub_commands.append(('build_sphinx_man', None))
-+ cmdclass['build_sphinx_man'] = BuildDocMan
-+
-+ import platform
-+ if platform.system() in ['FreeBSD', 'OpenBSD']:
-+ man_dir = 'man'
-+ else:
-+ man_dir = 'share/man'
-+
-+ import os.path
-+ man_pages = [
-+ (os.path.join(man_dir, 'man1'), ['build/man/isrcsubmit.1']),
-+ ]
-+else:
-+ man_pages = []
-+
- setup(name="isrcsubmit",
- version=__version__,
- description="submit ISRCs from disc to MusicBrainz",
-@@ -27,7 +62,9 @@ setup(name="isrcsubmit",
- "Topic :: Database :: Front-Ends",
- "Topic :: Multimedia :: Sound/Audio :: CD Audio :: CD Ripping",
- "Topic :: Text Processing :: Filters"
-- ]
-+ ],
-+ data_files=man_pages,
-+ cmdclass=cmdclass
- )
-
- # vim:set shiftwidth=4 smarttab expandtab:
diff --git a/debian/patches/series b/debian/patches/series
index 348d80e..c90dc38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-use-python-libdiscid.patch
debian-specific-browsers.patch
-undefined-name.patch
-manpage.patch
diff --git a/debian/patches/undefined-name.patch b/debian/patches/undefined-name.patch
deleted file mode 100644
index e8774f7..0000000
--- a/debian/patches/undefined-name.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix undefined name
-Author: Sebastian Ramacher <sramacher at debian.org>
-Forwarded: https://github.com/JonnyJD/musicbrainz-isrcsubmit/pull/71
-Applied-Upstream: https://github.com/JonnyJD/musicbrainz-isrcsubmit/commit/5d4f43ef232caeec359ffdae8d9bebd3ca790382
-Last-Update: 2013-10-02
-
---- isrcsubmit-2.0.0~beta.4.orig/isrcsubmit.py
-+++ isrcsubmit-2.0.0~beta.4/isrcsubmit.py
-@@ -281,7 +281,7 @@ def has_program(program, strict=False):
- elif program in BACKENDS:
- try:
- # we just try to start these non-interactive console apps
-- call([backend], stdout=devnull, stderr=devnull)
-+ call([program], stdout=devnull, stderr=devnull)
- except OSError:
- return False
- else:
diff --git a/debian/patches/use-python-libdiscid.patch b/debian/patches/use-python-libdiscid.patch
deleted file mode 100644
index 688ad92..0000000
--- a/debian/patches/use-python-libdiscid.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Make it possible to use python-libdiscid
-Origin: upstream,
- https://github.com/JonnyJD/musicbrainz-isrcsubmit/commit/61828aca9c6ae162bc45950be37a0f099d79e0fd,
- https://github.com/JonnyJD/musicbrainz-isrcsubmit/commit/1aef73b84ba9a11d2fec286f304653cc1f1d5fab
-Last-Update: 2013-10-02
-
---- isrcsubmit-2.0.0~beta.4.orig/isrcsubmit.py
-+++ isrcsubmit-2.0.0~beta.4/isrcsubmit.py
-@@ -38,9 +38,18 @@ from datetime import datetime
- from optparse import OptionParser
- from subprocess import Popen, PIPE, call
-
--import discid
-+try:
-+ import discid
-+ from discid import DiscError
-+except ImportError:
-+ try:
-+ from libdiscid.compat import discid
-+ from libdiscid.compat.discid import DiscError
-+ except ImportError:
-+ # When both are not available, raise exception for python-discid
-+ import discid
-+
- import musicbrainzngs
--from discid import DiscError
- from musicbrainzngs import AuthenticationError, ResponseError, WebServiceError
-
- SHELLNAME = "isrcsubmit.sh"
-@@ -896,6 +905,7 @@ def cleanup_isrcs(release, isrcs):
- if __name__ == "__main__":
-
- print("%s" % script_version())
-+ print("using discid version %s" % discid.__version__)
-
- # global variables
- options = gather_options(sys.argv)
--
isrcsubmit packaging
More information about the pkg-multimedia-commits
mailing list