initial work on py3+qt5

   This builds an installable dpkg, but only for compat=11

11 files changed, 109 insertions, 560 deletions

diff --git a/puddletag/debian/README.Debian b/puddletag/debian/README.Debian
index d23859c..7e6c6e3 100644
--- a/puddletag/debian/README.Debian
+++ b/puddletag/debian/README.Debian
@@ -1,5 +1,4 @@
-puddletag-py3 for Devuan
+Some interesting services:
 
-This release of puddletag is the python3 branch from a fork.
-
- -- B Stack <bgstack15@gmail.com>  Mon, 23 Dec 2019 07:54:40 -0500
+- 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
index ad938bf..b54894d 100644
--- a/puddletag/debian/changelog
+++ b/puddletag/debian/changelog
@@ -1,9 +1,10 @@
-puddletag-py3 (2.0.0-1+devuan) obs; urgency=high
+puddletag (2.0.1-1+devuan) obs; urgency=high
 
-  * Switch to py3
-  * bump compat level to 12
+  * New upstream release with Python3 and Qt5 port.
+  * Fork debian debian.tar.xz and remove all docs steps which
+    were broken.
 
- -- B Stack <bgstack15@gmail.com>  Mon, 23 Dec 2019 07:54:40 -0500
+ -- Ben Stack <bgstack15@gmail.com>  Sat, 05 Sep 2020 11:52:56 -0400
 
 puddletag (1.2.0-2) unstable; urgency=medium
 
diff --git a/puddletag/debian/compat b/puddletag/debian/compat
index 48082f7..b4de394 100644
--- a/puddletag/debian/compat
+++ b/puddletag/debian/compat
@@ -1 +1 @@
-12
+11
diff --git a/puddletag/debian/control b/puddletag/debian/control
index 4c39d52..b7c4535 100644
--- a/puddletag/debian/control
+++ b/puddletag/debian/control
@@ -1,23 +1,18 @@
-Source: puddletag-py3
+Source: puddletag
 Section: sound
 Priority: optional
-Maintainer: B Stack <bgstack15@gmail.com>
-XSBC-Original-Maintainer: Sandro Tosi <morph@debian.org>
-Build-Depends: debhelper (>= 12),
-   python3,
-   dh-python
-Build-Depends-Indep: python3-sphinx (>= 1.8.5), python3-sphinx-bootstrap-theme
-Standards-Version: 4.1.4
+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/
-Vcs-Git: https://salsa.debian.org/python-team/applications/puddletag.git
-Vcs-Browser: https://salsa.debian.org/python-team/applications/puddletag
+XSBC-Original-Maintainer: Sandro Tosi <morph@debian.org>
 
-Package: puddletag-py3
+Package: puddletag
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${sphinxdoc:Depends}, python3-mutagen (>= 1.40.0), python3-pyqt4 (>= 4.5), python3-pyparsing (>= 2.4.2), python3-configobj (>= 4.5), python3-audioread, python3-acoustid
+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
-Replaces: puddletag (<< 2.0.0)
 Suggests: quodlibet
 Description: simple, powerful audio tag editor
  puddletag is an audio tag editor (primarily created) for GNU/Linux
diff --git a/puddletag/debian/copyright b/puddletag/debian/copyright
index d862f3c..5181864 100644
--- a/puddletag/debian/copyright
+++ b/puddletag/debian/copyright
@@ -1,530 +1,97 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: puddletag
-Source: <url://example.com>
-#
-# Please double check copyright with the licensecheck(1) command.
+Source: https://github.com/keithgg/puddletag/
 
-Files:     .gitignore
-           README.rst
-           puddletag-docs/INSTALL
-           puddletag-docs/Makefile
-           puddletag-docs/_static/bootstrap-3.0.0/css/bootstrap-theme.min.css
-           puddletag-docs/_static/bootstrap-3.0.0/css/bootstrap.min.css
-           puddletag-docs/_static/bootstrap.min.css
-           puddletag-docs/_templates/bootstrap.min.css
-           puddletag-docs/_templates/djangodocs/blockonly.html
-           puddletag-docs/_templates/djangodocs/genindex.html
-           puddletag-docs/_templates/djangodocs/layout.html
-           puddletag-docs/_templates/djangodocs/modindex.html
-           puddletag-docs/_templates/djangodocs/non-doc.html
-           puddletag-docs/_templates/djangodocs/search.html
-           puddletag-docs/_templates/djangodocs/static/default.css
-           puddletag-docs/_templates/djangodocs/static/djangodocs.css
-           puddletag-docs/_templates/djangodocs/static/docicons-behindscenes.png
-           puddletag-docs/_templates/djangodocs/static/docicons-note.png
-           puddletag-docs/_templates/djangodocs/static/docicons-philosophy.png
-           puddletag-docs/_templates/djangodocs/static/homepage.css
-           puddletag-docs/_templates/djangodocs/theme.conf
-           puddletag-docs/_templates/globaltoc.html
-           puddletag-docs/_templates/layout.html
-           puddletag-docs/_templates/my_sidebar.html
-           puddletag-docs/_templates/navbar.html
-           puddletag-docs/_templates/offline/blockonly.html
-           puddletag-docs/_templates/offline/genindex.html
-           puddletag-docs/_templates/offline/layout.html
-           puddletag-docs/_templates/offline/modindex.html
-           puddletag-docs/_templates/offline/non-doc.html
-           puddletag-docs/_templates/offline/search.html
-           puddletag-docs/_templates/offline/static/default.css
-           puddletag-docs/_templates/offline/static/djangodocs.css
-           puddletag-docs/_templates/offline/static/docicons-behindscenes.png
-           puddletag-docs/_templates/offline/static/docicons-note.png
-           puddletag-docs/_templates/offline/static/docicons-philosophy.png
-           puddletag-docs/_templates/offline/static/homepage.css
-           puddletag-docs/_templates/offline/theme.conf
-           puddletag-docs/_templates/rss/genindex-single.html
-           puddletag-docs/_templates/rss/genindex-split.html
-           puddletag-docs/_templates/rss/genindex.html
-           puddletag-docs/_templates/rss/page.html
-           puddletag-docs/_templates/rss/search.html
-           puddletag-docs/_templates/rss/theme.conf
-           puddletag-docs/about.txt
-           puddletag-docs/checksums.txt
-           puddletag-docs/conf.py
-           puddletag-docs/createnews.py
-           puddletag-docs/docs.txt
-           puddletag-docs/download.txt
-           puddletag-docs/feed.png
-           puddletag-docs/fix_html.py
-           puddletag-docs/index.txt
-           puddletag-docs/make.bat
-           puddletag-docs/news.txt
-           puddletag-docs/news/2008-11-25
-           puddletag-docs/news/2008-12-03
-           puddletag-docs/news/2008-12-16
-           puddletag-docs/news/2009-01-20
-           puddletag-docs/news/2009-02-05
-           puddletag-docs/news/2009-03-09
-           puddletag-docs/news/2009-04-08
-           puddletag-docs/news/2009-05-01
-           puddletag-docs/news/2009-06-04
-           puddletag-docs/news/2009-09-09
-           puddletag-docs/news/2009-10-10
-           puddletag-docs/news/2009-11-05
-           puddletag-docs/news/2010-04-14
-           puddletag-docs/news/2010-06-11
-           puddletag-docs/news/2010-06-25
-           puddletag-docs/news/2010-07-04
-           puddletag-docs/news/2010-08-11
-           puddletag-docs/news/2010-08-25
-           puddletag-docs/news/2010-10-09
-           puddletag-docs/news/2010-10-13
-           puddletag-docs/news/2010-10-30
-           puddletag-docs/news/2010-12-16
-           puddletag-docs/news/2010-12-18
-           puddletag-docs/news/2010-12-19
-           puddletag-docs/news/2011-02-09
-           puddletag-docs/news/2011-03-08
-           puddletag-docs/news/2011-03-20
-           puddletag-docs/news/2011-03-23
-           puddletag-docs/news/2011-06-06
-           puddletag-docs/news/2011-09-21
-           puddletag-docs/news/2012-01-22
-           puddletag-docs/news/2012-04-11
-           puddletag-docs/news/2012-06-09
-           puddletag-docs/news/2012-08-21
-           puddletag-docs/news/2012-08-31
-           puddletag-docs/news/2013-06-26
-           puddletag-docs/news/2013-07-14
-           puddletag-docs/news/2013-11-07
-           puddletag-docs/news/2014-06-22
-           puddletag-docs/news/2014-11-09
-           puddletag-docs/news/2014-11-15
-           puddletag-docs/news/2015-05-13
-           puddletag-docs/news/2016-01-31
-           puddletag-docs/news/2016-11-27
-           puddletag-docs/offlinezip.py
-           puddletag-docs/screenshots.txt
-           puddletag-docs/screenshots/1.png
-           puddletag-docs/screenshots/2.png
-           puddletag-docs/screenshots/3.png
-           puddletag-docs/screenshots/4.png
-           puddletag-docs/screenshots/5.png
-           puddletag-docs/screenshots/6.png
-           puddletag-docs/screenshots/small1.png
-           puddletag-docs/screenshots/small2.png
-           puddletag-docs/screenshots/small3.png
-           puddletag-docs/screenshots/small4.png
-           puddletag-docs/screenshots/small6.png
-           puddletag-docs/source/filter.txt
-           puddletag-docs/source/function.txt
-           puddletag-docs/source/functionplugin.tar.gz
-           puddletag-docs/source/functionplugin/info
-           puddletag-docs/source/id3.txt
-           puddletag-docs/source/images/bg1.jpg
-           puddletag-docs/source/images/bg2.jpg
-           puddletag-docs/source/images/body_bg.png
-           puddletag-docs/source/images/border1.gif
-           puddletag-docs/source/images/border2.gif
-           puddletag-docs/source/images/boxbg.gif
-           puddletag-docs/source/images/buttonbg.gif
-           puddletag-docs/source/images/db1.gif
-           puddletag-docs/source/images/db2.gif
-           puddletag-docs/source/images/eg_tagsource.png
-           puddletag-docs/source/images/feed.png
-           puddletag-docs/source/images/footer_bg.png
-           puddletag-docs/source/images/hdrpic.jpg
-           puddletag-docs/source/images/header.png
-           puddletag-docs/source/images/header_bg.png
-           puddletag-docs/source/images/icon-comments.gif
-           puddletag-docs/source/images/icon-more.gif
-           puddletag-docs/source/images/icon-printerfriendly.gif
-           puddletag-docs/source/images/main_bg.png
-           puddletag-docs/source/images/menu_bg.png
-           puddletag-docs/source/images/menu_border.png
-           puddletag-docs/source/images/menuactive.gif
-           puddletag-docs/source/images/menubg.gif
-           puddletag-docs/source/images/menubg.png
-           puddletag-docs/source/images/pic1.jpg
-           puddletag-docs/source/images/pic2.jpg
-           puddletag-docs/source/images/pic3.jpg
-           puddletag-docs/source/images/tagsource_dialog.png
-           puddletag-docs/source/images/tagsource_dialog_tut4.png
-           puddletag-docs/source/images/tagsource_search.png
-           puddletag-docs/source/images/topbg.gif
-           puddletag-docs/source/images/tut3.png
-           puddletag-docs/source/images/tut3_window.png
-           puddletag-docs/source/masstag_images/choose_profile.png
-           puddletag-docs/source/masstag_images/configure_profile.png
-           puddletag-docs/source/masstag_images/configure_tagsource.png
-           puddletag-docs/source/masstag_images/field_desc.png
-           puddletag-docs/source/masstag_images/interactive.png
-           puddletag-docs/source/masstag_images/masstag_config1.png
-           puddletag-docs/source/masstag_images/masstag_config2.png
-           puddletag-docs/source/masstag_images/masstag_config3.png
-           puddletag-docs/source/masstag_images/masstag_config4.png
-           puddletag-docs/source/masstag_images/masstag_config5.png
-           puddletag-docs/source/masstag_images/masstag_config6.png
-           puddletag-docs/source/menus.txt
-           puddletag-docs/source/plugins.txt
-           puddletag-docs/source/preferences.txt
-           puddletag-docs/source/scripting.txt
-           puddletag-docs/source/tags.txt
-           puddletag-docs/source/tagsource.tar.gz
-           puddletag-docs/source/tagsources.txt
-           puddletag-docs/source/translate.txt
-           puddletag-docs/source/tut1.txt
-           puddletag-docs/source/tut1/1.png
-           puddletag-docs/source/tut1/1full.png
-           puddletag-docs/source/tut1/2.png
-           puddletag-docs/source/tut1/2clean.png
-           puddletag-docs/source/tut1/2full.png
-           puddletag-docs/source/tut1/3.png
-           puddletag-docs/source/tut1/3full.png
-           puddletag-docs/source/tut1/4.png
-           puddletag-docs/source/tut1/4full.png
-           puddletag-docs/source/tut1/5.png
-           puddletag-docs/source/tut1/5full.png
-           puddletag-docs/source/tut1/6.png
-           puddletag-docs/source/tut1/6full.png
-           puddletag-docs/source/tut1/actions.png
-           puddletag-docs/source/tut1/actionsbutton.png
-           puddletag-docs/source/tut1/addfolder.png
-           puddletag-docs/source/tut1/caseaction.png
-           puddletag-docs/source/tut1/caseactionedit.png
-           puddletag-docs/source/tut1/filetotag.png
-           puddletag-docs/source/tut1/format.png
-           puddletag-docs/source/tut1/formataction.png
-           puddletag-docs/source/tut1/functions.png
-           puddletag-docs/source/tut1/importfile.png
-           puddletag-docs/source/tut1/importfilewindow.png
-           puddletag-docs/source/tut1/k
-           puddletag-docs/source/tut1/k.png
-           puddletag-docs/source/tut1/musicbrainz.png
-           puddletag-docs/source/tut1/numbering.png
-           puddletag-docs/source/tut1/puddlescreen.png
-           puddletag-docs/source/tut1/puddlescreen2.png
-           puddletag-docs/source/tut1/quickactions.png
-           puddletag-docs/source/tut1/reload.png
-           puddletag-docs/source/tut1/renamedir.png
-           puddletag-docs/source/tut1/small1.png
-           puddletag-docs/source/tut1/tagtofile.png
-           puddletag-docs/source/tut1/textedit.png
-           puddletag-docs/source/tut1/toolbarbuttonscomplete.png
-           puddletag-docs/source/tut1/track.png
-           puddletag-docs/source/tut2.txt
-           puddletag-docs/source/tut3.txt
-           puddletag-docs/source/tut4.txt
-           puddletag-docs/source/tut5.txt
-           puddletag-docs/subs.txt
-           puddletag-docs/to_rss.py
-           puddletag-docs/update_checksums.py
-           source/HACKING
-           source/MANIFEST
-           source/NEWS
-           source/THANKS
-           source/TODO
-           source/create_macos_app_bundle.sh
-           source/create_release.sh
-           source/get_tag.py
-           source/menu
-           source/puddlestuff/__init__.py
-           source/puddlestuff/action_shortcuts.py
-           source/puddlestuff/actiondlg.py
-           source/puddlestuff/audio_filter.py
-           source/puddlestuff/audioinfo/__init__.py
-           source/puddlestuff/audioinfo/apev2.py
-           source/puddlestuff/audioinfo/constants.py
-           source/puddlestuff/audioinfo/id3.py
-           source/puddlestuff/audioinfo/mp4.py
-           source/puddlestuff/audioinfo/tag_versions.py
-           source/puddlestuff/audioinfo/util.py
-           source/puddlestuff/audioinfo/vorbis.py
-           source/puddlestuff/audioinfo/wma.py
-           source/puddlestuff/confirmations.py
-           source/puddlestuff/constants.py
-           source/puddlestuff/data/action.png
-           source/puddlestuff/data/addfolder.png
-           source/puddlestuff/data/cap.png
-           source/puddlestuff/data/caseconversion.action
-           source/puddlestuff/data/copy.png
-           source/puddlestuff/data/cut.png
-           source/puddlestuff/data/duplicate.png
-           source/puddlestuff/data/edit.png
-           source/puddlestuff/data/filenew.png
-           source/puddlestuff/data/filetotag.png
-           source/puddlestuff/data/icon.png
-           source/puddlestuff/data/larrow.png
-           source/puddlestuff/data/menus
-           source/puddlestuff/data/movedown.png
-           source/puddlestuff/data/moveup.png
-           source/puddlestuff/data/open.png
-           source/puddlestuff/data/paste.png
-           source/puddlestuff/data/playlist.png
-           source/puddlestuff/data/preferences.png
-           source/puddlestuff/data/puddlelogo.png
-           source/puddlestuff/data/puddletag.conf
-           source/puddlestuff/data/quickaction.png
-           source/puddlestuff/data/rarrow.png
-           source/puddlestuff/data/reload.png
-           source/puddlestuff/data/remove.png
-           source/puddlestuff/data/rename.png
-           source/puddlestuff/data/renamedirs.png
-           source/puddlestuff/data/save.png
-           source/puddlestuff/data/shortcuts
-           source/puddlestuff/data/standard.action
-           source/puddlestuff/data/tagtofile.png
-           source/puddlestuff/data/text-tag.png
-           source/puddlestuff/data/track.png
-           source/puddlestuff/data/undo.png
-           source/puddlestuff/duplicates/__init__.py
-           source/puddlestuff/duplicates/algwin.py
-           source/puddlestuff/duplicates/dupefuncs.py
-           source/puddlestuff/duplicates/matchfuncs.py
-           source/puddlestuff/findfunc.py
-           source/puddlestuff/funcprint.py
-           source/puddlestuff/functions_dialogs.py
-           source/puddlestuff/genres.py
-           source/puddlestuff/helperwin.py
-           source/puddlestuff/libraries/__init__.py
-           source/puddlestuff/libraries/quodlibetlib.py
-           source/puddlestuff/loadshortcuts.py
-           source/puddlestuff/logger.py
-           source/puddlestuff/m3u.py
-           source/puddlestuff/mainwin/__init__.py
-           source/puddlestuff/mainwin/action_dialogs.py
-           source/puddlestuff/mainwin/artwork.py
-           source/puddlestuff/mainwin/dirview.py
-           source/puddlestuff/mainwin/filterwin.py
-           source/puddlestuff/mainwin/funcs.py
-           source/puddlestuff/mainwin/logdialog.py
-           source/puddlestuff/mainwin/patterncombo.py
-           source/puddlestuff/mainwin/previews.py
-           source/puddlestuff/mainwin/storedtags.py
-           source/puddlestuff/mainwin/tagpanel.py
-           source/puddlestuff/mainwin/tagtools.py
-           source/puddlestuff/mainwin/teststuff.py
-           source/puddlestuff/masstag/__init__.py
-           source/puddlestuff/masstag/config.py
-           source/puddlestuff/masstag/dialogs.py
-           source/puddlestuff/pluginloader.py
-           source/puddlestuff/plugins/__init__.py
-           source/puddlestuff/plugins/dupe_fields/__init__.py
-           source/puddlestuff/plugins/dupe_fields/info
-           source/puddlestuff/plugins/export_tags/__init__.py
-           source/puddlestuff/plugins/extended_tags/__init__.py
-           source/puddlestuff/plugins/extended_tags/info
-           source/puddlestuff/plugins/id3_tools/__init__.py
-           source/puddlestuff/plugins/id3_tools/info
-           source/puddlestuff/plugins/modified_time/__init__.py
-           source/puddlestuff/plugins/modified_time/info
-           source/puddlestuff/plugins/save_tags/__init__.py
-           source/puddlestuff/plugins/save_tags/info
-           source/puddlestuff/plugins/view_all_fields/__init__.py
-           source/puddlestuff/plugins/view_all_fields/info
-           source/puddlestuff/puddleobjects.py
-           source/puddlestuff/puddlesettings.py
-           source/puddlestuff/puddletag.py
-           source/puddlestuff/releasewidget.py
-           source/puddlestuff/shortcutsettings.py
-           source/puddlestuff/tagmodel.py
-           source/puddlestuff/tagsources/CDDB.py
-           source/puddlestuff/tagsources/__init__.py
-           source/puddlestuff/tagsources/acoust_id.py
-           source/puddlestuff/tagsources/amazon.py
-           source/puddlestuff/tagsources/amg.py
-           source/puddlestuff/tagsources/discogs.py
-           source/puddlestuff/tagsources/exampletags.py
-           source/puddlestuff/tagsources/freedb.py
-           source/puddlestuff/tagsources/mp3tag/__init__.py
-           source/puddlestuff/tagsources/mp3tag/funcs.py
-           source/puddlestuff/tagsources/mp3tag/parse_debug.py
-           source/puddlestuff/tagsources/musicbrainz.py
-           source/puddlestuff/tagsources/parse_html.py
-           source/puddlestuff/translations.py
-           source/puddlestuff/util.py
-           source/puddlestuff/webdb.py
-           source/puddletag.1
-           source/puddletag.desktop
-           source/puddletag.png
-           source/puddletag.pro
-           source/puddletag.public
-           source/puddletag.xpm
-           source/restore_tag.py
-           source/setup.py
-           source/tagbackup.py
-           source/update_translation.py
-Copyright: __NO_COPYRIGHT_NOR_LICENSE__
-License:   __NO_COPYRIGHT_NOR_LICENSE__
+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:     source/console
-           source/puddlestuff/libraries/amarok.py
-           source/puddlestuff/libraries/prokyon.py
-           source/puddlestuff/libraries/rhythmbox.py
-           source/puddlestuff/tagsources/example.py
-Copyright: 2008-2009 concentricpuddle
-License:   GPL-2.0+
- This file is part of puddletag, a semi-good music tag editor.
- .
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- .
- On Debian systems, the complete text of the GNU General Public License
- Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+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/_templates/djangodocs/static/reset-fonts-grids.css
-           puddletag-docs/_templates/offline/static/reset-fonts-grids.css
-           source/puddlestuff/functions.py
-Copyright: 2008 Yahoo! Inc. Code licensed under the BSD License: http://developer.yahoo.net/yui/license.txt version: 2.5.1
-           2008-2010 concentricpuddle, GPLv2
-License:   __NO_LICENSE__
+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:     source/puddlestuff/tagsources/_acoustid.py
-Copyright: 2012 Adrian Sampson.
-License:   MIT
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
+Files: puddletag-docs/_static/bootstrap.min.css
+License: MIT
+Comment: normalize.css v2.1.3 | MIT License | git.io/normalize
 
-Files:     source/copyright
-Copyright: 2008-2012 concentricpuddle <concentricpuddle@gmail.com>
-License:   GPL-3.0
- Copyright:
- .
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 3 dated June, 2007.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this package; if not, visit
- .
- <http://www.gnu.org/licenses/gpl-3.0.html>
- .
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-3'
- .
- Contains code from:
- Picard (http://musicbrainz.org/doc/PicardTagger): GPLv2
- CDDB-py (http://cddb-py.sourceforge.net): GPLv2
- PyAcoustID (https://github.com/sampsyo/pyacoustid): MIT
- .
- And icons from the Oxygen Project (http://oxygen-icons.org) licensed under the GPLv3.
- .
- On Debian systems, the complete text of the GNU General Public License
- Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+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/audioinfo/_compatid3.py
-Copyright: 2005 Michael Urman
-           2006 Lukáš Lalinský
-License:   GPL-2.0+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU General Public License
- Version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+Files: source/puddlestuff/functions.py
+Copyright: Copyright (C) 2008-2010 concentricpuddle
+License: GPL-2
 
-Files:     source/puddlestuff/about.py
-Copyright: __NO_COPYRIGHT__ in: source/puddlestuff/about.py
-License:   __UNKNOWN__
- Licensed under GPLv3 (<a href="www.gnu.org/licenses/gpl-3.0.html">www.gnu.org/licenses/gpl-3.0.html</a>).
+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/musiclib.py
-Copyright: __NO_COPYRIGHT__ in: source/puddlestuff/musiclib.py
-License:   __UNKNOWN__
- self.libattrs.append(
- {'name': name, 'desc':desc, 'author': author, 'module': lib})
- .
- self.libattrs.extend(extralibs)
- .
- if not self.libattrs:
- raise MusicLibError(0, errors[0])
- .
- self.listbox.addItems([z['name'] for z in self.libattrs])
+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/puddletag
-Copyright: __NO_COPYRIGHT__ in: source/puddletag
-License:   __UNKNOWN__
- if langfile:
- if not langfile.endswith('.qm'):
- print(translate('Defaults', 'Invalid translation file.'))
+Files: source/puddlestuff/audioinfo/wma.py
+License: GPL-2+
+Comment: derivative work from Picard's wma.py module
 
-Files:     puddletag-docs/source/functionplugin/__init__.py
-Copyright: concentricpuddle, GPLv2
-License:   __UNKNOWN__
- There are three types of controls that are allowed in creating a dialog
- for an Function. TEXT, COMBO and CHECKBOX correspond to a lineedit, combobox
- and a checkbox respectively.
+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
 
-#----------------------------------------------------------------------------
-# xml and html files (skipped):
-#         puddletag-docs/rss.xml
-#         puddletag-docs/_templates/rss/layout.html
-#         puddletag-docs/source/images/tagsource_dialog_tut4\.svg
-#         puddletag-docs/source/images/blank.svg
-#         puddletag-docs/source/images/tut3.svg
-#         puddletag-docs/source/images/tagsource_dialog_tut4.svg
-#         puddletag-docs/source/images/eg_tagsource.svg
-#         puddletag-docs/source/tut1/2numbered.svg
-#         source/logo.svg
-#         source/translations/puddletag_de.ts
-#         source/translations/puddletag_pt_BR.qm
-#         source/translations/puddletag_es_es.qm
-#         source/translations/puddletag_ru_RU.qm
-#         source/translations/puddletag_sv.ts
-#         source/translations/puddletag_sv.qm
-#         source/translations/puddletag_pt_BR.ts
-#         source/translations/puddletag_fr.qm
-#         source/translations/puddletag_nl-nl.qm
-#         source/translations/puddletag_afr.ts
-#         source/translations/puddletag_es_es.ts
-#         source/translations/puddletag_cs.qm
-#         source/translations/puddletag_de.qm
-#         source/translations/puddletag_fr.ts
-#         source/translations/puddletag_ru_RU.ts
-#         source/translations/puddletag_nl-nl.ts
-#         source/translations/puddletag_cs.ts
-#         source/puddlestuff/resourec.qrc
-#         source/puddlestuff/data/icon.svg
+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.
 
-#----------------------------------------------------------------------------
-# huge files   (skipped):
-#         puddletag-docs/screenshots/small5.png
-#         source/puddlestuff/resource.py
+Files: debian/*
+Copyright: 2012-2019 Sandro Tosi <morph@debian.org>
+License: same as upstream
 
-#----------------------------------------------------------------------------
-# Files marked as NO_LICENSE_TEXT_FOUND may be covered by the following
-# license/copyright files.
+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/patches/series b/puddletag/debian/patches/series
deleted file mode 100644
index e69de29..0000000
--- a/puddletag/debian/patches/series
+++ /dev/null
diff --git a/puddletag/debian/puddletag.doc-base b/puddletag/debian/puddletag.doc-base
index 5092355..c9b7733 100644
--- a/puddletag/debian/puddletag.doc-base
+++ b/puddletag/debian/puddletag.doc-base
@@ -1,4 +1,4 @@
-Document: puddletag-py3
+Document: puddletag
 Title: A simple, powerful audio tag editor
 Author: concentricpuddle
 Abstract: puddletag is just a tag editor. Although it’s likely better
@@ -7,5 +7,5 @@ Abstract: puddletag is just a tag editor. Although it’s likely better
 Section: Sound
 
 Format: HTML
-Index: /usr/share/doc/puddletag-py3/html/index.html
-Files: /usr/share/doc/puddletag-py3/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
index f253703..9e5fa22 100755
--- a/puddletag/debian/rules
+++ b/puddletag/debian/rules
@@ -10,26 +10,14 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with python3,sphinxdoc
-
-override_dh_clean:
-	dh_clean
-	$(MAKE) -C puddletag-docs clean
+	dh $@ --with python3
 
 override_dh_auto_install:
 	cd $(CURDIR)/source ; \
-	python3 setup.py install --root=$(CURDIR)/debian/puddletag-py3 --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
+	python3 setup.py install --root=$(CURDIR)/debian/puddletag --install-layout=deb
 
 override_dh_compress:
 	dh_compress -X.txt
 
-override_dh_installchangelogs:
-	dh_installchangelogs source/changelog
+#override_dh_installchangelogs:
+#	dh_installchangelogs source/changelog
diff --git a/puddletag/debian/source/local-options b/puddletag/debian/source/local-options
deleted file mode 100644
index 00131ee..0000000
--- a/puddletag/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-#abort-on-upstream-changes
-#unapply-patches
diff --git a/puddletag/debian/watch b/puddletag/debian/watch
index a0f62bb..a143e47 100644
--- a/puddletag/debian/watch
+++ b/puddletag/debian/watch
@@ -1,4 +1,3 @@
-# You must remove unused comment lines for the released package.
 version=3
 opts="filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/puddletag-$1.tar.gz/" \
- https://github.com/keithgg/puddletag/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz
+ https://github.com/puddletag/puddletag/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz