r49180 - in /desktop/unstable/caribou/debian: changelog compat control control.in patches/02_fix_pygi_warnings.patch patches/03_fix_python3.patch patches/series rules
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Mon Jun 27 11:42:25 UTC 2016
Author: bigon
Date: Mon Jun 27 11:42:25 2016
New Revision: 49180
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49180
Log:
* Switch from cdbs to dh and bump debhelper compatibility to 9
* debian/patches/03_fix_python3.patch: Fix python3 compatibility
* debian/control.in: Add explicit build-dependency against dh-python
Added:
desktop/unstable/caribou/debian/patches/03_fix_python3.patch
Modified:
desktop/unstable/caribou/debian/changelog
desktop/unstable/caribou/debian/compat
desktop/unstable/caribou/debian/control
desktop/unstable/caribou/debian/control.in
desktop/unstable/caribou/debian/patches/02_fix_pygi_warnings.patch
desktop/unstable/caribou/debian/patches/series
desktop/unstable/caribou/debian/rules
Modified: desktop/unstable/caribou/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/changelog?rev=49180&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/changelog [utf-8] (original)
+++ desktop/unstable/caribou/debian/changelog [utf-8] Mon Jun 27 11:42:25 2016
@@ -1,12 +1,15 @@
caribou (0.4.20-2) UNRELEASED; urgency=medium
* Switch to python3
+ * Switch from cdbs to dh and bump debhelper compatibility to 9
* Drop -dbg packages and rely on the automatically -dbgsym built ones
* debian/control.in: Bump Standards-Version to 3.9.8 (no further changes)
* debian/patches/01_fix_print_python3.patch: Fix print statement in python3
* debian/patches/02_fix_pygi_warnings.patch: Set version of the bindings
+ * debian/patches/03_fix_python3.patch: Fix python3 compatibility
+ * debian/control.in: Add explicit build-dependency against dh-python
- -- Laurent Bigonville <bigon at debian.org> Tue, 14 Jun 2016 22:13:20 +0200
+ -- Laurent Bigonville <bigon at debian.org> Mon, 27 Jun 2016 13:29:26 +0200
caribou (0.4.20-1) unstable; urgency=medium
Modified: desktop/unstable/caribou/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/compat?rev=49180&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/compat [utf-8] (original)
+++ desktop/unstable/caribou/debian/compat [utf-8] Mon Jun 27 11:42:25 2016
@@ -1 +1 @@
-8
+9
Modified: desktop/unstable/caribou/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/control?rev=49180&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/control [utf-8] (original)
+++ desktop/unstable/caribou/debian/control [utf-8] Mon Jun 27 11:42:25 2016
@@ -8,11 +8,11 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Andreas Henriksson <andreas at fatal.se>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Rico Tzschichholz <ricotz at ubuntu.com>
Build-Depends: debhelper (>= 9.20160114~),
- cdbs (>= 0.4.93~),
+ dh-python,
gnome-pkg-tools,
- dh-autoreconf,
+ dh-autoreconf (>= 4~),
intltool (>= 0.35.0),
- python3 (>= 2.6.6-3~),
+ python3 (>= 3.2),
python-gi-dev (>= 2.90.3),
valac,
gobject-introspection (>= 0.10.7),
Modified: desktop/unstable/caribou/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/control.in?rev=49180&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/control.in [utf-8] (original)
+++ desktop/unstable/caribou/debian/control.in [utf-8] Mon Jun 27 11:42:25 2016
@@ -4,11 +4,11 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@, Rico Tzschichholz <ricotz at ubuntu.com>
Build-Depends: debhelper (>= 9.20160114~),
- cdbs (>= 0.4.93~),
+ dh-python,
gnome-pkg-tools,
- dh-autoreconf,
+ dh-autoreconf (>= 4~),
intltool (>= 0.35.0),
- python3 (>= 2.6.6-3~),
+ python3 (>= 3.2),
python-gi-dev (>= 2.90.3),
valac,
gobject-introspection (>= 0.10.7),
Modified: desktop/unstable/caribou/debian/patches/02_fix_pygi_warnings.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/patches/02_fix_pygi_warnings.patch?rev=49180&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/patches/02_fix_pygi_warnings.patch [utf-8] (original)
+++ desktop/unstable/caribou/debian/patches/02_fix_pygi_warnings.patch [utf-8] Mon Jun 27 11:42:25 2016
@@ -12,10 +12,9 @@
index 541ecb5..350ab59 100644
--- a/caribou/settings/preferences_window.py
+++ b/caribou/settings/preferences_window.py
-@@ -21,6 +21,9 @@
+@@ -21,6 +21,8 @@
from caribou.settings.setting_types import *
-+import gi
from gi.repository import GObject
+gi.require_version('Gtk', '3.0')
+gi.require_version('Gdk', '3.0')
Added: desktop/unstable/caribou/debian/patches/03_fix_python3.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/patches/03_fix_python3.patch?rev=49180&op=file
==============================================================================
--- desktop/unstable/caribou/debian/patches/03_fix_python3.patch (added)
+++ desktop/unstable/caribou/debian/patches/03_fix_python3.patch [utf-8] Mon Jun 27 11:42:25 2016
@@ -0,0 +1,125 @@
+From afcc97fcef4e06fbc6a11e4acc722f46047ad676 Mon Sep 17 00:00:00 2001
+From: Parag Nemade <pnemade at redhat.com>
+Date: Thu, 16 Jun 2016 11:30:28 +0530
+Subject: [PATCH] Add missing python3 compatibility
+
+---
+ caribou/antler/keyboard_view.py | 4 ++--
+ caribou/antler/main.py | 3 +++
+ caribou/antler/window.py | 4 +++-
+ caribou/settings/preferences_window.py | 1 +
+ caribou/settings/settings_manager.py | 4 ++--
+ tools/convert_cldr.py | 4 ++--
+ 6 files changed, 13 insertions(+), 7 deletions(-)
+
+diff --git a/caribou/antler/keyboard_view.py b/caribou/antler/keyboard_view.py
+index 151782c..d90ccc9 100644
+--- a/caribou/antler/keyboard_view.py
++++ b/caribou/antler/keyboard_view.py
+@@ -193,7 +193,7 @@ class AntlerLayout(Gtk.Box):
+
+ for i, key in enumerate(col):
+ align = key.props.align
+- if not alignboxes.has_key(align):
++ if align not in alignboxes:
+ alignbox = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
+ alignbox.set_spacing(self._spacing)
+ alignboxes[align] = alignbox
+@@ -288,7 +288,7 @@ class AntlerKeyboardView(Gtk.Notebook):
+
+ def _load_style(self, provider, filename, search_path):
+ spath = search_path[:]
+- if os.environ.has_key("ANTLER_THEME_PATH"):
++ if "ANTLER_THEME_PATH" in os.environ:
+ spath.insert(0, os.environ["ANTLER_THEME_PATH"])
+
+ for directory in spath:
+diff --git a/caribou/antler/main.py b/caribou/antler/main.py
+index cf13bad..3a558d2 100644
+--- a/caribou/antler/main.py
++++ b/caribou/antler/main.py
+@@ -1,3 +1,6 @@
++import gi
++gi.require_version('Caribou', '1.0')
++gi.require_version('Gtk', '3.0')
+ from gi.repository import Caribou, GLib, GObject, Gtk
+ from .window import AntlerWindowEntry
+ from .keyboard_view import AntlerKeyboardView
+diff --git a/caribou/antler/window.py b/caribou/antler/window.py
+index 0061040..980869a 100644
+--- a/caribou/antler/window.py
++++ b/caribou/antler/window.py
+@@ -20,11 +20,13 @@
+ # along with this program; if not, write to the Free Software Foundation,
+ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
++import gi
++gi.require_version('Clutter', '1.0')
+ from gi.repository import Gtk
+ from gi.repository import Gdk
+ from gi.repository import GObject
+ from gi.repository import Clutter
+-from antler_settings import AntlerSettings
++from .antler_settings import AntlerSettings
+ from math import sqrt
+ import os
+ import sys
+diff --git a/caribou/settings/preferences_window.py b/caribou/settings/preferences_window.py
+index 350ab59..c761c9d 100644
+--- a/caribou/settings/preferences_window.py
++++ b/caribou/settings/preferences_window.py
+@@ -20,6 +20,7 @@
+
+ from caribou.settings.setting_types import *
+
++import gi
+ from gi.repository import GObject
+ gi.require_version('Gtk', '3.0')
+ gi.require_version('Gdk', '3.0')
+diff --git a/caribou/settings/settings_manager.py b/caribou/settings/settings_manager.py
+index 062a278..cf8630a 100644
+--- a/caribou/settings/settings_manager.py
++++ b/caribou/settings/settings_manager.py
+@@ -19,7 +19,7 @@ class SettingsManager(object):
+ raise AttributeError("no setting named '%s'" % name)
+
+ def _map_settings(self, setting):
+- if self._settings_map.has_key(setting.name):
++ if setting.name in self._settings_map:
+ raise ValueError("more than one setting has the name '%s'" % setting.name)
+ self._settings_map[setting.name] = setting
+
+@@ -27,7 +27,7 @@ class SettingsManager(object):
+ self._map_settings(s)
+
+ def _setup_settings(self):
+- for setting in self._settings_map.values():
++ for setting in list(self._settings_map.values()):
+ if isinstance(setting, SettingsGroup):
+ continue
+ setting.value = \
+diff --git a/tools/convert_cldr.py b/tools/convert_cldr.py
+index cd65754..59d699e 100755
+--- a/tools/convert_cldr.py
++++ b/tools/convert_cldr.py
+@@ -13,7 +13,7 @@ def parse_single_key(value):
+ uc = 0
+ if hasattr(__builtins__, 'unichr'):
+ def unescape(m):
+- return unichr(int(m.group(1), 16))
++ return chr(int(m.group(1), 16))
+ else:
+ def unescape(m):
+ return chr(int(m.group(1), 16))
+@@ -66,7 +66,7 @@ def convert(source, tree):
+ for value in longPress.split(' '):
+ subkey = parse_single_key(value)
+ key.append(subkey)
+- for k, v in sorted(rows.items(), key=lambda x: x[0], reverse=True):
++ for k, v in sorted(list(rows.items()), key=lambda x: x[0], reverse=True):
+ row = Element('row')
+ for key in sorted(v, key=lambda x: x):
+ row.append(key[1])
+--
+2.7.4
+
Modified: desktop/unstable/caribou/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/patches/series?rev=49180&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/patches/series [utf-8] (original)
+++ desktop/unstable/caribou/debian/patches/series [utf-8] Mon Jun 27 11:42:25 2016
@@ -1,2 +1,3 @@
01_fix_print_python3.patch
02_fix_pygi_warnings.patch
+03_fix_python3.patch
Modified: desktop/unstable/caribou/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/caribou/debian/rules?rev=49180&op=diff
==============================================================================
--- desktop/unstable/caribou/debian/rules [utf-8] (original)
+++ desktop/unstable/caribou/debian/rules [utf-8] Mon Jun 27 11:42:25 2016
@@ -1,31 +1,30 @@
#!/usr/bin/make -f
# -*- makefile -*-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/class/python-module.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-
export PYTHON=/usr/bin/python3
-# List any files which are not installed
-include /usr/share/cdbs/1/rules/utils.mk
-common-binary-post-install-arch:: list-missing
+%:
+ dh $@ --with gnome,autoreconf,python3
-install/libcaribou-gtk3-module::
+override_dh_auto_configure:
+ dh_auto_configure -- --libexecdir=/usr/lib/caribou
+
+override_dh_autoreconf:
+ dh_autoreconf --as-needed
+
+override_dh_install:
cp -a modules/caribou-gtk-module.desktop \
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-settings-daemon-3.0/gtk-modules/caribou-gtk3-module.desktop
+ dh_install --list-missing
-DEB_PYTHON3_MODULE_PACKAGES = caribou caribou-antler
+override_dh_makeshlibs:
+ dh_makeshlibs -plibcaribou0 -V -- -c4
+ dh_makeshlibs -plibcaribou-gtk-module --no-act
+ dh_makeshlibs -plibcaribou-gtk3-module --no-act
+ dh_makeshlibs --remaining-packages
-DEB_DH_MAKESHLIBS_ARGS_libcaribou0 += -V -- -c4
-DEB_DH_MAKESHLIBS_ARGS_libcaribou-gtk-module += --no-act
-DEB_DH_MAKESHLIBS_ARGS_libcaribou-gtk3-module += --no-act
-
-DEB_DH_STRIP_ARGS_libcaribou0 += --dbgsym-migration='libcaribou-dbg (<< 0.4.20-2)'
-DEB_DH_STRIP_ARGS_libcaribou-gtk-module += --dbgsym-migration='libcaribou-gtk-module-dbg (<< 0.4.20-2)'
-DEB_DH_STRIP_ARGS_libcaribou-gtk3-module += --dbgsym-migration='libcaribou-gtk3-module-dbg (<< 0.4.20-2)'
+override_dh_strip:
+ dh_strip -plibcaribou0 --dbgsym-migration='libcaribou-dbg (<< 0.4.20-2)'
+ dh_strip -plibcaribou-gtk-module --dbgsym-migration='libcaribou-gtk-module-dbg (<< 0.4.20-2)'
+ dh_strip -plibcaribou-gtk3-module --dbgsym-migration='libcaribou-gtk3-module-dbg (<< 0.4.20-2)'
+ dh_strip --remaining-packages
More information about the pkg-gnome-commits
mailing list