Package: libgnomekbd
User: [email protected]
Usertags: origin-ubuntu natty ubuntu-patch
Version: 2.91.2-1
Tags: patch

The following patch fixes some issues in the current version:

- show-layout.ui is required by gnome-settings-daemon and should be
installed when gkbd-capplet is not
- the gsettings schemas were not installed


diff -Nru libgnomekbd-2.91.2/debian/changelog libgnomekbd-2.91.2/debian/changelog
--- libgnomekbd-2.91.2/debian/changelog	2010-11-28 19:56:44.000000000 +0100
+++ libgnomekbd-2.91.2/debian/changelog	2010-12-08 18:35:28.000000000 +0100
@@ -1,3 +1,15 @@
+libgnomekbd (2.91.2-2) unstable; urgency=low
+
+  * debian/libgnomekbd7.install: Install gsettings schemas
+  * Fix LP: #630239 - gnome-settings-daemon crashed with signal 5 in 
+    gkbd_keyboard_drawing_new_dialog(). Move show-layout.ui from
+    gkbd-capplet to libgnomekbd-common and add appropriate replaces
+    - update debian/gkbd-capplet.install
+    - update debian/libgnomekbd-common.install
+    - update debian/control{.in}
+
+ -- Sebastien Bacher <[email protected]>  Wed, 08 Dec 2010 18:15:31 +0100
+
 libgnomekbd (2.91.2-1) experimental; urgency=low
 
   * New upstream release
diff -Nru libgnomekbd-2.91.2/debian/control libgnomekbd-2.91.2/debian/control
--- libgnomekbd-2.91.2/debian/control	2010-12-08 18:07:10.000000000 +0100
+++ libgnomekbd-2.91.2/debian/control	2010-12-08 18:35:43.000000000 +0100
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Loic Minier <[email protected]>
-Uploaders: Debian GNOME Maintainers <[email protected]>, Emilio Pozuelo Monfort <[email protected]>, Josselin Mouette <[email protected]>, Sebastian Dröge <[email protected]>, Sjoerd Simons <[email protected]>
+Uploaders: Debian GNOME Maintainers <[email protected]>, Emilio Pozuelo Monfort <[email protected]>, Josselin Mouette <[email protected]>, Sebastian Dröge <[email protected]>, Sebastien Bacher <[email protected]>, Sjoerd Simons <[email protected]>
 Build-Depends: debhelper (>= 5),
         dh-autoreconf,
         autotools-dev,
@@ -18,7 +18,7 @@
         libgtk3.0-dev,
         libxklavier-dev (>= 5.0),
         intltool (>= 0.35)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 
 Package: libgnomekbd-dev
 Section: libdevel
@@ -59,7 +59,9 @@
 Section: libs
 Architecture: all
 Depends: ${shlibs:Depends},
-        ${misc:Depends}
+        ${misc:Depends},
+	gkbd-capplet (<= 2.91.2-1)
+Breaks: gkbd-capplet (<= 2.91.2-1)
 Replaces: capplets-data (<< 1:2.17.2)
 Description: GNOME library to manage keyboard configuration - common files
  libgnomekbd offers an API to manage the keyboard in GNOME applications.
diff -Nru libgnomekbd-2.91.2/debian/control.in libgnomekbd-2.91.2/debian/control.in
--- libgnomekbd-2.91.2/debian/control.in	2010-11-28 19:45:52.000000000 +0100
+++ libgnomekbd-2.91.2/debian/control.in	2010-12-08 18:32:18.000000000 +0100
@@ -13,7 +13,7 @@
         libgtk3.0-dev,
         libxklavier-dev (>= 5.0),
         intltool (>= 0.35)
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 
 Package: libgnomekbd-dev
 Section: libdevel
@@ -54,7 +54,9 @@
 Section: libs
 Architecture: all
 Depends: ${shlibs:Depends},
-        ${misc:Depends}
+        ${misc:Depends},
+	gkbd-capplet (<= 2.91.2-1)
+Breaks: gkbd-capplet (<= 2.91.2-1)
 Replaces: capplets-data (<< 1:2.17.2)
 Description: GNOME library to manage keyboard configuration - common files
  libgnomekbd offers an API to manage the keyboard in GNOME applications.
diff -Nru libgnomekbd-2.91.2/debian/gkbd-capplet.install libgnomekbd-2.91.2/debian/gkbd-capplet.install
--- libgnomekbd-2.91.2/debian/gkbd-capplet.install	2010-11-28 19:15:00.000000000 +0100
+++ libgnomekbd-2.91.2/debian/gkbd-capplet.install	2010-12-08 18:15:21.000000000 +0100
@@ -1,3 +1,3 @@
 debian/tmp/usr/bin
 debian/tmp/usr/share/applications
-debian/tmp/usr/share/libgnomekbd
+debian/tmp/usr/share/libgnomekbd/ui/gkbd-*.ui
diff -Nru libgnomekbd-2.91.2/debian/libgnomekbd-common.install libgnomekbd-2.91.2/debian/libgnomekbd-common.install
--- libgnomekbd-2.91.2/debian/libgnomekbd-common.install	2010-11-28 19:41:17.000000000 +0100
+++ libgnomekbd-2.91.2/debian/libgnomekbd-common.install	2010-12-08 18:15:21.000000000 +0100
@@ -1 +1,3 @@
 debian/tmp/usr/share/locale
+debian/tmp/usr/share/glib-2.0/schemas
+debian/tmp/usr/share/libgnomekbd/ui/show-layout.ui

Reply via email to