Merge branch 'puddletag-new' into 'master'

Puddletag 2.0.1 using py3+qt5

Beating out sandrotosi who packages it for Debian. I want it NOW! Once he gets it into Debian though, there is no further need of puddletag in this tree.

See merge request bgstack15/stackrpms!188

11 files changed, 362 insertions, 0 deletions

diff --git a/puddletag/debian/README.Debian b/puddletag/debian/README.Debian
new file mode 100644
index 0000000..7e6c6e3
--- /dev/null
+++ b/puddletag/debian/README.Debian
@@ -0,0 +1,4 @@
+Some interesting services:
+
+- Where to report bugs upstream: http://code.google.com/p/puddletag/issues/list
+- Upstream documentation: http://puddletag.sourceforge.net/docs.html
diff --git a/puddletag/debian/changelog b/puddletag/debian/changelog
new file mode 100644
index 0000000..cc415f1
--- /dev/null
+++ b/puddletag/debian/changelog
@@ -0,0 +1,152 @@
+puddletag (2.0.1-1+devuan) obs; urgency=high
+
+  * New upstream release with Python3 and Qt5 port.
+  * Fork debian debian.tar.xz and remove all docs steps which
+    were broken.
+  * Bump compat level to 12
+  * Omit pybuild which was just causing build issues.
+
+ -- Ben Stack <bgstack15@gmail.com>  Wed, 16 Sep 2020 21:27:33 -0400
+
+puddletag (1.2.0-2) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * d/copyright: Use https protocol in Format field
+
+  [ Sandro Tosi ]
+  * debian/copyright
+    - extend packaging copyright years
+  * debian/control
+    - bump Standards-Version to 4.3.0 (no changes needed)
+  * bump compat level to 11
+
+ -- Sandro Tosi <morph@debian.org>  Sun, 03 Feb 2019 13:09:12 -0500
+
+puddletag (1.2.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/patches/88a3ad2e3a46c549dc03a408fab2813d02c0ea58.patch
+    - remove, included in upstream release
+  * debian/rules
+    - install README.rst not a broken symlink; Closes: #846600
+  * declare compat level 10
+
+ -- Sandro Tosi <morph@debian.org>  Sat, 10 Dec 2016 19:23:10 -0500
+
+puddletag (1.1.1-2) unstable; urgency=medium
+
+  * debian/patches/88a3ad2e3a46c549dc03a408fab2813d02c0ea58.patch
+    - support an updated python-mutagen; Closes: #833910
+
+ -- Sandro Tosi <morph@debian.org>  Sun, 14 Aug 2016 19:07:53 +0100
+
+puddletag (1.1.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/copyright
+    - update Source location
+    - extend packaging copyright years
+    - adapt file location to new upstream code organization
+    - update docs copyright/license information
+  * debian/watch
+    - look for new releases on github
+  * debian/control
+    - update Homepage field
+    - add python-levenshtein to Recommends (needed for diffs submodule)
+    - add python-mysqldb to Recommends (needed for amarok integration)
+    - bump Standards-Version to 3.9.8 (no changes needed)
+  * debian/rules
+    - install upstream changelog
+    - docs location is now 'puddletag-docs'
+    - install extra docs as arguments to dh_installdocs
+    - install python module & program from 'source'
+  * debian/patches/489acd2ee62eb5fbff95f8220dc8958c14871931.patch
+    - removed, merged upstream
+  * debian/patches/add_missing_doc_files.patch
+    - removed, merged upstream
+
+ -- Sandro Tosi <morph@debian.org>  Wed, 27 Apr 2016 12:43:17 +0100
+
+puddletag (1.0.5-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/control(
+    - remove Rogério from Uploaders, thanks for all your work; Closes: #777514
+    - switch me to Maintainer (team to Uploaders)
+    - add python-sphinx-bootstrap-theme to b-d-i, needed to build doc
+    - drop python-musicbrainz2 Recommends, implemented internally;
+      Closes: #786358
+    - bump Standards-Version to 3.9.6 (no changes needed)
+  * debian/copyright
+    - extend packaging copyright years
+  * debian/patches/add_missing_doc_files.patch
+    - add missing files, required to build doc
+  * Switch from pysupport to dh_python2; Closes: #786288
+  * debian/patches/489acd2ee62eb5fbff95f8220dc8958c14871931.patch
+    - fix crash at startup, due to new Qt4; Closes: #791752
+
+ -- Sandro Tosi <morph@debian.org>  Mon, 27 Jul 2015 00:01:56 +0100
+
+puddletag (1.0.2-1) unstable; urgency=low
+
+  [ Jakub Wilk ]
+  * Use canonical URIs for Vcs-* fields.
+
+  [ Sandro Tosi ]
+  * New upstream release; Closes: #712021
+  * debian/copyright
+    - extended debian packaging copyright years
+  * debian/control
+    - bump Standards-Version to 3.9.5 (no changes needed)
+
+ -- Sandro Tosi <morph@debian.org>  Tue, 31 Dec 2013 16:11:01 +0100
+
+puddletag (1.0.1-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/control
+    - add libchromaprint-tools to Recommends, needed to enable AcoustID
+  * debian/rules
+    - use 'sphinx-build' to build documentation
+
+ -- Sandro Tosi <morph@debian.org>  Sat, 01 Sep 2012 12:42:44 +0200
+
+puddletag (1.0.0-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/watch
+    - updated to recognize RC vesions
+
+ -- Sandro Tosi <morph@debian.org>  Wed, 22 Aug 2012 21:41:00 +0200
+
+puddletag (1.0.0~rc1-1) unstable; urgency=low
+
+  * New upstream release candidate
+  * debian/copyright
+    - updated for new upstream code + extended packaging copyright years
+    - use versioned link to copyright DEP
+  * debian/control
+    - added python-audioread, python-acoustid to Depends, needed for AcoustID
+      support
+    - bump Standards-Version to 3.9.3 (no changes needed)
+
+ -- Sandro Tosi <morph@debian.org>  Sun, 10 Jun 2012 12:47:33 +0200
+
+puddletag (1.0.0~beta4-1) experimental; urgency=low
+
+  [ Stefano Rivera ]
+  * Add missing Build-Depends on python-support; thanks to Jakub Wilk for the
+    report; Closes: #652342
+
+  [ Sandro Tosi ]
+  * New (beta) upstream release
+  * debian/watch
+    - handle beta releases
+
+ -- Sandro Tosi <morph@debian.org>  Mon, 13 Feb 2012 22:15:32 +0100
+
+puddletag (0.10.6.3-1) unstable; urgency=low
+
+  * Initial release; Closes: #617854
+
+ -- Sandro Tosi <morph@debian.org>  Thu, 18 Aug 2011 11:29:45 +0200
diff --git a/puddletag/debian/compat b/puddletag/debian/compat
new file mode 100644
index 0000000..48082f7
--- /dev/null
+++ b/puddletag/debian/compat
@@ -0,0 +1 @@
+12
diff --git a/puddletag/debian/control b/puddletag/debian/control
new file mode 100644
index 0000000..b7c4535
--- /dev/null
+++ b/puddletag/debian/control
@@ -0,0 +1,35 @@
+Source: puddletag
+Section: sound
+Priority: optional
+Maintainer: Ben Stack <bgstack15@gmail.com>
+Build-Depends: debhelper (>= 11), python3, dh-python
+Build-Depends-Indep: python3-sphinx, python3-sphinx-bootstrap-theme, python3-wheel, python3-markdown, python3-pyrss2gen, python3-pyqt5, python3-configobj, python3-mutagen, python3-pyparsing
+Standards-Version: 4.3.0
+XS-Python-Version: all
+Homepage: http://docs.puddletag.net/
+XSBC-Original-Maintainer: Sandro Tosi <morph@debian.org>
+
+Package: puddletag
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${sphinxdoc:Depends}, python3-mutagen, python3-pyparsing, python3-configobj, python3-pyqt5, python3-pyqt5.qtsvg, python3-wheel, python3-markdown
+Recommends: libchromaprint-tools, python3-levenshtein, python3-mysqldb
+Suggests: quodlibet
+Description: simple, powerful audio tag editor
+ puddletag is an audio tag editor (primarily created) for GNU/Linux
+ similar to the Windows program, Mp3tag. Unlike most taggers for
+ GNU/Linux, it uses a spreadsheet-like layout so that all the tags you
+ want to edit by hand are visible and easily editable.
+ .
+ The usual tag editor features are supported like extracting tag
+ information from filenames, renaming files based on their tags by
+ using patterns and basic tag editing.
+ .
+ Then there're Functions, which can do things like replace text, trim
+ it, do case conversions, etc. Actions can automate repetitive
+ tasks. You can import your QuodLibet library, lookup tags using
+ Amazon (including cover art), Discogs (does cover art too!), FreeDB
+ and MusicBrainz (and more).
+ .
+ Supported formats: ID3v1, ID3v2 (mp3), MP4 (mp4, m4a, etc.),
+ VorbisComments (ogg, flac), Musepack (mpc), Monkey's Audio (ape) and
+ WavPack (wv).
diff --git a/puddletag/debian/copyright b/puddletag/debian/copyright
new file mode 100644
index 0000000..5181864
--- /dev/null
+++ b/puddletag/debian/copyright
@@ -0,0 +1,97 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: puddletag
+Source: https://github.com/keithgg/puddletag/
+
+Files: *
+Copyright: 2008-2012 concentricpuddle <concentricpuddle@gmail.com>
+License: GPL-3
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+  `/usr/share/common-licenses/GPL-3'.
+
+Files: puddletag-docs/_templates/offline/static/reset-fonts-grids.css puddletag-docs/_templates/djangodocs/static/reset-fonts-grids.css
+Copyright: Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+License: BSD
+
+Files: puddletag-docs/_static/bootstrap-3.0.0/css/bootstrap.min.css puddletag-docs/_static/bootstrap-3.0.0/css/bootstrap-theme.min.css
+Copyright: Copyright 2012-2015 Thomas Park
+License: MIT
+Comment: bootswatch v3.3.6, Based on Bootstrap
+ Bootstrap v3.3.6 (http://getbootstrap.com)
+ Copyright 2011-2015 Twitter, Inc.
+ Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+
+Files: puddletag-docs/_static/bootstrap.min.css
+License: MIT
+Comment: normalize.css v2.1.3 | MIT License | git.io/normalize
+
+Files: puddletag-docs/_templates/rss/genindex.html puddletag-docs/_templates/rss/genindex-single.html puddletag-docs/_templates/rss/genindex-split.html puddletag-docs/_templates/rss/page.html
+Copyright: Copyright 2007-2011 by the Sphinx team
+License: BSD
+
+Files: source/puddlestuff/functions.py
+Copyright: Copyright (C) 2008-2010 concentricpuddle
+License: GPL-2
+
+Files: source/puddlestuff/tagsources/CDDB.py
+Copyright: 1999 Ben Gertzfield <che@debian.org>
+License: GPL-2+
+Comment: taken from CDDB.py project
+
+Files: source/puddlestuff/tagsources/_acoustid.py
+Copyright: Copyright 2012, Adrian Sampson.
+License: MIT
+Comment: This file is part of pyacoustid.
+
+Files: source/puddlestuff/audioinfo/_compatid3.py
+Copyright: Copyright (C) 2006 Lukáš Lalinský
+ Copyright (C) 2005 Michael Urman
+License: GPL-2+
+Comment: taken from Picard
+
+Files: source/puddlestuff/audioinfo/wma.py
+License: GPL-2+
+Comment: derivative work from Picard's wma.py module
+
+Files: source/puddlestuff/data/{copy.png, cut.png, duplicate.png, edit.png,
+ filenew.png, preferences.png, playlist.png, quickaction.png, reload.png,
+ remove.png, undo.png, save.png, paste.png, action.png, open.png, addfolder.png}
+License: GPL-3+
+Comment: embedded copies of oxygen-icon-theme image files
+
+Files: source/puddlestuff/resource.py
+Comments: embed source/puddlestuff/data/*.png files. It is compiled by pyrcc4
+ from source/puddlestuff/resourec.qrc, the QT resource file, that so it is its
+ preferred form of modification.
+
+Files: debian/*
+Copyright: 2012-2019 Sandro Tosi <morph@debian.org>
+License: same as upstream
+
+Files: debian/templatebuiltins.js
+Copyright: Copyright (c) Django Software Foundation and individual contributors.
+License: Main Django Code Licence
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+     1. Redistributions of source code must retain the above copyright notice, 
+        this list of conditions and the following disclaimer.
+ .   
+     2. Redistributions in binary form must reproduce the above copyright 
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+ .
+     3. Neither the name of Django nor the names of its contributors may be used
+        to endorse or promote products derived from this software without
+        specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/puddletag/debian/gbp.conf b/puddletag/debian/gbp.conf
new file mode 100644
index 0000000..3879982
--- /dev/null
+++ b/puddletag/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/master
diff --git a/puddletag/debian/puddletag+devuan.dsc b/puddletag/debian/puddletag+devuan.dsc
new file mode 100644
index 0000000..8dabdd5
--- /dev/null
+++ b/puddletag/debian/puddletag+devuan.dsc
@@ -0,0 +1,17 @@
+Format: 3.0 (quilt)
+Source: puddletag
+Binary: puddletag
+Architecture: all
+Version: 2.0.1-1+devuan
+Maintainer: Ben Stack <bgstack15@gmail.com>
+Homepage: http://docs.puddletag.net/
+Standards-Version: 4.3.0
+Build-Depends: debhelper (>= 11), python3, dh-python
+Build-Depends-Indep: python3-sphinx, python3-sphinx-bootstrap-theme, python3-wheel, python3-markdown, python3-pyrss2gen, python3-pyqt5, python3-configobj, python3-mutagen, python3-pyparsing
+Package-List:
+ puddletag deb sound optional arch=all
+Files:
+ 00000000000000000000000000000000 1 puddletag_2.0.1.orig.tar.gz
+ 00000000000000000000000000000000 1 puddletag_2.0.1-1+devuan.debian.tar.xz
+Original-Maintainer: Sandro Tosi <morph@debian.org>
+Python-Version: all
diff --git a/puddletag/debian/puddletag.doc-base b/puddletag/debian/puddletag.doc-base
new file mode 100644
index 0000000..c9b7733
--- /dev/null
+++ b/puddletag/debian/puddletag.doc-base
@@ -0,0 +1,11 @@
+Document: puddletag
+Title: A simple, powerful audio tag editor
+Author: concentricpuddle
+Abstract: puddletag is just a tag editor. Although it’s likely better
+ than what you’re used to (unless you’ve used Mp3tag, in which case
+ it’s kinda like what you’re used to).
+Section: Sound
+
+Format: HTML
+Index: /usr/share/doc/puddletag/html/index.html
+Files: /usr/share/doc/puddletag/html/*
diff --git a/puddletag/debian/rules b/puddletag/debian/rules
new file mode 100755
index 0000000..42976fb
--- /dev/null
+++ b/puddletag/debian/rules
@@ -0,0 +1,39 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+# Using pybuild causes build failures. Omitting pybuild throws tons of lintian warnings but it builds.
+#export PYBUILD_NAME=puddletag
+#export PYBUILD_SYSTEM=distutils
+# ON DH INVOCATION: --buildsystem=pybuild
+
+%:
+	dh $@ --with python3,sphinxdoc
+
+override_dh_clean:
+	dh_clean
+	$(MAKE) -C puddletag-docs clean
+
+override_dh_auto_install:
+	cd $(CURDIR)/source ; \
+	python3 setup.py install --root=$(CURDIR)/debian/puddletag --install-layout=deb
+
+	$(MAKE) -C puddletag-docs documentation SPHINXBUILD=sphinx-build
+
+override_dh_installdocs:
+	dh_installdocs README.rst source/THANKS source/TODO
+	mv puddletag-docs/_build/documentation/ puddletag-docs/_build/html/
+	dh_installdocs puddletag-docs/_build/html/
+	dh_link /usr/share/doc/puddletag/html/docs.html /usr/share/doc/puddletag/html/index.html
+
+override_dh_compress:
+	dh_compress -X.txt
+
+override_dh_installchangelogs:
+	dh_installchangelogs source/changelog
diff --git a/puddletag/debian/source/format b/puddletag/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/puddletag/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/puddletag/debian/watch b/puddletag/debian/watch
new file mode 100644
index 0000000..a143e47
--- /dev/null
+++ b/puddletag/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts="filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/puddletag-$1.tar.gz/" \
+ https://github.com/puddletag/puddletag/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz