[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][debian-mate-team/caja-admin][master] 6 commits: debian/patches: Add 0001_python3-compat.patch. Port to Py3.

Title: GitLab

Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / caja-admin

Commits:

7 changed files:

Changes:

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

  • debian/compat deleted
    1 
    -10

  • debian/control
    ... ... @@ -7,25 +7,26 @@ Uploaders:
    7 7 
      Vangelis Mouhtsis <vangelis@gnugr.org>,
    8 8 
     Build-Depends:
    9 9 
      cmake,
    10 
    - debhelper (>= 10),
    11 
    - python:any | python-all:any | python-dev:any | python-all-dev:any,
    10 
    + debhelper-compat (= 12),
    11 
    + dh-python,
    12 
    + python3:any | python3-all:any | python3-dev:any | python3-all-dev:any,
    12 13 
     Standards-Version: 4.4.1
    13 14 
     Rules-Requires-Root: no
    14 15 
     Homepage: https://github.com/infirit/caja-admin/
    15 16 
     Vcs-Browser: https://salsa.debian.org/debian-mate-team/caja-admin
    16 17 
     Vcs-Git: https://salsa.debian.org/debian-mate-team/caja-admin.git
    17 
    -X-Python-Version: >= 2.7
    18 
    +X-Python-Version: >= 3.6
    18 19
    19 20 
     Package: caja-admin
    20 21 
     Architecture: all
    21 22 
     Depends:
    22 23 
      ${misc:Depends},
    23 
    - ${python:Depends},
    24 
    - python-gi,
    24 
    + ${python3:Depends},
    25 
    + python3-gi,
    25 26 
      gir1.2-gtk-3.0,
    26 27 
      caja,
    27 28 
      policykit-1,
    28 
    - python-caja,
    29 
    + python3-caja (>= 1.23.0),
    29 30 
     Recommends:
    30 31 
      pluma,
    31 32 
      mate-terminal,

  • debian/copyright
    ... ... @@ -6,7 +6,7 @@ Source: https://github.com/infirit/caja-admin
    6 6 
     Files: extension/caja-admin.py.in
    7 7 
     Copyright: 2015-2016, Bruno Nova <brunomb.nova@gmail.com>
    8 8 
       2016, frmdstryr <frmdstryr@gmail.com>
    9 
    -License: GPL-3+
    9 
    +License: GPL-3.0+
    10 10
    11 11 
     Files: .gitignore
    12 12 
      AUTHORS
    ... ... @@ -19,7 +19,7 @@ Files: .gitignore
    19 19 
      generate-pot-file.sh
    20 20 
      polkit/org.freedesktop.caja-admin.policy.in
    21 21 
     Copyright: 2015-2016, Bruno Nova <brunomb.nova@gmail.com>
    22 
    -License: GPL-3+
    22 
    +License: GPL-3.0+
    23 23 
     Comment:
    24 24 
      Assuming same copyright holdership and license from the majority
    25 25 
      of the other files in the upstream source tree.
    ... ... @@ -39,13 +39,13 @@ Files:
    39 39 
      po/sk.po
    40 40 
      po/zh_CN.po
    41 41 
     Copyright: 2015-2016, Bruno Nova <brunomb.nova@gmail.com>
    42 
    -License: GPL-3+
    42 
    +License: GPL-3.0+
    43 43
    44 44 
     Files: debian/*
    45 45 
     Copyright: 2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
    46 
    -License: GPL-3+
    46 
    +License: GPL-3.0+
    47 47
    48 
    -License: GPL-3+
    48 
    +License: GPL-3.0+
    49 49 
      This program is free software: you can redistribute it and/or modify
    50 50 
      it under the terms of the GNU General Public License as published by
    51 51 
      the Free Software Foundation, either version 3 of the License, or

  • debian/patches/0001_python3-compat.patch
    1 
    +From 0af109ac79df76fbcc406d577d79f1c64d1a1fca Mon Sep 17 00:00:00 2001
    2 
    +From: Patrick Monnerat <patrick@monnerat.net>
    3 
    +Date: Tue, 12 Feb 2019 03:31:31 +0100
    4 
    +Subject: [PATCH] Python 3 compatibility.
    5 
    +
    6 
    +Still running with Python 2.
    7 
    +---
    8 
    + extension/caja-admin.py.in | 10 +++-------
    9 
    + 1 file changed, 3 insertions(+), 7 deletions(-)
    10 
    +
    11 
    +diff --git a/extension/caja-admin.py.in b/extension/caja-admin.py.in
    12 
    +index 8280808..480531c 100644
    13 
    +--- a/extension/caja-admin.py.in
    14 
    ++++ b/extension/caja-admin.py.in
    15 
    +@@ -15,7 +15,7 @@
    16 
    + # You should have received a copy of the GNU General Public License
    17 
    + # along with this program.  If not, see <http://www.gnu.org/licenses/>.
    18 
    +
    19 
    +-import os, subprocess, urlparse, traceback
    20 
    ++import os, subprocess, traceback
    21 
    + from gi.repository import Caja, GObject, Gtk, GLib
    22 
    + from gettext import gettext, locale, bindtextdomain, textdomain
    23 
    +
    24 
    +@@ -154,9 +154,7 @@ class CajaAdmin(Caja.MenuProvider, GObject.GObject):
    25 
    + 	def _is_executable(self, file):
    26 
    + 		"""Returns whether the current user can execute the given file."""
    27 
    + 		try:
    28 
    +-			uri = file.get_uri()
    29 
    +-			p = urlparse.urlparse(uri)
    30 
    +-			path = os.path.abspath(os.path.join(p.netloc, p.path))
    31 
    ++			path = file.get_location().get_path()
    32 
    + 			return os.access(path,os.X_OK)
    33 
    + 		except:
    34 
    + 			return False
    35 
    +@@ -165,9 +163,7 @@ class CajaAdmin(Caja.MenuProvider, GObject.GObject):
    36 
    + 		"""'Run as Administrator' menu item callback."""
    37 
    + 		if self._show_warning_dialog():
    38 
    + 			try:
    39 
    +-				uri = file.get_uri()
    40 
    +-				p = urlparse.urlparse(uri)
    41 
    +-				path = os.path.abspath(os.path.join(p.netloc, p.path))
    42 
    ++				path = file.get_location().get_path()
    43 
    + 				#is_app = not os.path.splitext(path)[-1]
    44 
    + 				cmd = [PKEXEC_PATH]
    45 
    + 				#cmd +=['env','DISPLAY='+os.environ['DISPLAY'],'XAUTHORITY='+os.environ['XAUTHORITY']]
    46 
    +

  • debian/patches/series
    1 
    +0001_python3-compat.patch

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

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: