debian/changelog

+caja-admin (0.0.1-3) unstable; urgency=medium
+
+  * Upload to unstable as is.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Fri, 03 Jan 2020 05:48:28 +0000
+
+caja-admin (0.0.1-3~exp1) experimental; urgency=medium
+
+  * debian/{control,compat}:
+    + Switch to debhelper-compat notation. Bump DH compat level to version 12.
+  * debian/control:
+    + Bump Standards-Version: to 4.4.1. No changes needed.
+    + Add Rules-Requires-Root: field and set it to no.
+  * debian/{control,rules}:
+    + Port B-Ds and Ds to Python3. (Closes: #936265).
+  * debian/patches:
+    + Add 0001_python3-compat.patch. Provide Python3 compatibility.
+  * debian/copyright:
+    + Rename license tag GPL-3+ to GPL-3.0+. Fixes inconsistent-
+      appstream-metadata-license lintian issue.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Tue, 10 Dec 2019 11:45:41 +0100
+
 caja-admin (0.0.1-2) unstable; urgency=medium
 
   [ Vangelis Mouhtsis ]

debian/compat

-10

debian/control

@@ -7,25 +7,26 @@ Uploaders:
  Vangelis Mouhtsis <vangelis@gnugr.org>,
 Build-Depends:
  cmake,
- debhelper (>= 10),
- python:any | python-all:any | python-dev:any | python-all-dev:any,
+ debhelper-compat (= 12),
+ dh-python,
+ python3:any | python3-all:any | python3-dev:any | python3-all-dev:any,
 Standards-Version: 4.4.1
 Rules-Requires-Root: no
 Homepage: https://github.com/infirit/caja-admin/
 Vcs-Browser: https://salsa.debian.org/debian-mate-team/caja-admin
 Vcs-Git: https://salsa.debian.org/debian-mate-team/caja-admin.git
-X-Python-Version: >= 2.7
+X-Python-Version: >= 3.6
 
 Package: caja-admin
 Architecture: all
 Depends:
  ${misc:Depends},
- ${python:Depends},
- python-gi,
+ ${python3:Depends},
+ python3-gi,
  gir1.2-gtk-3.0,
  caja,
  policykit-1,
- python-caja,
+ python3-caja (>= 1.23.0),
 Recommends:
  pluma,
  mate-terminal,

debian/copyright

@@ -6,7 +6,7 @@ Source: https://github.com/infirit/caja-admin
 Files: extension/caja-admin.py.in
 Copyright: 2015-2016, Bruno Nova <brunomb.nova@gmail.com>
   2016, frmdstryr <frmdstryr@gmail.com>
-License: GPL-3+
+License: GPL-3.0+
 
 Files: .gitignore
  AUTHORS
@@ -19,7 +19,7 @@ Files: .gitignore
  generate-pot-file.sh
  polkit/org.freedesktop.caja-admin.policy.in
 Copyright: 2015-2016, Bruno Nova <brunomb.nova@gmail.com>
-License: GPL-3+
+License: GPL-3.0+
 Comment:
  Assuming same copyright holdership and license from the majority
  of the other files in the upstream source tree.
@@ -39,13 +39,13 @@ Files:
  po/sk.po
  po/zh_CN.po
 Copyright: 2015-2016, Bruno Nova <brunomb.nova@gmail.com>
-License: GPL-3+
+License: GPL-3.0+
 
 Files: debian/*
 Copyright: 2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-License: GPL-3+
+License: GPL-3.0+
 
-License: GPL-3+
+License: GPL-3.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 3 of the License, or

debian/patches/0001_python3-compat.patch

+From 0af109ac79df76fbcc406d577d79f1c64d1a1fca Mon Sep 17 00:00:00 2001
+From: Patrick Monnerat <patrick@monnerat.net>
+Date: Tue, 12 Feb 2019 03:31:31 +0100
+Subject: [PATCH] Python 3 compatibility.
+
+Still running with Python 2.
+---
+ extension/caja-admin.py.in | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/extension/caja-admin.py.in b/extension/caja-admin.py.in
+index 8280808..480531c 100644
+--- a/extension/caja-admin.py.in
++++ b/extension/caja-admin.py.in
+@@ -15,7 +15,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-import os, subprocess, urlparse, traceback
++import os, subprocess, traceback
+ from gi.repository import Caja, GObject, Gtk, GLib
+ from gettext import gettext, locale, bindtextdomain, textdomain
+ 
+@@ -154,9 +154,7 @@ class CajaAdmin(Caja.MenuProvider, GObject.GObject):
+ 	def _is_executable(self, file):
+ 		"""Returns whether the current user can execute the given file."""
+ 		try:
+-			uri = file.get_uri()
+-			p = urlparse.urlparse(uri)
+-			path = os.path.abspath(os.path.join(p.netloc, p.path))
++			path = file.get_location().get_path()
+ 			return os.access(path,os.X_OK)
+ 		except:
+ 			return False
+@@ -165,9 +163,7 @@ class CajaAdmin(Caja.MenuProvider, GObject.GObject):
+ 		"""'Run as Administrator' menu item callback."""
+ 		if self._show_warning_dialog():
+ 			try:
+-				uri = file.get_uri()
+-				p = urlparse.urlparse(uri)
+-				path = os.path.abspath(os.path.join(p.netloc, p.path))
++				path = file.get_location().get_path()
+ 				#is_app = not os.path.splitext(path)[-1]
+ 				cmd = [PKEXEC_PATH]
+ 				#cmd +=['env','DISPLAY='+os.environ['DISPLAY'],'XAUTHORITY='+os.environ['XAUTHORITY']]
+

debian/patches/series

+0001_python3-compat.patch

debian/rules

@@ -2,7 +2,7 @@
 # -*- mode: makefile; coding: utf-8 -*-
 
 %:
-	dh ${@} --with python2
+	dh ${@} --with python3
 
 get-orig-source:
 	uscan --noconf --force-download --rename --download-current-version --destdir=..