...
 
Commits (3)
ibus-cangjie (2.4-2) unstable; urgency=medium
* Team upload.
* debian/control:
+ Remove deprecated "extra" package priority.
+ Update maintainer and use Debian Input Method Team email address.
(Closes: #899541)
+ Bump debhelper compat to v11.
+ Bump Standards-Version to 4.2.1.
+ Update Vcs-* fields and use the git repo under Salsa
input-method team.
+ Remove useless X-Python-Version field.
* debian/rules:
+ Enable full hardening.
+ Use "dh_missing --fail-missing".
* debian/patches:
+ Refresh existing patches.
+ Cherry-pick patch from upstream trunk to properly import gi modules.
-- Boyuan Yang <byang@debian.org> Sat, 10 Nov 2018 18:08:48 -0500
ibus-cangjie (2.4-1) unstable; urgency=medium
* New upstream release.
......
Source: ibus-cangjie
Section: utils
Priority: extra
Maintainer: IME Packaging Team <pkg-ime-devel@lists.alioth.debian.org>
Uploaders: Anthony Wong <yp@anthonywong.net>,
Anthony Fok <foka@debian.org>,
ChangZhuo Chen (陳昌倬) <czchen@debian.org>
Build-Depends: debhelper (>= 9),
dh-autoreconf,
dh-python,
autotools-dev,
intltool,
pkg-config,
python3-all (>= 3.2),
python3-gi,
python3-pycangjie (>= 1.0),
libibus-1.0-dev,
gir1.2-gtk-3.0,
xvfb,
xauth
Standards-Version: 3.9.6
Priority: optional
Maintainer: Debian Input Method Team <debian-input-method@lists.debian.org>
Uploaders:
Anthony Wong <yp@anthonywong.net>,
Anthony Fok <foka@debian.org>,
ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
Build-Depends:
debhelper (>= 11),
dh-python,
gir1.2-gtk-3.0,
intltool,
libibus-1.0-dev,
pkg-config,
python3-all (>= 3.2),
python3-gi,
python3-pycangjie (>= 1.0),
xauth,
xvfb,
Standards-Version: 4.2.1
Homepage: http://ibus-cangjie.opensource.hk/
Vcs-Git: git://anonscm.debian.org/pkg-ime/ibus-cangjie.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ime/ibus-cangjie.git;a=summary
X-Python3-Version: >= 3.2
Vcs-Git: https://salsa.debian.org/input-method-team/ibus-cangjie.git
Vcs-Browser: https://salsa.debian.org/input-method-team/ibus-cangjie
Package: ibus-cangjie
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends},
ibus (>= 1.4.1),
python3-pycangjie (>= 1.0),
python3-gi,
gir1.2-ibus-1.0
Depends:
gir1.2-ibus-1.0,
ibus (>= 1.4.1),
python3-gi,
python3-pycangjie (>= 1.0),
${misc:Depends},
${python3:Depends},
${shlibs:Depends},
Description: Cangjie and Quick input methods for IBus
This is an IBus engine for users of the Cangjie and Quick input
methods.
......
Description: ibus-engine-cangjie should be in /usr/lib/ibus
Per Debian's ibus policy, ibus engines should be installed to
/usr/lib/ibus.
Author: Anthony Wong <yp@anthonywong.net>
From: Anthony Wong <yp@anthonywong.net>
Date: Sun, 24 Aug 2014 01:43:35 +0800
Subject: ibus-engine-cangjie should be in /usr/lib/ibus
Per Debian's ibus policy, ibus engines should be installed to
/usr/lib/ibus.
Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746978
Last-Update: 2014-08-24
Last-Update: 2018-11-10
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d7ece7c..1142421 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,8 @@
@@ -8,8 +8,8 @@ SUBDIRS = po
# -- scripts/ ------------------------
bin_SCRIPTS = scripts/ibus-setup-cangjie
......@@ -19,7 +25,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
scripts/ibus-%-cangjie: scripts/ibus-%-cangjie.in Makefile
$(AM_V_GEN) \
@@ -38,7 +38,7 @@
@@ -38,7 +38,7 @@ componentdir = $(COMPONENT_DIR)
sed -e 's&@_VERSION@&$(VERSION)&g' \
-e 's&@BINDIR@&$(bindir)&g' \
-e 's&@ICON16DIR@&$(icon16dir)&g' \
......@@ -28,7 +34,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
gsettings_in_files = data/org.cangjians.ibus.cangjie.gschema.xml.in data/org.cangjians.ibus.quick.gschema.xml.in
gsettings_SCHEMAS = $(gsettings_in_files:.xml.in=.xml)
@@ -115,7 +115,7 @@
@@ -115,7 +115,7 @@ CLEANFILES = \
$(desktop_in_files) \
$(gsettings_SCHEMAS) \
$(bin_SCRIPTS) \
......
From: wnereiz <wnereiz@member.fsf.org>
Date: Mon, 15 Oct 2018 09:31:45 +0800
Subject: Properly import gi modules to avoid PyGIWarning
Fix #86
---
scripts/ibus-engine-cangjie.in | 3 +++
scripts/ibus-setup-cangjie.in | 4 ++++
src/__init__.py | 3 +++
src/engine.py | 3 +++
src/setup.py | 6 ++++++
tests/test_cangjie.py | 3 +++
tests/test_prefs.py | 3 +++
7 files changed, 25 insertions(+)
diff --git a/scripts/ibus-engine-cangjie.in b/scripts/ibus-engine-cangjie.in
index 2113b66..08d959c 100644
--- a/scripts/ibus-engine-cangjie.in
+++ b/scripts/ibus-engine-cangjie.in
@@ -20,6 +20,9 @@
import argparse
import locale
+import gi
+gi.require_version('IBus','1.0')
+
from gi.repository import IBus
from ibus_cangjie import IMApp
diff --git a/scripts/ibus-setup-cangjie.in b/scripts/ibus-setup-cangjie.in
index 99fa5da..7146b2e 100644
--- a/scripts/ibus-setup-cangjie.in
+++ b/scripts/ibus-setup-cangjie.in
@@ -32,6 +32,10 @@ GLib.set_prgname('ibus-setup-%s' % args.engine)
import locale
+import gi
+gi.require_version('Gtk','3.0')
+gi.require_version('IBus','1.0')
+
from gi.repository import Gtk
from gi.repository import IBus
diff --git a/src/__init__.py b/src/__init__.py
index a4db2bb..a4aa551 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -16,6 +16,9 @@
# along with ibus-cangjie. If not, see <http://www.gnu.org/licenses/>.
+import gi
+gi.require_version('IBus','1.0')
+
from gi.repository import GLib
from gi.repository import GObject
from gi.repository import IBus
diff --git a/src/engine.py b/src/engine.py
index df05d25..a26c0c5 100644
--- a/src/engine.py
+++ b/src/engine.py
@@ -22,6 +22,9 @@ __all__ = ["EngineCangjie", "EngineQuick"]
import gettext
from operator import attrgetter
+import gi
+gi.require_version('IBus','1.0')
+
from gi.repository import Gio
from gi.repository import IBus
diff --git a/src/setup.py b/src/setup.py
index b3125e3..04b087b 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -18,6 +18,12 @@
from gettext import dgettext
+import gi
+gi.require_version('Gdk','3.0')
+gi.require_version('Gio','3.0')
+gi.require_version('GLib','3.0')
+gi.require_version('Gtk','3.0')
+
from gi.repository import Gdk
from gi.repository import Gio
from gi.repository import GLib
diff --git a/tests/test_cangjie.py b/tests/test_cangjie.py
index d20c5b2..81be381 100644
--- a/tests/test_cangjie.py
+++ b/tests/test_cangjie.py
@@ -19,6 +19,9 @@
import os
import unittest
+import gi
+gi.require_version('IBus','1.0')
+
from gi.repository import IBus
from ibus_cangjie.engine import *
diff --git a/tests/test_prefs.py b/tests/test_prefs.py
index 733ab54..5dbc0b6 100644
--- a/tests/test_prefs.py
+++ b/tests/test_prefs.py
@@ -33,6 +33,8 @@ def has_graphical():
automatically skip the tests which can't run without.
"""
try:
+ import gi
+ gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
except RuntimeError as e:
@@ -43,6 +45,7 @@ def has_graphical():
# But other platforms (e.g Fedora 21) can import Gtk just fine even
# without a display...
+ gi.require_version('Gdk', '3.0')
from gi.repository import Gdk
if Gdk.Display.get_default() is None:
0001-install-engine-to-correct-dir.diff
0002-Properly-import-gi-modules-to-avoid-PyGIWarning.patch
#!/usr/bin/make -f
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
# see FEATURE AREAS in dpkg-buildflags(1)
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
# see ENVIRONMENT in dpkg-buildflags(1)
# package maintainers to append CFLAGS
#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
# package maintainers to append LDFLAGS
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
%:
dh $@ --with autoreconf,python3
dh $@ --with python3
override_dh_autoreconf:
dh_autoreconf ./autogen.sh
override_dh_auto_test:
xvfb-run -a dh_auto_test
override_dh_missing:
dh_missing --fail-missing