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

Bug#688391: marked as done (unblock: caribou/0.4.4-1)

Your message dated Sun, 14 Oct 2012 09:27:12 +0200
with message-id <507A6950.1090400@thykier.net>
and subject line Re: Bug#688391: unblock: caribou/0.4.4-1
has caused the Debian Bug report #688391,
regarding unblock: caribou/0.4.4-1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
688391: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688391
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock caribou for translation updates and a pair of bugfixes.

caribou (0.4.4-1) unstable; urgency=low

  * Stop overriding OnlyShowIn from upstream. Closes: #679102.
  * New upstream translation/bugfix release.

The diff for non-autogenerated parts is attached. (The actual diff is 
big because upstream changed the vala compiler version used.)

unblock caribou/0.4.4-1

Thanks,
-- 
 .''`.      Josselin Mouette
: :' :
`. `'
  `-

diff -Nru caribou-0.4.2/configure.ac caribou-0.4.4/configure.ac
--- caribou-0.4.2/configure.ac	2012-03-27 04:31:58.000000000 +0200
+++ caribou-0.4.4/configure.ac	2012-09-03 12:11:56.000000000 +0200
@@ -1,6 +1,6 @@
 AC_PREREQ([2.63])
 AC_INIT([caribou],
-        [0.4.2],
+        [0.4.4],
         [https://bugzilla.gnome.org/enter_bug.cgi?product=caribou],
         [caribou])
 
@@ -104,9 +104,6 @@
 dnl == intltool check ==
 IT_PROG_INTLTOOL([0.35.0])
 
-dnl == Documentation ==
-GNOME_DOC_INIT
-
 dnl == GObject introspection ==
 GOBJECT_INTROSPECTION_REQUIRE([0.10.7])
 
diff -Nru caribou-0.4.2/data/antler/style.css caribou-0.4.4/data/antler/style.css
--- caribou-0.4.2/data/antler/style.css	2011-09-03 05:36:58.000000000 +0200
+++ caribou-0.4.4/data/antler/style.css	2012-08-03 15:43:47.000000000 +0200
@@ -10,10 +10,10 @@
 @define-color group_scan_color2 darker(@group_scan_color1);
 
 .antler-keyboard-button {
-  border-width: 0;
-  border-radius: 2;
-  border-image: url("dark-key-border.svg") 2 2 2 2 repeat stretch;
-  font: Sans 14;
+  border-width: 0px;
+  border-radius: 2px;
+  border-image: url("dark-key-border.svg") 2px 2px 2px 2px repeat stretch;
+  font: Sans 14px;
   background-image: -gtk-gradient (linear,
 				     left top,
 				     left bottom,
diff -Nru caribou-0.4.2/debian/rules caribou-0.4.4/debian/rules
--- caribou-0.4.2/debian/rules	2011-11-21 16:57:04.000000000 +0100
+++ caribou-0.4.4/debian/rules	2012-06-26 14:17:37.000000000 +0200
@@ -19,7 +19,6 @@
 
 install/caribou::
 	echo "NoDisplay=true" >> debian/tmp/usr/share/applications/caribou.desktop
-	echo "OnlyShowIn=GNOME;" >> debian/tmp/etc/xdg/autostart/caribou-autostart.desktop
 
 DEB_PYTHON2_MODULE_PACKAGES = caribou caribou-antler
 
diff -Nru caribou-0.4.2/NEWS caribou-0.4.4/NEWS
--- caribou-0.4.2/NEWS	2012-03-27 04:31:46.000000000 +0200
+++ caribou-0.4.4/NEWS	2012-09-05 11:26:46.000000000 +0200
@@ -1,4 +1,20 @@
 =============
+Version 0.4.4
+=============
+- Removed unneeded gnome-doc-utils dependency
+- Bug 683256 - caribou unnecessarily requires pygobject 3.3.3 or up to
+  build
+- Translation updates (Galician, Polish, Vietnamese, Marathi,
+  Gujarati, Bengali)
+
+=============
+Version 0.4.3
+=============
+- Bug 674344: Not using units is deprecated in gtk CSS is deprecated
+- Update after pygobject bug 676746
+- Translation updates (Norwegian, Greek, Traditional Chinese)
+
+=============
 Version 0.4.2
 =============
 - Build fixes
diff -Nru caribou-0.4.2/tools/make_schema.py caribou-0.4.4/tools/make_schema.py
--- caribou-0.4.2/tools/make_schema.py	2011-09-09 17:42:39.000000000 +0200
+++ caribou-0.4.4/tools/make_schema.py	2012-09-05 11:17:26.000000000 +0200
@@ -56,9 +56,19 @@
             key.setAttribute('name', setting.gsettings_key)
             key.setAttribute('type', setting.variant_type)
             schemalist.appendChild(key)
+            # pygobject >= 3.3.3 and up expose g_variant_print as
+            # "print_". Older pygobjects expose it as "print", which
+            # we need to use through getattr as "print" is a keyword.
+            #
+            # Try the new name first, fall back to the old one if unavailable.
+            #
+            # Once we depend on pygobject >= 3.4 we can just call
+            # setting.gvariant.print_(False) directly.
+            printfunc = getattr(setting.gvariant, 'print_', None)
+            if printfunc is None:
+                printfunc = getattr(setting.gvariant, 'print')
             self._append_children_element_value_pairs(
-                doc, key, [('default',
-                            getattr(setting.gvariant, "print")(False)),
+                doc, key, [('default', printfunc(False)),
                            ('_summary', setting.short_desc),
                            ('_description', setting.long_desc)])

--- End Message ---
--- Begin Message --- 
On 2012-09-22 13:08, Josselin Mouette wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> 
> Please unblock caribou for translation updates and a pair of bugfixes.
> 
> caribou (0.4.4-1) unstable; urgency=low
> 
>   * Stop overriding OnlyShowIn from upstream. Closes: #679102.
>   * New upstream translation/bugfix release.
> 
> The diff for non-autogenerated parts is attached. (The actual diff is 
> big because upstream changed the vala compiler version used.)
> 
> unblock caribou/0.4.4-1
> 
> Thanks,

Unblocked, thanks.

~Niels

--- End Message ---
Reply to: