Hello community,
here is the log from the commit of package python-xapp for openSUSE:Factory
checked in at 2020-09-28 14:29:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-xapp (Old)
and /work/SRC/openSUSE:Factory/.python-xapp.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-xapp"
Mon Sep 28 14:29:47 2020 rev:6 rq:838209 version:2.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-xapp/python-xapp.changes 2020-02-09
20:49:07.934899510 +0100
+++ /work/SRC/openSUSE:Factory/.python-xapp.new.4249/python-xapp.changes
2020-09-28 14:30:45.326235627 +0200
@@ -1,0 +2,9 @@
+Sun Sep 27 19:04:22 UTC 2020 - andy great <andythe_gr...@pm.me>
+
+- Update to version 2.0.1.
+ * Packaging: Rename source package
+ * Remove python2 support.
+ * Settings section: ensure that settings inside a revealer can be
+ visible
+
+-------------------------------------------------------------------
Old:
----
python-xapp-1.8.1.tar.gz
New:
----
python3-xapp-2.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-xapp.spec ++++++
--- /var/tmp/diff_new_pack.9Rvy5m/_old 2020-09-28 14:30:45.838236071 +0200
+++ /var/tmp/diff_new_pack.9Rvy5m/_new 2020-09-28 14:30:45.842236075 +0200
@@ -16,18 +16,21 @@
#
+%define skip_python2 1
+%define _name python3-xapp
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-xapp
-Version: 1.8.1
+Version: 2.0.1
Release: 0
Summary: Python XApp library
License: GPL-2.0-or-later
Group: Development/Languages/Python
-URL: https://github.com/linuxmint/python-xapp
-Source:
https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+URL: https://github.com/linuxmint/python3-xapp
+Source:
https://github.com/linuxmint/python3-xapp/archive/%{version}.tar.gz#/%{_name}-%{version}.tar.gz
# PATCH-FEATURE-OPENSUSE python-xapp-xdgsu.patch -- Escalate privileges using
xdg-su.
Patch0: python-xapp-xdgsu.patch
BuildRequires: %{python_module devel}
+BuildRequires: %{python_module setuptools}
BuildRequires: python-rpm-macros
Requires: python-psutil
Requires: xdg-utils
@@ -40,7 +43,7 @@
%python_subpackages
%prep
-%setup -q
+%setup -q -n %{_name}-%{version}
%patch0 -p1
%build
++++++ python-xapp-1.8.1.tar.gz -> python3-xapp-2.0.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-xapp-1.8.1/debian/changelog
new/python3-xapp-2.0.1/debian/changelog
--- old/python-xapp-1.8.1/debian/changelog 2019-11-28 16:43:52.000000000
+0100
+++ new/python3-xapp-2.0.1/debian/changelog 2020-04-22 13:36:14.000000000
+0200
@@ -1,3 +1,19 @@
+python3-xapp (2.0.1) ulyana; urgency=medium
+
+ * Packaging: Rename source package
+
+ -- Clement Lefebvre <r...@linuxmint.com> Wed, 22 Apr 2020 12:34:42 +0100
+
+python-xapp (2.0.0) ulyana; urgency=medium
+
+ [ Stephen Collins ]
+ * Settings section: ensure that settings inside a revealer can be visible
+
+ [ Michael Webster ]
+ * Remove python2 support
+
+ -- Clement Lefebvre <r...@linuxmint.com> Thu, 09 Apr 2020 12:57:02 +0100
+
python-xapp (1.8.1) tricia; urgency=medium
[ Stephen Collins ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-xapp-1.8.1/debian/control
new/python3-xapp-2.0.1/debian/control
--- old/python-xapp-1.8.1/debian/control 2019-11-28 16:43:52.000000000
+0100
+++ new/python3-xapp-2.0.1/debian/control 2020-04-22 13:36:14.000000000
+0200
@@ -1,20 +1,15 @@
-Source: python-xapp
+Source: python3-xapp
Section: python
Priority: optional
Maintainer: Linux Mint <r...@linuxmint.com>
Build-Depends: debhelper (>= 9),
- python-all (>= 2.6.6-3~),
+ dh-python,
+ python3-setuptools,
python3-all
Standards-Version: 3.9.5
X-Python-Version: >= 2.6
X-Python3-Version: >= 3.0
-Package: python-xapp
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-psutil
-Description: Python 2 XApp library
- This package contains the Python 2 version of the library.
-
Package: python3-xapp
Architecture: all
Depends: ${misc:Depends}, ${python3:Depends}, python3-psutil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-xapp-1.8.1/debian/python-xapp.docs
new/python3-xapp-2.0.1/debian/python-xapp.docs
--- old/python-xapp-1.8.1/debian/python-xapp.docs 2019-11-28
16:43:52.000000000 +0100
+++ new/python3-xapp-2.0.1/debian/python-xapp.docs 1970-01-01
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-AUTHORS
-README
-TODO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-xapp-1.8.1/debian/python-xapp.install
new/python3-xapp-2.0.1/debian/python-xapp.install
--- old/python-xapp-1.8.1/debian/python-xapp.install 2019-11-28
16:43:52.000000000 +0100
+++ new/python3-xapp-2.0.1/debian/python-xapp.install 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/python2*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-xapp-1.8.1/debian/python3-xapp.install
new/python3-xapp-2.0.1/debian/python3-xapp.install
--- old/python-xapp-1.8.1/debian/python3-xapp.install 2019-11-28
16:43:52.000000000 +0100
+++ new/python3-xapp-2.0.1/debian/python3-xapp.install 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/python3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-xapp-1.8.1/debian/rules
new/python3-xapp-2.0.1/debian/rules
--- old/python-xapp-1.8.1/debian/rules 2019-11-28 16:43:52.000000000 +0100
+++ new/python3-xapp-2.0.1/debian/rules 2020-04-22 13:36:14.000000000 +0200
@@ -2,24 +2,32 @@
#DH_VERBOSE=1
-PYTHON2=$(shell pyversions -vr)
-PYTHON3=$(shell py3versions -vr)
+# PYTHON3=$(shell py3versions -vr)
-%:
- dh $@ --with python2,python3
+# %:
+# dh $@ --with python3
+
+# build-python%:
+# python3 setup.py build
+
+# override_dh_auto_build:
+# dh_auto_build
+
+# install-python%:
+# python3 setup.py install --root=$(CURDIR)/debian/tmp
--install-layout=deb
-build-python%:
- python$* setup.py build
+# override_dh_auto_install:
+# dh_auto_install
-override_dh_auto_build: $(PYTHON3:%=build-python%)
- dh_auto_build
+# override_dh_auto_clean:
+# dh_auto_clean
+# rm -rf build
-install-python%:
- python$* setup.py install --root=$(CURDIR)/debian/tmp
--install-layout=deb
-override_dh_auto_install: $(PYTHON3:%=install-python%)
- dh_auto_install
-override_dh_auto_clean:
- dh_auto_clean
- rm -rf build
+
+
+export PYBUILD_NAME=python-xapp
+
+%:
+ dh $@ --with python3 --buildsystem=pybuild
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-xapp-1.8.1/setup.py
new/python3-xapp-2.0.1/setup.py
--- old/python-xapp-1.8.1/setup.py 2019-11-28 16:43:52.000000000 +0100
+++ new/python3-xapp-2.0.1/setup.py 2020-04-22 13:36:14.000000000 +0200
@@ -1,9 +1,9 @@
#!/usr/bin/python
-from distutils.core import setup
+from setuptools import setup
setup( name = "python-xapp",
- version = "1.8.1",
+ version = "2.0.1",
description = "Python Xapp Library",
maintainer = "Linux Mint",
maintainer_email = "r...@linuxmint.com",
@@ -11,8 +11,6 @@
packages = ['xapp'],
classifiers = [
"License :: OSI Approved :: GNU Lesser General Public License
v2 (LGPLv2)",
- "Programming Language :: Python :: 2.6",
- "Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3",
"Topic :: Desktop Environment",
],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/python-xapp-1.8.1/xapp/SettingsWidgets.py
new/python3-xapp-2.0.1/xapp/SettingsWidgets.py
--- old/python-xapp-1.8.1/xapp/SettingsWidgets.py 2019-11-28
16:43:52.000000000 +0100
+++ new/python3-xapp-2.0.1/xapp/SettingsWidgets.py 2020-04-22
13:36:14.000000000 +0200
@@ -150,6 +150,9 @@
Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL)
self.set_spacing(10)
+ self.always_show = False
+ self.revealers = []
+
if title or subtitle:
header_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
header_box.set_spacing(5)
@@ -169,6 +172,7 @@
header_box.add(sub)
self.frame = Gtk.Frame()
+ self.frame.set_no_show_all(True)
self.frame.set_shadow_type(Gtk.ShadowType.IN)
frame_style = self.frame.get_style_context()
frame_style.add_class("view")
@@ -177,6 +181,7 @@
self.box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
self.frame.add(self.box)
+ self.add(self.frame)
self.need_separator = False
@@ -194,8 +199,7 @@
vbox.add(list_box)
self.box.add(vbox)
- if self.frame.get_parent() is None:
- self.add(self.frame)
+ self.update_always_show_state()
self.need_separator = True
@@ -219,6 +223,11 @@
self.need_separator = True
+ self.revealers.append(revealer)
+ if not self.always_show:
+ revealer.notify_id = revealer.connect('notify::child-revealed',
self.check_reveal_state)
+ self.check_reveal_state()
+
return revealer
def add_note(self, text):
@@ -229,6 +238,26 @@
self.add(label)
return label
+ def update_always_show_state(self):
+ if self.always_show:
+ return
+
+ self.frame.set_no_show_all(False)
+ self.frame.show_all()
+ self.always_show = True
+
+ for revealer in self.revealers:
+ revealer.disconnect(revealer.notify_id)
+
+ def check_reveal_state(self, *args):
+ for revealer in self.revealers:
+ if revealer.props.child_revealed:
+ self.box.show_all()
+ self.frame.show()
+ return
+
+ self.frame.hide()
+
class SettingsWidget(Gtk.Box):
def __init__(self, dep_key=None):
Gtk.Box.__init__(self)
