Update debianization

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 <[email protected]>  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 <[email protected]>  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 <[email protected]>  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 <[email protected]>  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 <[email protected]>  Tue, 23 Feb 2016 14:02:41 +0200
+
 metamorphose2 (0.8.2-1) unstable; urgency=low
 
   * Fix bug folder periods (ticket 3148632).

debian/compat

@@ -1 +1 @@
-7
+9

debian/control

@@ -1,14 +1,14 @@
 Source: metamorphose2
 Section: utils
 Priority: optional
-Maintainer: ianaré sévi <ianare@gmail.com>
-Build-Depends: debhelper (>= 6)
-Standards-Version: 3.8.0
-Homepage: http://file-folder-ren.sourceforge.net
+Maintainer: Rob Savoury <[email protected].com>
+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

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 <[email protected]>
+Source: http://file-folder-ren.sourceforge.net/
+
+Files: *
+Copyright: Copyright (C) 2006-2016 Ianaré Sévi <[email protected]>
+License: GPL-3
+
+Files: debian/*
+Copyright: Copyright (C) 2009-2011 Ianaré Sévi <[email protected]>
+           Copyright (C) 2017-2018 Alin Andrei <[email protected]>
+           Copyright (C) 2019 Rob Savoury <[email protected]>
+License: GPL-3
+
+Files: src/icons/*
+Copyright: Copyright (C) Barbara Kämper <[email protected]>
+           Copyright (C) 2006 Paul Davey <[email protected]>
+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 <http://www.gnu.org/licenses/>.
+ .
+ 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 <https://creativecommons.org/licenses/by-nc-sa/2.5/> for details.
 
-    ianaré sévi <[email protected]> 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 <[email protected]>
-
-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 <[email protected]>
-
-and is licensed under the GPLv3, see above.
-
-
-Icons are released under different licenses, check icon_license.txt.

debian/files

@@ -1 +1 @@
-metamorphose2_0.6.6-1_all.deb utils optional
+metamorphose2_0.9.0~beta-1sav0_source.buildinfo utils optional

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;
+

debian/patches/locale-error-python-2.patch

@@ -0,0 +1,20 @@
+From: Rob Savoury <[email protected]>
+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)
+

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
+

debian/patches/series

@@ -0,0 +1,3 @@
+run-with-wxpython3.patch
+fix-makefile-for-launchpad-ppa.patch
+locale-error-python-2.patch

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

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

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)