From 16b4c21fc5c52bdfbd38bc4d336d3926f9a526d9 Mon Sep 17 00:00:00 2001 From: User Date: Tue, 27 Aug 2019 17:36:28 -0700 Subject: [PATCH] Update debianization --- debian/changelog | 48 ++++++++ debian/compat | 2 +- debian/control | 10 +- debian/copyright | 108 ++++++++++-------- debian/docs | 1 - debian/files | 2 +- debian/menu.ex | 2 - debian/metamorphose2.doc-base.EX | 20 ---- .../fix-makefile-for-launchpad-ppa.patch | 29 +++++ debian/patches/locale-error-python-2.patch | 20 ++++ debian/patches/run-with-wxpython3.patch | 12 ++ debian/patches/series | 3 + debian/rules | 2 +- debian/source/format | 1 + src/MainWindow/__init__.py | 3 - 15 files changed, 181 insertions(+), 82 deletions(-) delete mode 100644 debian/docs delete mode 100644 debian/menu.ex delete mode 100644 debian/metamorphose2.doc-base.EX create mode 100644 debian/patches/fix-makefile-for-launchpad-ppa.patch create mode 100644 debian/patches/locale-error-python-2.patch create mode 100644 debian/patches/run-with-wxpython3.patch create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index 78fac5c..3cdcc98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,51 @@ +metamorphose2 (0.9.0~beta-1sav0) xenial; urgency=medium + + * debian/ + - patches: remove unused makefile doc patch and patches/series comment + + add header info (from/date/summary) to Python locale error patch + - control + + set myself as maintainer, big thanks to Ianaré Sévi for the software + (in response to issues on his Metamorphose2 project on Github he has + stated he does not have time to continue maintaining metamorphose2) + + change homepage to reflect this package is now from a forked version + + Depends: add python-pil as alternative to python-imaging (for Bionic) + - copyright: converted previous version to Debian machine-readable format + * Change upstream version to that shown by Metamorphose2 (ie. Help/About) + + -- Rob Savoury Tue, 27 Aug 2019 15:16:26 -0700 + +metamorphose2 (0.8.4+git20160722-1~webupd8~xenial4.1) xenial; urgency=medium + + * Fix issue 16 (https://github.com/metamorphose/metamorphose2/issues/16): + - debian/patches/locale-error-python-2.patch + + -- Rob Savoury Sun, 18 Aug 2019 18:02:18 -0700 + +metamorphose2 (0.8.4+git20160722-1~webupd8~xenial4) xenial; urgency=medium + + * Use latest Git to get it to work properly with wxgtk3.0 + * Enable run-with-wxpython3.patch + * Depend on python-wxgtk3.0 instead of python-wxgtk2.8 + * Disable fix-makefile-doc-install.patch, no longer required + + -- Alin Andrei Wed, 25 Jan 2017 14:37:19 +0200 + +metamorphose2 (0.8.4-1~webupd8~2~xenial) xenial; urgency=medium + + * Depend on python-wxgtk3.0 + * Patch desktop file to run with wxPython3 + * Bump standards-version to 3.9.7 + + -- Alin Andrei Mon, 15 Aug 2016 12:39:21 +0200 + +metamorphose2 (0.8.4-1~webupd8~1) wily; urgency=medium + + * New upstream release + * Depend on python-exif (>=2.1.1) + * Bump python-mutagen requirement to >=1.20 + + -- Alin Andrei Tue, 23 Feb 2016 14:02:41 +0200 + metamorphose2 (0.8.2-1) unstable; urgency=low * Fix bug folder periods (ticket 3148632). diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 5d6a8d2..a2ef640 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,14 @@ Source: metamorphose2 Section: utils Priority: optional -Maintainer: ianaré sévi -Build-Depends: debhelper (>= 6) -Standards-Version: 3.8.0 -Homepage: http://file-folder-ren.sourceforge.net +Maintainer: Rob Savoury +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.8 +Homepage: https://github.com/savoury1/metamorphose2 Package: metamorphose2 Architecture: all -Depends: python (>=2.6), python-wxgtk2.8 (>= 2.8), python-imaging (>=1.1.6), python-mutagen (>=1) +Depends: ${misc:Depends}, python (>=2.6), python-wxgtk3.0, python-imaging (>=1.1.6) | python-pil, python-mutagen (>=1.20), python-exif (>=2.1.1) Description: A mass renamer for files and folders (version 2). A profesional renaming tool for almost any situation, it has many powerful functions. Well suited for those that need to rename many files and/or folders diff --git a/debian/copyright b/debian/copyright index 4b7e10f..7fb0604 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,49 +1,61 @@ -This package was debianized by: +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: metamorphose2 +Upstream-Contact: Ianaré Sévi +Source: http://file-folder-ren.sourceforge.net/ + +Files: * +Copyright: Copyright (C) 2006-2016 Ianaré Sévi +License: GPL-3 + +Files: debian/* +Copyright: Copyright (C) 2009-2011 Ianaré Sévi + Copyright (C) 2017-2018 Alin Andrei + Copyright (C) 2019 Rob Savoury +License: GPL-3 + +Files: src/icons/* +Copyright: Copyright (C) Barbara Kämper + Copyright (C) 2006 Paul Davey +License: GPL-any or CC-BY-NC-SA-2.5 + Unspecified GPL license. +Comment: In the original debian/copyright file Ianaré Sévi wrote this: + "Icons are released under different licenses, check icon_license.txt." + . + Icons from Barbara Kämper are stated as being GPL (no version given). + . + The work of Paul Davey is licensed under CC-BY-NC-SA and on his site + (http://www.deviantart.com/deviation/37966044/) he links to the 3.0 + license, but then quotes 2.5 in the written text (so choosing 2.5 as + this is based on his actual personal statements, rather than a link). + . + It is unknown which icons are from which source, hence this comment. + . + See src/icons/icon_license.txt for further details from Ianaré Sévi. + +Files: src/icons/flags/* +License: public-domain + +License: GPL-3 + 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 3 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, see . + . + On Debian systems, the complete text of the GNU General Public + License version 3 can be found in the file + `/usr/share/common-licenses/GPL-3'. + +License: CC-BY-NC-SA-2.5 + This work is licensed under a Creative Commons + Attribution-NonCommercial-ShareAlike 2.5 Generic License. + . + See for details. - ianaré sévi on Sun, 16 Aug 2009 02:13:30 -0400 - -It was downloaded from: - - http://file-folder-ren.sourceforge.net/ - -Upstream Author(s): - - ianaré sévi - -Copyright: - - Copyright (C) 2006-2009 ianaré sévi - -License: - -### SELECT: ### - 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; either version 3 of the License, or - (at your option) any later version. -### OR ### - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 3 as - published by the Free Software Foundation. -########## - - 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, 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 can be found in `/usr/share/common-licenses/GPL'. - -The Debian packaging is: - - Copyright C) 2009, ianaré sévi - -and is licensed under the GPLv3, see above. - - -Icons are released under different licenses, check icon_license.txt. \ No newline at end of file diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 1e8f0c8..0000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -readme_en.html diff --git a/debian/files b/debian/files index f666081..a75e76b 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -metamorphose2_0.6.6-1_all.deb utils optional +metamorphose2_0.9.0~beta-1sav0_source.buildinfo utils optional diff --git a/debian/menu.ex b/debian/menu.ex deleted file mode 100644 index fa4f4e5..0000000 --- a/debian/menu.ex +++ /dev/null @@ -1,2 +0,0 @@ -?package(metamorphose2):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\ - title="metamorphose2" command="/usr/bin/metamorphose2" diff --git a/debian/metamorphose2.doc-base.EX b/debian/metamorphose2.doc-base.EX deleted file mode 100644 index 42e5f29..0000000 --- a/debian/metamorphose2.doc-base.EX +++ /dev/null @@ -1,20 +0,0 @@ -Document: metamorphose2 -Title: Debian metamorphose2 Manual -Author: -Abstract: This manual describes what metamorphose2 is - and how it can be used to - manage online manuals on Debian systems. -Section: unknown - -Format: debiandoc-sgml -Files: /usr/share/doc/metamorphose2/metamorphose2.sgml.gz - -Format: postscript -Files: /usr/share/doc/metamorphose2/metamorphose2.ps.gz - -Format: text -Files: /usr/share/doc/metamorphose2/metamorphose2.text.gz - -Format: HTML -Index: /usr/share/doc/metamorphose2/html/index.html -Files: /usr/share/doc/metamorphose2/html/*.html diff --git a/debian/patches/fix-makefile-for-launchpad-ppa.patch b/debian/patches/fix-makefile-for-launchpad-ppa.patch new file mode 100644 index 0000000..c6cec84 --- /dev/null +++ b/debian/patches/fix-makefile-for-launchpad-ppa.patch @@ -0,0 +1,29 @@ +--- a/Makefile ++++ b//Makefile +@@ -60,14 +60,14 @@ + cd messages && $(MAKE) install + + # adjust app.py translations' search-path +- sed -i "s|/usr|$(DESTDIR)$(PREFIX)|g" $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/app.py; ++ #sed -i "s|/usr|$(DESTDIR)$(PREFIX)|g" $(DESTDIR)$(PREFIX)/share/$(PACKAGE)/app.py; + + # install the executables + install -d $(DESTDIR)$(PREFIX)/bin/; + install -m 755 $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/; + + # adjust executable' path +- sed -i "s|/usr|$(DESTDIR)$(PREFIX)|g" $(DESTDIR)$(PREFIX)/bin/$(PACKAGE); ++ #sed -i "s|/usr|$(DESTDIR)$(PREFIX)|g" $(DESTDIR)$(PREFIX)/bin/$(PACKAGE); + + # copy icon and launcher if folders exist + #must create this folders or rpm won't build +@@ -79,7 +79,7 @@ + install -d $(DESTDIR)$(PREFIX)/share/applications + install -m 644 $(PACKAGE).desktop $(DESTDIR)$(PREFIX)/share/applications/ + # adjust launcher's path +- sed -i "s|/usr|$(DESTDIR)$(PREFIX)|g" $(DESTDIR)$(PREFIX)/share/applications/$(PACKAGE).desktop ++ #sed -i "s|/usr|$(DESTDIR)$(PREFIX)|g" $(DESTDIR)$(PREFIX)/share/applications/$(PACKAGE).desktop + if [ -d $(DESTDIR)$(PREFIX)/share/app-install/desktop ]; then\ + ln -s $(DESTDIR)$(PREFIX)/share/applications/$(PACKAGE).desktop $(DESTDIR)$(PREFIX)/share/app-install/desktop/$(PACKAGE).desktop;\ + fi; + diff --git a/debian/patches/locale-error-python-2.patch b/debian/patches/locale-error-python-2.patch new file mode 100644 index 0000000..81cacb8 --- /dev/null +++ b/debian/patches/locale-error-python-2.patch @@ -0,0 +1,20 @@ +From: Rob Savoury +Date: Sat, 22 Sep 2018 18:01:23 -0700 +Subject: Fix locales error with Python 2 on Ubuntu + +--- + src/MainWindow/__init__.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/MainWindow/__init__.py b/src/MainWindow/__init__.py +index 529ba52..2962970 100644 +--- a/src/MainWindow/__init__.py ++++ b/src/MainWindow/__init__.py +@@ -497,6 +497,7 @@ class MainWindow(wx.Frame): + app.language = language + app.debug_print("Set language: " + app.language) + ++ locale.setlocale(locale.LC_ALL,'') + self.encoding = unicode(locale.getlocale()[1]) + app.debug_print("Set encoding: " + self.encoding) + diff --git a/debian/patches/run-with-wxpython3.patch b/debian/patches/run-with-wxpython3.patch new file mode 100644 index 0000000..24ce3c8 --- /dev/null +++ b/debian/patches/run-with-wxpython3.patch @@ -0,0 +1,12 @@ +--- a/metamorphose2.desktop ++++ b/metamorphose2.desktop +@@ -5,7 +5,7 @@ + Terminal=false + Categories=Utility;Filesystem; + Icon=metamorphose2 +-Exec=/usr/bin/metamorphose2 ++Exec=/usr/bin/metamorphose2 -w 3.0 + Encoding=UTF-8 + StartupNotify=true + X-AppInstall-Package=metamorphose2 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..d801dc0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +run-with-wxpython3.patch +fix-makefile-for-launchpad-ppa.patch +locale-error-python-2.patch diff --git a/debian/rules b/debian/rules index a2ca493..baefa71 100755 --- a/debian/rules +++ b/debian/rules @@ -60,7 +60,7 @@ binary-indep: install binary-arch: install dh_testdir dh_testroot - dh_installchangelogs changelog.html + dh_installchangelogs dh_installdocs dh_installexamples # dh_install diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/src/MainWindow/__init__.py b/src/MainWindow/__init__.py index eed260e..529ba52 100644 --- a/src/MainWindow/__init__.py +++ b/src/MainWindow/__init__.py @@ -497,9 +497,6 @@ def set_language(self): app.language = language app.debug_print("Set language: " + app.language) - # hacked by Rob Savoury to fix #16 locales error with Python 2 - locale.setlocale(locale.LC_ALL,'') - self.encoding = unicode(locale.getlocale()[1]) app.debug_print("Set encoding: " + self.encoding)